Skip to content

Commit fb263bc

Browse files
author
Jessica Needham
committed
Merge branch 'noresm' into fates_nl_lulogic
2 parents cd4aef7 + e4241c8 commit fb263bc

File tree

13 files changed

+52
-38
lines changed

13 files changed

+52
-38
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[submodule "fates"]
2929
path = src/fates
3030
url = https://github.com/NorESMhub/fates
31-
fxtag = sci.1.85.1_api.40.0.0_noresm_v4
31+
fxtag = sci.1.85.1_api.40.0.0_nor_sci1_api1
3232
fxrequired = AlwaysRequired
3333
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
3434
fxDONOTUSEurl = https://github.com/NorESMhub/fates

‎bld/CLMBuildNamelist.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ sub setup_cmdl_spinup {
12281228
}
12291229
}
12301230
$log->verbose_message("CLM accelerated spinup mode is $val");
1231-
if ( &value_is_true($nl_flags->{'use_cn'}) ) {
1231+
if ( &value_is_true($nl_flags->{'use_cn'}) or &value_is_true($nl_flags->{'use_fates'}) ) {
12321232
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition,
12331233
$defaults, $nl, "spinup_state", clm_accelerated_spinup=>$nl_flags->{'clm_accelerated_spinup'},
12341234
use_cn=>$nl_flags->{'use_cn'}, use_fates=>$nl_flags->{'use_fates'},
@@ -1246,7 +1246,7 @@ sub setup_cmdl_spinup {
12461246
$nl_flags->{'bgc_spinup'} = "off";
12471247
}
12481248
# For AD spinup mode by default reseed dead plants
1249-
if ( $nl_flags->{$var} ne "off" ) {
1249+
if ( $nl_flags->{$var} ne "off" and (not &value_is_true($nl_flags->{'use_fates'}) )) {
12501250
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition,
12511251
$defaults, $nl, "reseed_dead_plants", clm_accelerated_spinup=>$nl_flags->{$var},
12521252
use_cn=>$nl_flags->{'use_cn'} );
@@ -2250,7 +2250,7 @@ sub setup_logic_params_file {
22502250

22512251
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'paramfile',
22522252
'phys'=>$nl_flags->{'phys'},
2253-
'use_flexibleCN'=>$nl_flags->{'use_flexibleCN'} );
2253+
'use_flexibleCN'=>$nl_flags->{'use_flexibleCN'}, 'use_fates'=>$nl_flags->{'use_fates'});
22542254
}
22552255

22562256
#-------------------------------------------------------------------------------

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
532532
<!-- The default filenames are given relative to the root directory
533533
for the CLM2 data in the CESM distribution -->
534534
<!-- Plant function types (relative to {csmdata}) -->
535-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c250311.nc</paramfile>
535+
<paramfile phys="clm6_0">lnd/clm2/paramdata/ctsm60_params.c250311.nc</paramfile>
536+
<paramfile phys="clm6_0" use_fates=".true.">lnd/clm2/paramdata/ctsm60_params.5.3.045_noresm_v14_c251031.nc</paramfile>
536537
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c250311.nc</paramfile>
537538
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c250311.nc</paramfile>
538539

@@ -541,8 +542,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
541542
<!-- ================================================================== -->
542543

543544
<!-- <fates_paramfile>lnd/clm2/paramdata/fates_params_api.36.1.0_14pft_c241003.nc</fates_paramfile> -->
544-
<fates_paramfile>lnd/clm2/paramdata/fates_params_api.40.0.0_14pft_c250807_noresm_v250812__noresm_v25a.nc</fates_paramfile>
545-
545+
<fates_paramfile>lnd/clm2/paramdata/fates_params_sci.1.85.1_api.40.0.0_14pft_nor_sci1_api1_c251031.nc</fates_paramfile>
546546
<!-- ================================================================== -->
547547
<!-- Default surface roughness parameterization -->
548548
<!-- ================================================================== -->

‎cime_config/config_pes.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,13 +2014,13 @@
20142014
<comment>none</comment>
20152015
<ntasks>
20162016
<ntasks_atm>-1</ntasks_atm>
2017-
<ntasks_lnd>-7</ntasks_lnd>
2018-
<ntasks_rof>-7</ntasks_rof>
2019-
<ntasks_ice>-7</ntasks_ice>
2020-
<ntasks_ocn>-7</ntasks_ocn>
2021-
<ntasks_glc>-7</ntasks_glc>
2022-
<ntasks_wav>-7</ntasks_wav>
2023-
<ntasks_cpl>-7</ntasks_cpl>
2017+
<ntasks_lnd>-17</ntasks_lnd>
2018+
<ntasks_rof>-17</ntasks_rof>
2019+
<ntasks_ice>-17</ntasks_ice>
2020+
<ntasks_ocn>-17</ntasks_ocn>
2021+
<ntasks_glc>-17</ntasks_glc>
2022+
<ntasks_wav>-17</ntasks_wav>
2023+
<ntasks_cpl>-17</ntasks_cpl>
20242024
</ntasks>
20252025
<nthrds>
20262026
<nthrds_atm>1</nthrds_atm>
@@ -2089,13 +2089,13 @@
20892089
<comment>none</comment>
20902090
<ntasks>
20912091
<ntasks_atm>-2</ntasks_atm>
2092-
<ntasks_lnd>-7</ntasks_lnd>
2093-
<ntasks_rof>-7</ntasks_rof>
2094-
<ntasks_ice>-7</ntasks_ice>
2095-
<ntasks_ocn>-7</ntasks_ocn>
2096-
<ntasks_glc>-7</ntasks_glc>
2097-
<ntasks_wav>-7</ntasks_wav>
2098-
<ntasks_cpl>-7</ntasks_cpl>
2092+
<ntasks_lnd>-10</ntasks_lnd>
2093+
<ntasks_rof>-10</ntasks_rof>
2094+
<ntasks_ice>-10</ntasks_ice>
2095+
<ntasks_ocn>-10</ntasks_ocn>
2096+
<ntasks_glc>-10</ntasks_glc>
2097+
<ntasks_wav>-10</ntasks_wav>
2098+
<ntasks_cpl>-10</ntasks_cpl>
20992099
</ntasks>
21002100
<nthrds>
21012101
<nthrds_atm>1</nthrds_atm>
@@ -2121,19 +2121,19 @@
21212121
</mach>
21222122
</grid>
21232123

2124-
<grid name="l%1.9x2.5|l%ne16np4.pg3">
2124+
<grid name="l%ne16np4.pg3">
21252125
<mach name="betzy">
21262126
<pes pesize="L" compset="any">
21272127
<comment>none</comment>
21282128
<ntasks>
21292129
<ntasks_atm>-1</ntasks_atm>
2130-
<ntasks_lnd>-4</ntasks_lnd>
2131-
<ntasks_rof>-4</ntasks_rof>
2132-
<ntasks_ice>-4</ntasks_ice>
2133-
<ntasks_ocn>-4</ntasks_ocn>
2134-
<ntasks_glc>-4</ntasks_glc>
2135-
<ntasks_wav>-4</ntasks_wav>
2136-
<ntasks_cpl>-4</ntasks_cpl>
2130+
<ntasks_lnd>-8</ntasks_lnd>
2131+
<ntasks_rof>-8</ntasks_rof>
2132+
<ntasks_ice>-8</ntasks_ice>
2133+
<ntasks_ocn>-8</ntasks_ocn>
2134+
<ntasks_glc>-8</ntasks_glc>
2135+
<ntasks_wav>-8</ntasks_wav>
2136+
<ntasks_cpl>-8</ntasks_cpl>
21372137
</ntasks>
21382138
<nthrds>
21392139
<nthrds_atm>1</nthrds_atm>

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4433,16 +4433,16 @@
44334433
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
44344434
</machines>
44354435
<options>
4436-
<option name="wallclock">01:50:00</option>
4436+
<option name="wallclock">00:50:00</option>
44374437
<option name="comment">""</option>
44384438
</options>
44394439
</test>
4440-
<test name="ERI_D_Ld11" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesColdSpinup">
4440+
<test name="ERI_D_Ld11" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesColdSpinupAD">
44414441
<machines>
4442-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
4442+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
44434443
</machines>
44444444
<options>
4445-
<option name="wallclock">01:50:00</option>
4445+
<option name="wallclock">00:50:00</option>
44464446
<option name="comment">""</option>
44474447
</options>
44484448
</test>

‎cime_config/testdefs/testmods_dirs/clm/FatesColdSpinup/shell_commands‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
./xmlchange DATM_YR_ALIGN=1
66
./xmlchange DATM_PRESNDEP=none
77
./xmlchange LND_TUNING_MODE="clm6_0_cam7.0"
8-
./xmlchange ROF_NCPL='$ATM_NCPL'
8+
./xmlchange ROF_NCPL='$ATM_NCPL'

‎cime_config/testdefs/testmods_dirs/clm/FatesColdSpinupAD/include_user_mods‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../FatesCold

‎cime_config/testdefs/testmods_dirs/clm/FatesColdSpinupAD/shell_commands‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
./xmlchange DATM_CPLHIST_CASE=n1850fates-nocomp-cplhist
2+
./xmlchange DATM_CPLHIST_DIR='/cluster/shared/noresm/inputdata/cplhist/noresm3_0/n1850fates-nocomp-cplhist/cpl/hist'
3+
./xmlchange DATM_YR_START=1
4+
./xmlchange DATM_YR_END=1
5+
./xmlchange DATM_YR_ALIGN=1
6+
./xmlchange DATM_PRESNDEP=none
7+
./xmlchange LND_TUNING_MODE="clm6_0_cam7.0"
8+
./xmlchange ROF_NCPL='$ATM_NCPL'
9+

‎cime_config/testdefs/testmods_dirs/clm/FatesColdSpinupAD/user_nl_datm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
iradsw = -1
2+
nextsw_cday_calc = "cam7"
3+

‎cime_config/usermods_dirs/clm/fates_nocomp/user_nl_clm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
! Turn FATES-NOCOMP mode on
22
use_fates_nocomp = .true.
3+
use_fates_fixed_biogeog = .true.
4+
! Add FCO2 always to the variable list
5+
6+
hist_fincl1 += 'FCO2'

0 commit comments

Comments
 (0)