Skip to content

Commit

Permalink
Merge branch 'updatetodev176' of github.com:ekluzek/CTSM into updatet…
Browse files Browse the repository at this point in the history 
…odev176

 Conflicts:
	cime_config/buildnml
  • Loading branch information
@ekluzek
ekluzek committed Apr 16, 2024
2 parents e92db99 + 96ca8c1 commit 8a255d0
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 9 deletions.
38 changes: 36 additions & 2 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,26 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
>30.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam6.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam5.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam4.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_1_cam6.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_1_cam5.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_1_cam4.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm6_0_cam6.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm6_0_cam5.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm6_0_cam4.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam5.0"
>20.0d00</rh_low>
<rh_low fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam4.0"
>20.0d00</rh_low>
<rh_hgh fire_method="li2016crufrc" >80.0d00</rh_hgh>
<bt_min fire_method="li2016crufrc" >0.85d00</bt_min>
<bt_max fire_method="li2016crufrc" >0.98d00</bt_max>
Expand All @@ -260,10 +276,26 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
>0.010d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam6.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam5.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam4.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_1_cam6.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_1_cam5.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_1_cam4.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm6_0_cam6.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm6_0_cam5.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm6_0_cam4.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam5.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<pot_hmn_ign_counts_alpha fire_method="li2016crufrc" lnd_tuning_mode="clm5_0_cam4.0"
>0.008d00</pot_hmn_ign_counts_alpha>
<non_boreal_peatfire_c fire_method="li2016crufrc" >0.17d-3</non_boreal_peatfire_c>
<cropfire_a1 fire_method="li2016crufrc" >1.6d-4</cropfire_a1>
<occur_hi_gdp_tree fire_method="li2016crufrc" >0.33d00</occur_hi_gdp_tree>
Expand Down Expand Up @@ -642,7 +674,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!--
clm6_0 physics with CAM6.0 grids...
-->
<!-- These first five are for SP mode and CLM5.1 only -->
<!-- These first five are for SP mode and CLM6.0 only -->
<use_init_interp use_cndv=".false." use_fates=".false." sim_year="1979" lnd_tuning_mode="clm6_0_cam6.0"
maxpft="17" use_cn=".false." use_crop=".false." hgrid="0.9x1.25" >.true.</use_init_interp>
<use_init_interp use_cndv=".false." use_fates=".false." sim_year="1979" lnd_tuning_mode="clm6_0_cam6.0"
Expand Down Expand Up @@ -676,8 +708,10 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<use_init_interp use_cndv=".false." use_fates=".false." phys="clm5_0" lnd_tuning_mode="clm5_0_cam4.0" >.false.</use_init_interp>
<use_init_interp use_cndv=".false." use_fates=".false." phys="clm5_1" lnd_tuning_mode="clm5_1_cam5.0" >.false.</use_init_interp>
<use_init_interp use_cndv=".false." use_fates=".false." phys="clm5_1" lnd_tuning_mode="clm5_1_cam4.0" >.false.</use_init_interp>
<use_init_interp use_cndv=".false." use_fates=".false." phys="clm5_1" lnd_tuning_mode="clm6_0_cam5.0" >.false.</use_init_interp>
<use_init_interp use_cndv=".false." use_fates=".false." phys="clm5_1" lnd_tuning_mode="clm6_0_cam4.0" >.false.</use_init_interp>
<!-- Default to FALSE if couldn't find a match -->
<use_init_interp >.false.</use_init_interp>
<use_init_interp >.false.</use_init_interp>
<!-- NOTE: if use_init_interp is FALSE that indicates that you can't interpolate from an initial conditions file that's similar
Either an existing file is too different, too different in the year, or a configuration that can't interpolate
initial condition files.
Expand Down
2 changes: 2 additions & 0 deletions bld/namelist_files/namelist_defaults_overall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ determine default values for namelists.
<clm_start_type phys="clm5_0" lnd_tuning_mode="clm5_0_cam4.0" >cold</clm_start_type>
<clm_start_type phys="clm5_1" lnd_tuning_mode="clm5_1_cam5.0" >cold</clm_start_type>
<clm_start_type phys="clm5_1" lnd_tuning_mode="clm5_1_cam4.0" >cold</clm_start_type>
<clm_start_type phys="clm6_0" lnd_tuning_mode="clm6_0_cam5.0" >cold</clm_start_type>
<clm_start_type phys="clm6_0" lnd_tuning_mode="clm6_0_cam4.0" >cold</clm_start_type>

<clm_start_type sim_year_range="1850-2100">arb_ic</clm_start_type>

Expand Down
6 changes: 3 additions & 3 deletions bld/unit_testers/build-namelist_test.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile {
#
# Figure out number of tests that will run
#
my $ntests = 2517;
my $ntests = 2511;

if ( defined($opts{'compare'}) ) {
$ntests += 1549;
$ntests += 1545;
}
plan( tests=>$ntests );

Expand Down Expand Up @@ -1199,7 +1199,7 @@ sub cat_and_create_namelistinfile {
phys=>"clm5_0",
},
"NOlunabutsetJmaxb1" =>{ options=>"-envxml_dir . -bgc sp",
namelst=>"use_luna=.fwlse., jmaxb1=1.0",
namelst=>"use_luna=.false., jmaxb1=1.0",
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_0",
},
Expand Down
6 changes: 3 additions & 3 deletions cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<option name="comment">CESM3 development test at the standard coupled resolution for 2000</option>
</options>
</test>
<test name="SMS_P128x72_Ld5" grid="hcru_hcru_mt13" compset="I2000Clm60Sp" testmods="clm/default">
<test name="SMS_Ld5" grid="hcru_hcru_mt13" compset="I2000Clm60Sp" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
Expand All @@ -164,7 +164,7 @@
<option name="comment" >CTSM science test list for the half degree grid with latest CLM version for 2000</option>
</options>
</test>
<test name="SMS_P128x72_Ld5" grid="hcru_hcru_mt13" compset="IHistClm60BgcCrop" testmods="clm/default">
<test name="SMS_Ld5" grid="hcru_hcru_mt13" compset="IHistClm60BgcCrop" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
Expand Down Expand Up @@ -227,7 +227,7 @@
<option name="comment">Higher resolution mpasa grid for CAM with latest CLM version. Include it in the less frequent ctsm_sci testing.</option>
</options>
</test>
<test name="SMS_P36x128_Ln9" grid="mpasa15_mpasa15" compset="I2000Clm60SpRs" testmods="clm/clm60cam6LndTuningMode">
<test name="SMS_Ln9" grid="mpasa15_mpasa15" compset="I2000Clm60SpRs" testmods="clm/clm60cam6LndTuningMode">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
Expand Down
2 changes: 1 addition & 1 deletion doc/ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The following fields were added and removed to the list of fields on the dataset

Fields added:
ORGC, BULK, CFRAG, PHAQ (soil data) (currently NOT used by CTSM)
mapunits (map units for the soil dataset)
mapunits (map units from the soil dataset)
LANDFRAC_MKSURFDATA (for reference NOT used by CTSM)
PCT_OCEAN (previously PCT_WETLAND was used)

Expand Down

0 comments on commit 8a255d0

Please sign in to comment.