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.

Sign up for GitHub

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

Jump to bottom

Fix clm6_0 defaults #2501

Merged
merged 34 commits into from
May 13, 2024
Merged

Fix clm6_0 defaults #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ee5efec
Fix the clm6_0 issues identified in #2492
ekluzek Apr 29, 2024
9769e2f
Start adding a namelist comparision tool
ekluzek Apr 29, 2024
cb32dd1
Get the physicsA and physicsB options working
ekluzek Apr 29, 2024
4c07dcc
Add basic script to compare testlist baseline lnd_in files
ekluzek May 2, 2024
5192bd1
Fix for #2504 so tests of use-cases is done, and also done over all p…
ekluzek May 2, 2024
480ae1b
Simplify and correct the use-cases, with this the difference between …
ekluzek May 2, 2024
af672fb
Fix comparison to a baseline directory
ekluzek May 6, 2024
eec4e79
Update testlist based on what's needed for CAM and CESM test lists
ekluzek May 7, 2024
e529c2f
Add IHistClm60BgcCropG which is needed for CESM testing, change NoAnt…
ekluzek May 7, 2024
d6beae7
Merge tag 'ctsm5.2.003' into fixclm50defaults
ekluzek May 7, 2024
9b5001d
Fix #2519 so that the mksurfdata_esmf build can work in a CESM checkout
ekluzek May 7, 2024
f330407
Change comments about clm5_1 to clm6_0
ekluzek May 8, 2024
524cbc0
Revert order of irrigate and add note that it's also set in the use-c…
ekluzek May 8, 2024
b9e947d
Get mksurfdata_esmf build and namelist build working under a CESM che…
ekluzek May 8, 2024
7d91ac1
Correct clm60 typo in testlist
ekluzek May 8, 2024
010a008
Add a description and usage and error check command line args
ekluzek May 8, 2024
181dff2
Merge branch 'fixclm50defaults' of github.com:ekluzek/CTSM into fixcl…
ekluzek May 8, 2024
fc02613
Adjustments to the testlist
ekluzek May 8, 2024
f8c6a49
Add a ctsm_sci test for I1850Clm50BgcCropG to verify that current B18…
ekluzek May 9, 2024
c37f743
Add more tests of finidat file settings, a bunch of things fail becau…
ekluzek May 9, 2024
190be8b
Fix the 2010 use case, and get the namelist testing working better
ekluzek May 10, 2024
2b8c042
Fix the tests so expected fails, actually fail
ekluzek May 11, 2024
8c10965
Set use_init_interp=T for finidat files that are older than ctsm5.2
ekluzek May 11, 2024
0b72035
Merge tag 'ctsm5.2.004' into fixclm50defaults
ekluzek May 11, 2024
e14303f
Fix irrigate for two use-cases so namelists all agree with the ctsm5.…
ekluzek May 13, 2024
9fa2841
New finidat files for clm5_1/clm6_0 for 1850
ekluzek May 13, 2024
0b41efe
Change name to remove shell type extension
ekluzek May 13, 2024
ac3cb73
Reverse comparision so agrees with how documented
ekluzek May 13, 2024
942fee9
remove clm5_1 old finidat file so will always use the ne30 new one
ekluzek May 13, 2024
77690ed
Start on Change files
ekluzek May 13, 2024
a09d223
Some tests were failing to find the 1850 finidat file, more changes t…
ekluzek May 13, 2024
9ecc1bc
Fix a resoplution name in a test
ekluzek May 13, 2024
8bf5f5a
Add test to expected fails
ekluzek May 13, 2024
672da6d
Update change log a bit
ekluzek May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 45 additions & 99 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 8 additions & 37 deletions bld/namelist_files/use_cases/1850_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,18 @@

<sim_year_range>constant</sim_year_range>

<irrigate use_crop=".true." phys="clm5_1">.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>
<irrigate use_crop=".true." >.false.</irrigate>

<stream_year_first_ndep phys="clm4_5" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_5" use_cn=".true." >1850</stream_year_last_ndep>
<stream_year_first_ndep use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." >1850</stream_year_last_ndep>

<stream_year_first_ndep phys="clm5_0" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_0" use_cn=".true." >1850</stream_year_last_ndep>
<stream_year_first_popdens cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens cnfireson=".true." >1850</stream_year_last_popdens>

<stream_year_first_ndep phys="clm5_1" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_1" use_cn=".true." >1850</stream_year_last_ndep>
<stream_year_first_urbantv >1850</stream_year_first_urbantv>
<stream_year_last_urbantv >1850</stream_year_last_urbantv>

<stream_year_first_popdens phys="clm4_5" cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" cnfireson=".true." >1850</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >1850</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_1" cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_1" cnfireson=".true." >1850</stream_year_last_popdens>

