Merge pull request #203 from mvdebolskiy/pr-ctsm5402-v4

mvdebolskiy · web-flow · commit daa0282aabb0 · 2026-02-28T13:16:39.000+01:00
ctsm5.4.002_noresm_v4: Update fates to sci5_api1
diff --git a/.gitmodules b/.gitmodules
@@ -28,7 +28,7 @@
 [submodule "fates"]
 path = src/fates
 url = https://github.com/NorESMhub/fates
-fxtag = sci.1.88.6_api.42.0.0_nor_sci2_api1
+fxtag = sci.1.88.6_api.42.0.0_nor_sci5_api1
 fxrequired = AlwaysRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/NorESMhub/fates
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -4857,6 +4857,17 @@
       <option name="comment">""</option>
     </options>
   </test>
+
+  <test name="ERS_Ld11_P1536" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesIniSpinup">
+    <machines>
+      <machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:50:00</option>
+      <option name="comment">""</option>
+    </options>
+  </test>
+
   <test name="SMS_D_Ld1000_P1536" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesColdSpinup">
     <machines>
       <machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesIniSpinup/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesIniSpinup/shell_commands
@@ -0,0 +1,8 @@
+./xmlchange DATM_CPLHIST_CASE=n1850fates-nocomp-cplhist
+./xmlchange DATM_CPLHIST_DIR='/cluster/shared/noresm/inputdata/cplhist/noresm3_0/n1850fates-nocomp-cplhist/cpl/hist'
+./xmlchange DATM_YR_START=1
+./xmlchange DATM_YR_END=1
+./xmlchange DATM_YR_ALIGN=1
+./xmlchange DATM_PRESNDEP=none
+./xmlchange LND_TUNING_MODE="clm6_0_cam7.0"
+./xmlchange ROF_NCPL='$ATM_NCPL'
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesIniSpinup/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesIniSpinup/user_nl_clm
@@ -0,0 +1,3 @@
+use_fates_fixed_biogeog = .true.
+fates_radiation_model='twostream'
+finidat='$DIN_LOC_ROOT/lnd/clm2/initdata_esmf/ctsm5.4/n1850.ne30pg3_tn14.noresm3_0_beta10_beta_testing_20260131.nc'
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesIniSpinup/user_nl_datm b/cime_config/testdefs/testmods_dirs/clm/FatesIniSpinup/user_nl_datm
@@ -0,0 +1,3 @@
+iradsw = -1
+nextsw_cday_calc = "cam7"
+
diff --git a/src/fates b/src/fates
@@ -1 +1 @@
-Subproject commit 82e7c0bbf23b64c239924b705fd630ce7237580c
+Subproject commit a0a277edd210f9f105cdd9ada58fcd50c53cc384

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+use_fates_fixed_biogeog = .true.`
	`2`	`+fates_radiation_model='twostream'`
	`3`	`+finidat='$DIN_LOC_ROOT/lnd/clm2/initdata_esmf/ctsm5.4/n1850.ne30pg3_tn14.noresm3_0_beta10_beta_testing_20260131.nc'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+iradsw = -1`
	`2`	`+nextsw_cday_calc = "cam7"`
	`3`	`+`