Skip to content

Commit

Permalink
Merge pull request #2501 from ekluzek/fixclm50defaults
Browse files Browse the repository at this point in the history 
Fix clm6_0 defaults
  • Loading branch information
@ekluzek
ekluzek committed May 13, 2024
2 parents 7cf411a + 672da6d commit 75b34d2
Show file tree
Hide file tree
Showing 18 changed files with 654 additions and 356 deletions.
144 changes: 45 additions & 99 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file

Large diffs are not rendered by default.

45 changes: 8 additions & 37 deletions bld/namelist_files/use_cases/1850_control.xml
View file
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
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
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
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
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
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>

0 comments on commit 75b34d2

Please sign in to comment.