<stream_year_first_urbantv phys="clm4_5" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >1850</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >1850</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_1" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_1" >1850</stream_year_last_urbantv>

<stream_fldfilename_ndep phys="clm5_1" use_cn=".true."
>lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>

<stream_fldfilename_ndep phys="clm5_0" use_cn=".true."
>lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>

<stream_fldfilename_ndep phys="clm4_5" use_cn=".true."
<stream_fldfilename_ndep use_cn=".true."
>lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>

<ndep_taxmode phys="clm5_0" use_cn=".true." >cycle</ndep_taxmode>
<ndep_taxmode phys="clm5_1" use_cn=".true." >cycle</ndep_taxmode>

</namelist_defaults>
33 changes: 6 additions & 27 deletions bld/namelist_files/use_cases/1850_noanthro_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,20 @@

<irrigate>.false.</irrigate>

<stream_year_first_ndep phys="clm4_5" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_5" use_cn=".true." >1850</stream_year_last_ndep>
<stream_year_first_ndep use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." >1850</stream_year_last_ndep>

<stream_year_first_ndep phys="clm5_0" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_0" use_cn=".true." >1850</stream_year_last_ndep>

<stream_year_first_ndep phys="clm5_1" use_cn=".true.">1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_1" use_cn=".true.">1850</stream_year_last_ndep>

<ndep_taxmode phys="clm5_0" use_cn=".true." >cycle</ndep_taxmode>
<ndep_taxmode phys="clm5_1" use_cn=".true." >cycle</ndep_taxmode>

<stream_year_first_popdens phys="clm4_5" cnfireson=".true." >1925</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" cnfireson=".true." >1925</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >1925</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >1925</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_1" cnfireson=".true.">1925</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_1" cnfireson=".true.">1925</stream_year_last_popdens>
<stream_year_first_popdens cnfireson=".true." >1925</stream_year_first_popdens>
<stream_year_last_popdens cnfireson=".true." >1925</stream_year_last_popdens>

<!-- zero population density file -->
<stream_fldfilename_popdens hgrid="0.5x0.5" use_cn=".true."
>lnd/clm2/firedata/clmforc.no_anthro_zero_hdm_1x1_simyr1925_181113.nc</stream_fldfilename_popdens>
<stream_meshfile_popdens hgrid="0.5x0.5" use_cn=".true.">none</stream_meshfile_popdens>
<popdensmapalgo use_cn=".true.">nn</popdensmapalgo>

<stream_year_first_urbantv phys="clm5_1" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_1" >1850</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >1850</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >1850</stream_year_last_urbantv>
<stream_year_first_urbantv >1850</stream_year_first_urbantv>
<stream_year_last_urbantv >1850</stream_year_last_urbantv>

<!-- Turn calculation of human stress indices all the way off to save some CPU -->
<calc_human_stress_indices >NONE</calc_human_stress_indices>
Expand Down
38 changes: 9 additions & 29 deletions bld/namelist_files/use_cases/2000_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,17 @@

<sim_year_range>constant</sim_year_range>

<irrigate use_crop=".true." phys="clm5_1" use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".false." >.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>
<irrigate use_crop=".true." use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>

<stream_year_first_ndep phys="clm4_5" use_cn=".true." >2000</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_5" use_cn=".true." >2000</stream_year_last_ndep>
<stream_year_first_ndep use_cn=".true." >2000</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." >2000</stream_year_last_ndep>

<stream_year_first_ndep phys="clm5_0" use_cn=".true." >2000</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_0" use_cn=".true." >2000</stream_year_last_ndep>
<stream_year_first_popdens cnfireson=".true." >2000</stream_year_first_popdens>
<stream_year_last_popdens cnfireson=".true." >2000</stream_year_last_popdens>

<stream_year_first_ndep phys="clm5_1" use_cn=".true.">2000</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_1" use_cn=".true.">2000</stream_year_last_ndep>

<stream_year_first_popdens phys="clm4_5" cnfireson=".true." >2000</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" cnfireson=".true." >2000</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >2000</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >2000</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_1" cnfireson=".true.">2000</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_1" cnfireson=".true.">2000</stream_year_last_popdens>

<stream_year_first_urbantv phys="clm4_5" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_1" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_1" >2000</stream_year_last_urbantv>
<stream_year_first_urbantv >2000</stream_year_first_urbantv>
<stream_year_last_urbantv >2000</stream_year_last_urbantv>

</namelist_defaults>
45 changes: 9 additions & 36 deletions bld/namelist_files/use_cases/2010_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,17 @@

<sim_year_range>constant</sim_year_range>

<irrigate use_crop=".true." phys="clm5_1" use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>
<irrigate use_crop=".true." use_cndv=".false." >.true.</irrigate>
<irrigate use_crop=".true." use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." use_cndv=".false." phys="clm4_5" >.false.</irrigate>

<stream_year_first_ndep phys="clm4_0" bgc="cn" >2010</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_0" bgc="cn" >2010</stream_year_last_ndep>
<stream_year_first_ndep bgc="cn" use_cn=".true." >2010</stream_year_first_ndep>
<stream_year_last_ndep bgc="cn" use_cn=".true." >2010</stream_year_last_ndep>

<stream_year_first_ndep phys="clm4_0" bgc="cndv" >2010</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_0" bgc="cndv" >2010</stream_year_last_ndep>
<stream_year_first_popdens cnfireson=".true." >2010</stream_year_first_popdens>
<stream_year_last_popdens cnfireson=".true." >2010</stream_year_last_popdens>

<stream_year_first_ndep phys="clm4_5" use_cn=".true." >2010</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_5" use_cn=".true." >2010</stream_year_last_ndep>

<stream_year_first_ndep phys="clm5_0" use_cn=".true." >2010</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_0" use_cn=".true." >2010</stream_year_last_ndep>

<stream_year_first_ndep phys="clm5_1" use_cn=".true." >2010</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_1" use_cn=".true." >2010</stream_year_last_ndep>

<stream_year_first_popdens phys="clm4_5" cnfireson=".true." >2010</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" cnfireson=".true." >2010</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >2010</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >2010</stream_year_last_popdens>

<stream_year_first_popdens phys="clm5_1" cnfireson=".true." >2010</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_1" cnfireson=".true." >2010</stream_year_last_popdens>

<stream_year_first_urbantv phys="clm5_1" >2010</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_1" >2010</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" >2010</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >2010</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" >2010</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >2010</stream_year_last_urbantv>
<stream_year_first_urbantv >2010</stream_year_first_urbantv>
<stream_year_last_urbantv >2010</stream_year_last_urbantv>

</namelist_defaults>
56 changes: 15 additions & 41 deletions bld/namelist_files/use_cases/20thC_transient.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,46 +18,20 @@

<clm_demand >flanduse_timeseries</clm_demand>

<irrigate use_crop=".true." phys="clm5_1" use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".false." >.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>

<stream_year_first_ndep phys="clm4_5" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_5" use_cn=".true." >2015</stream_year_last_ndep>
<model_year_align_ndep phys="clm4_5" use_cn=".true." >1850</model_year_align_ndep>

<stream_year_first_ndep phys="clm5_0" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_0" use_cn=".true." >2015</stream_year_last_ndep>
<model_year_align_ndep phys="clm5_0" use_cn=".true." >1850</model_year_align_ndep>

<stream_year_first_ndep phys="clm5_1" use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_1" use_cn=".true." >2015</stream_year_last_ndep>
<model_year_align_ndep phys="clm5_1" use_cn=".true." >1850</model_year_align_ndep>

<stream_year_first_popdens phys="clm4_5" cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" cnfireson=".true." >2016</stream_year_last_popdens>
<model_year_align_popdens phys="clm4_5" cnfireson=".true." >1850</model_year_align_popdens>

<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >2016</stream_year_last_popdens>
<model_year_align_popdens phys="clm5_0" cnfireson=".true." >1850</model_year_align_popdens>

<stream_year_first_popdens phys="clm5_1" cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_1" cnfireson=".true." >2016</stream_year_last_popdens>
<model_year_align_popdens phys="clm5_1" cnfireson=".true." >1850</model_year_align_popdens>

<stream_year_first_urbantv phys="clm4_5" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm4_5" >1850</model_year_align_urbantv>

<stream_year_first_urbantv phys="clm5_0" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm5_0" >1850</model_year_align_urbantv>

<stream_year_first_urbantv phys="clm5_1" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_1" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm5_1" >1850</model_year_align_urbantv>
<irrigate use_crop=".true." use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" use_cndv=".false.">.false.</irrigate>

<stream_year_first_ndep use_cn=".true." >1850</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." >2015</stream_year_last_ndep>
<model_year_align_ndep use_cn=".true." >1850</model_year_align_ndep>

<stream_year_first_popdens cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens cnfireson=".true." >2016</stream_year_last_popdens>
<model_year_align_popdens cnfireson=".true." >1850</model_year_align_popdens>

<stream_year_first_urbantv >1850</stream_year_first_urbantv>
<stream_year_last_urbantv >2106</stream_year_last_urbantv>
<model_year_align_urbantv >1850</model_year_align_urbantv>

</namelist_defaults>
8 changes: 3 additions & 5 deletions bld/namelist_files/use_cases/stdurbpt_pd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@

<urban_hac>'OFF'</urban_hac>

<irrigate use_crop=".true." phys="clm5_1" use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>
<irrigate use_crop=".true." use_cndv=".false.">.true.</irrigate>
<irrigate use_crop=".true." use_cndv=".true." >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>

</namelist_defaults>
Loading
Loading