Fix and improve anomaly forcings for ISSP cases #292
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cdeps1.0.34
|
@ekluzek, a few questions:
<default_value>''</default_value>
<value compset="^SSP126_">Anomaly.Forcing.cmip6.ssp126</value> |
5 tasks
jedwards4b
approved these changes
Aug 22, 2024
|
@samsrabin is this ready- if not can you make it a draft please. |
jedwards4b
requested changes
Sep 5, 2024
This reverts commit 3f36622b3bd6358d324f1aca5e90009db306963e, which tried to do this in namelist_definition_datm.xml, and instead does it in datm/cime_config/buildnml. Only looks at compset if anomaly_forcing not specified in namelist.
…rounding quote marks.
|
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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 #):
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_forcingoptions:Anomaly.Forcing.cmip5.rcp45Anomaly.Forcing.cmip6.ssp126Anomaly.Forcing.cmip6.ssp245Anomaly.Forcing.cmip6.ssp370Anomaly.Forcing.cmip6.ssp585Testing performed (e.g. aux_cdeps, CESM prealpha, etc):
datm_ssp126_anom_forc, is bit-for-bit identical to previous version (ctsm5.2.015).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:
Remaining work
anomaly_forcingis automatically set for eachISSPcompsetISSPcompset to test) Ensure that it's only set forDATMcompsetsanomaly_forcingin the generateddatm_in: Fix that. (Note that the anomaly forcing file IS correctly being put indatm.streams.xml.)