CDEPS
CDEPS copied to clipboard
Fix and improve anomaly forcings for ISSP cases
Description of changes
Fixes a bug, and also makes it much simpler to run land-only SSP cases.
Specific notes
Contributors other than yourself, if any: @ekluzek
CDEPS Issues Fixed (include github issue #):
- Resolves #186
- Fixes #258
- Resolves #310
Are there dependencies on other component PRs (if so list): This doesn't depend on other components. However, I will soon submit a PR to CTSM that depends on this branch. (See issue ESCOMP/CTSM#2301.)
Are changes expected to change answers (bfb, different to roundoff, more substantial): Substantial, but only if people were being bitten by #258 before.
Any User Interface Changes (namelist or namelist defaults changes): Yes.
Adds anomaly_forcing options:
Anomaly.Forcing.cmip5.rcp45Anomaly.Forcing.cmip6.ssp126Anomaly.Forcing.cmip6.ssp245Anomaly.Forcing.cmip6.ssp370Anomaly.Forcing.cmip6.ssp585
Removes all variable-specific anomaly_forcing options.
Testing performed (e.g. aux_cdeps, CESM prealpha, etc):
- New CTSM testmods using these work correctly. Existing testmod,
datm_ssp126_anom_forc, is bit-for-bit identical to previous version (ctsm5.2.015). - On top of existing
aux_cdepstest of SSP585 compset, added the 3 other SSP compsets. Allaux_cdepsSSP tests show diffs as expected fromcdeps1.0.34.
Hashes used for testing:
- Various throughout process.
Remaining work
- [x] Make it so that
anomaly_forcingis automatically set for eachISSPcompset - [ ] (Done but I need a non-
ISSPcompset to test) Ensure that it's only set forDATMcompsets - [x] If we care that it's not putting
anomaly_forcingin the generateddatm_in: Fix that. (Note that the anomaly forcing file IS correctly being put indatm.streams.xml.)
@ekluzek, a few questions:
- What sort of changes/additions would you like me to make to
aux_cdeps? - Does it make sense to keep the
Anomaly.Forcing.Precip,Anomaly.Forcing.Temperature, etc. entries instream_definition_datm.xml? If so, I'll need to rename them so they're specific to rcp45, then add equivalent ones for each SSP. Seems messy! - To make the
ISSPcompsets automatically use the rightanomaly_forcing, would I do something like this innamelist_definition_datm.xmlunder<entry id="anomaly_forcing">?
<default_value>''</default_value>
<value compset="^SSP126_">Anomaly.Forcing.cmip6.ssp126</value>
@samsrabin is this ready- if not can you make it a draft please.
Force-pushed to remove premature merge of main into this branch, which was interfering with my testing.
@ekluzek This is ready, if you'd like to review!
Note that this is up-to-date with cdeps1.0.34. If you'd like me to merge in the latest tag, let me know and I'll redo the testing.
@jedwards4b This is ready to review, and @ekluzek will also make some time to look at it in the next few days. It would be nice if we can get it in soon.
Re-requesting review from @ekluzek, because it seems like I've already addressed his concern. If approved, I'll continue by merging in the latest CTSM tag into ESCOMP/CTSM#2686 and the corresponding CDEPS tag here.
Re-pinging @ekluzek for review, since @jedwards4b seems to think things are fine as is.
@jedwards4b I think this is ready!
@samsrabin can you merge main into your branch or give me permission to push to your fork?
@jedwards4b Done!