Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DT_THERM=6*DT and DIABATIC_FIRST = False #94

Merged
merged 2 commits into from
Aug 7, 2024

Conversation

aekiss
Copy link
Contributor

@aekiss aekiss commented Aug 7, 2024

use DT_THERM=6*DT and DIABATIC_FIRST = False - see COSIMA/access-om3#138

@aekiss aekiss changed the base branch from main to 1deg_jra55do_ryf August 7, 2024 05:40
@aekiss aekiss marked this pull request as draft August 7, 2024 05:40
@aekiss aekiss added the 1deg_jra55do_ryf 1deg_jra55do_ryf configuration label Aug 7, 2024
@aekiss aekiss marked this pull request as ready for review August 7, 2024 05:42
@aekiss aekiss changed the title 1deg jra55do ryf.iss138 DT_THERM=6*DT and DIABATIC_FIRST = False Aug 7, 2024
nuopc.runconfig Outdated Show resolved Hide resolved
config.yaml Outdated Show resolved Hide resolved
@@ -286,7 +286,7 @@ CLOCK_attributes::
history_ymd = -999
ice_cpl_dt = 99999 #not used
lnd_cpl_dt = 99999 #not used
ocn_cpl_dt = 3600
ocn_cpl_dt = 1800

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not necessarily to change the value of ocn_cpl_dt unless stop_option is nsteps. I can do a cherry pick to add comments right after this parameter for all configurations. COSIMA/access-om3#157 (comment)

Copy link

@minghangli-uni minghangli-uni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aekiss LGTM!

@aekiss aekiss merged commit 2d639fe into 1deg_jra55do_ryf Aug 7, 2024
@aekiss
Copy link
Contributor Author

aekiss commented Aug 7, 2024

!cherry-pick ac53042 c18a988 into 1deg_jra55do_iaf

Copy link

github-actions bot commented Aug 7, 2024

!cherry-pick ac53042 c18a988 into 1deg_jra55do_iaf

Automatic cherry-pick failed. Could not find commit(s) ac53042 c18a988 in 1deg_jra55do_ryf.

@aekiss
Copy link
Contributor Author

aekiss commented Aug 7, 2024

!cherry-pick 58e3b75 2d639fe into 1deg_jra55do_iaf

Copy link

github-actions bot commented Aug 7, 2024

Automatic Git cherry-picking of commit(s) 58e3b75 2d639fe into 1deg_jra55do_iaf failed. This usually happens when cherry-picking results in a conflic or an empty commit. To manually cherry-pick the commits and open a pull request, please follow these instructions:

  1. Create new branch from target branch:
git checkout 1deg_jra55do_iaf
git pull
git checkout -b cherry_pick_from_pr94_into_1deg_jra55do_iaf
  1. Cherry-pick commits:
git cherry-pick 58e3b755e8e09664f4c8eedb40f428ce215a4bfb 2d639fe009f92860169677b18990864317f0a9ca
  1. Fix any conflicts and/or empty commits by following the instructions provided by Git.
  2. Push the new branch:
git push --set-upstream origin cherry_pick_from_pr94_into_1deg_jra55do_iaf
  1. Open a new pull request on github making sure the target branch is set to 1deg_jra55do_iaf.

@minghangli-uni
Copy link

Hi @aekiss It seems that your cherry-picks failed because of the conflicts. You might need to follow the steps from #94 (comment)

@aekiss
Copy link
Contributor Author

aekiss commented Aug 7, 2024

OK I'm working on it. The biggest conflict is due to differing MOM_input formats - see COSIMA/access-om3#200

@dougiesquire
Copy link
Collaborator

I was under the impression we weren't going to change these params in our official config branches until we'd done the testing to determine what DT_THERM is optimal. Are we confident this value gives okay results?

@aekiss
Copy link
Contributor Author

aekiss commented Aug 7, 2024

Ah yes, good point. Sorry if I jumped the gun there. I'll wait until we've tested before merging this into 1deg_jra55do_iaf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1deg_jra55do_ryf 1deg_jra55do_ryf configuration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants