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

Fix nuopc cplhist test #1999

Merged
merged 3 commits into from
May 19, 2023
Merged

Fix nuopc cplhist test #1999

merged 3 commits into from
May 19, 2023

Conversation

billsacks
Copy link
Member

Description of changes

Make some changes to the cplhist testmod that should fix the cplhist test, based on testing done by Keith Oleson:

Also, remove mct cplhist test

Specific notes

Contributors other than yourself, if any: @olyson

CTSM Issues Fixed (include github issue #): none (though takes steps towards addressing #1844 )

Are answers expected to change (and if so in what way)? No, but the new test (SMS_D_Ld1.ne30pg3_t061.I1850Clm50BgcSpinup.cheyenne_intel.clm-cplhist) won't have baselines

Any User Interface Changes (namelist or namelist defaults changes)? No

Testing performed, if any:
Ran the new test, SMS_D_Ld1.ne30pg3_t061.I1850Clm50BgcSpinup.cheyenne_intel.clm-cplhist

Make some changes to the cplhist testmod that should fix the cplhist
test, based on testing done by Keith Oleson:
- Point to new cplhist forcing data generated and used by Adam
  Herrington and Keith Oleson
- Use DATM_PRESNDEP=none until
  ESCOMP#1844 is resolved

Also, remove mct cplhist test
@billsacks billsacks added tag: simple bfb PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete labels May 9, 2023
@billsacks billsacks requested a review from ekluzek May 9, 2023 13:05
@billsacks
Copy link
Member Author

billsacks commented May 9, 2023

This requires ESCOMP/CDEPS#228 for the new cplhist test to pass. So we'll need to update the cdeps version before merging this PR.

Edit (2023-05-12): I just pushed this cdeps update to this branch.

billsacks added a commit to ESCOMP/CDEPS that referenced this pull request May 9, 2023
Update stream definitions for new coupler history file format

### Description of changes

Modify stream_definition_datm.xml to generate a streams file (datm.streams.xml) with the new coupler history file format.

### Specific notes

Changes to accommodate new coupler history file names.
Change offset for solar stream from 2700 to -900 to accommodate changes due to time stamps.
These changes work in conjunction with CDEPS PR #224 and CDEPS PR #222 .
Note that I did not change the file names for ndep, or remove that stream. See #230

Contributors other than yourself, if any: @billsacks 

CDEPS Issues Fixed (include github issue #):  N/A

Are there dependencies on other component PRs (if so list):  No

Are changes expected to change answers (bfb, different to roundoff, more substantial):  Yes, in coupler history mode.

Any User Interface Changes (namelist or namelist defaults changes): No

Testing performed (e.g. aux_cdeps, CESM prealpha, etc):  I have conducted a pair of cases, an F-case to generate coupler history files, and an I-case to read those files, using the new file name convention, and compared the forcing output variables from clm history files between the two cases.  @billsacks and I reviewed these differences and found them to be acceptable.

@billsacks ran SMS_D_Ld1.ne30pg3_t061.I1850Clm50BgcSpinup.cheyenne_intel.clm-cplhist in the context of ESCOMP/CTSM#1999

Hashes used for testing:  N/A
@billsacks billsacks merged commit 1babc8e into ESCOMP:master May 19, 2023
@billsacks billsacks deleted the fix_cplhist branch May 19, 2023 10:59
@samsrabin samsrabin added simple bfb bit-for-bit labels Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bfb bit-for-bit PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete
Projects
Status: Done (non release/external)
Development

Successfully merging this pull request may close these issues.

3 participants