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 iradsw logic for CPLHIST mode #222

Merged
merged 1 commit into from
Mar 22, 2023
Merged

Conversation

billsacks
Copy link
Member

Description of changes

CPLHIST mode has DATM_MODE=CPLHIST, not CPLHISTForcing.

Specific notes

Contributors other than yourself, if any: @olyson

CDEPS Issues Fixed (include github issue #):
Resolves #221

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

Are changes expected to change answers (bfb, different to roundoff, more substantial): more substantial, but just when running datm in CPLHIST mode

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

Testing performed (e.g. aux_cdeps, CESM prealpha, etc): just checked datm_in for two compsets: I1850Clm50BgcSpinup (fixed as intended) and I2000Clm50BgcCropQianRs (unchanged, as intended).

Hashes used for testing:

CPLHIST mode has DATM_MODE=CPLHIST, *not* CPLHISTForcing.
@jedwards4b jedwards4b merged commit b5d4929 into ESCOMP:main Mar 22, 2023
@billsacks billsacks deleted the fix_iradsw branch March 22, 2023 20:00
billsacks added a commit 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

iradsw set incorrectly for datm in CPLHIST mode
2 participants