Changes to buildnml to permit use of new dglc component with ctms #71
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
(cherry picked from commit d6994f7)
(cherry picked from commit 9882289)
Use baset_latvary parameters Namelist parameters baset_latvary_slope and baset_latvary_intercept were never actually used, with values of 0.4 and 12 being hard-coded in the relevant subroutine instead. This PR fixes that, and also adds unit testing of a refactored function that uses them.
(cherry picked from commit a4eff78) Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml
(cherry picked from commit 4e09130) Conflicts: cime_config/testdefs/ExpectedTestFails.xml
(cherry picked from commit b916d38)
(cherry picked from commit 863ed22)
… the PEM test that is no longer needed and doesn't have a testmod for it (cherry picked from commit 04853a8)
(cherry picked from commit 88ac3ae)
…30np4.pg3 landuse.timeseries file (cherry picked from commit d3a82a5) Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml
(cherry picked from commit 1a09d07) Conflicts: cime_config/testdefs/testmods_dirs/clm/ciso_decStartNoMeier/user_nl_clm
Use baset_latvary parameters Namelist parameters baset_latvary_slope and baset_latvary_intercept were never actually used, with values of 0.4 and 12 being hard-coded in the relevant subroutine instead. This PR fixes that, and also adds unit testing of a refactored function that uses them.
…ce it was created with ctsm5.2 datasets
…p is required because the finidat file is based on ctsm5.2 datasets
…for non ctsm5.2 surface datasets
Use baset_latvary parameters Namelist parameters baset_latvary_slope and baset_latvary_intercept were never actually used, with values of 0.4 and 12 being hard-coded in the relevant subroutine instead. This PR fixes that, and also adds unit testing of a refactored function that uses them.
…r2212 Merge tag: Turn on Meier2022, tillage, residue removal; bring in ESCOMP#2212
…rge_tag_2315_et_al
…tion' into bfb_merge_tag_2315_et_al slevis resolved conflicts: src/main/clm_driver.F90
…m' into bfb_merge_tag_2315_et_al
…rge_tag_2315_et_al
…ge_tag_2315_et_al
Bfb merge tag dev166
Fix "Assign to project" Github action.
Delete history and spurious _FillValue from parameter files
|
The wrong branch was being merged to here. A new PR will be opened. |
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
change needed for the addition of a dglc component in cdeps
Specific notes
This minor change to buildnml is needed in order to support the addition of dglc which will replace CISM running in noevolve mode.
This will enable having many of the current CTSM tests that use SGLC move to using DGLC%NOEVOLVE.
Contributors other than yourself, if any: None
CTSM Issues Fixed: None
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? No
Testing performed, if any:
The following tests were run on derecho.
Ran a test case with
compset 1850_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_SROF_DGLC%NOEVOLVE_SWAV and resolution f10_f10_ais8gris4_mg37
and compared to
compset 1850_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_SROF_CISM%NOEVOLVE_SWAV and resolution f10_f10_ais8gris4_mg37