adding mimics+ decomp method, namelist,testmods, testlist

elisacw · Dec 18, 2024 · 09bd2fb · 09bd2fb
1 parent 95a4d93
commit 09bd2fb
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 4 deletions.
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -90,11 +90,11 @@ OPTIONS
                                 sp    = Satellite Phenology (SP)
                                     This toggles off the namelist variable: use_cn
                                 bgc   = Carbon Nitrogen with methane, nitrification, vertical soil C,
-                                        CENTURY or MIMICS decomposition
+                                        CENTURY, MIMICS or MIMICSplus decomposition
 				        This toggles on the namelist variables:
                                           use_cn, use_lch4, use_nitrif_denitrif
 				fates = FATES/Ecosystem Demography with below ground BGC
-				        CENTURY or MIMICS decomposition
+				        CENTURY, MIMICS or MIMICSplus decomposition
                                         This toggles on the namelist variables:
 				        use_fates. use_lch4 and use_nitrif_denitrif are optional
 
@@ -949,6 +949,12 @@ sub setup_cmdl_bgc {
            $log->warning("If MIMICS is on and use_fates = .true. then use_lch4 must be .true. and currently it's not" );
         }
      }
+      # if MIMICS+ is on and use_fates = .true. then use_lch4 must = .true.
+     if ( (! &value_is_true($nl_flags->{'use_lch4'})) && &value_is_true($nl_flags->{'use_fates'}) ) {
+        if ( $soil_decomp_method eq "MIMICSplusAas2023" ) {
+           $log->warning("If MIMICSplus is on and use_fates = .true. then use_lch4 must be .true. and currently it's not" );
+        }
+     }
   }
   #
   # Set FUN for BGC

diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -2365,11 +2365,13 @@ Number of days over which to use exponential relaxation of NPP in N fixation cal
 
 <!-- Soil decomposition options  -->
 <entry id="soil_decomp_method" type="char*20" category="clm_physics"
-       group="soilbgc_decomp" valid_values="None,CENTURYKoven2013,MIMICSWieder2015" >
+       group="soilbgc_decomp" valid_values="None,CENTURYKoven2013,MIMICSWieder2015,MIMICSplusAas2023" >
 Soil decomposition method
   None --  No soil decomposition is done
   CENTURYKoven2013 -- CENTURY model in CTSM from Koven et. al. 2013
   MIMICSWieder2015 -- MIMICS model in CTSM from Wieder et. al. 2015
+  MIMICSplusAas2023 -- MIMICSplus model in CTSM from Aas et al. 2023
+
 
 An active soil decomposition method requires the BGC or FATES model to work 
 And both BGC and FATES models require an active soil decomposition model

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -1167,6 +1167,33 @@
       <option name="wallclock">00:20:00</option>
       <option name="comment"  >Test soil_decomp_method = 'MIMICSWieder2015' with Newton-Krylov spinup variables on</option>
     </options>
+  </test>
+   <test name="ERP_D_P36x2_Ld3" grid="f10_f10_mg37" compset="I1850Clm51BgcCrop" testmods="clm/mimicsplus">
+    <machines>
+      <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Test soil_decomp_method = 'MIMICSplusAas2023'</option>
+    </options>
+  </test>
+  <test name="SMS_Ld5_Mmpi-serial" grid="1x1_brazil" compset="IHistClm50BgcQianRs" testmods="clm/mimicsplus">
+    <machines>
+      <machine name="izumi" compiler="gnu" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Test soil_decomp_method = 'MIMICSplusAas2023'</option>
+    </options>
+  </test>
+  <test name="SMS_Ly5_Mmpi-serial" grid="1x1_brazil" compset="IHistClm50BgcQianRs" testmods="clm/newton_krylov_spinup">
+    <machines>
+      <machine name="izumi" compiler="intel" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Test soil_decomp_method = 'MIMICSplusAas2023'</option>
+    </options>
   </test>
   <test name="ERP_D_P64x2_Ld3" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN">
     <machines>
@@ -2904,6 +2931,16 @@
       <option name="comment">30 day exact restart test with threading, running FATES-MIMICS on an f45 grid.</option>
     </options>
   </test>
+  <test name="ERP_P72x2_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/mimicsplusFatesCold">
+    <machines>
+      <machine name="cheyenne" compiler="intel" category="aux_clm"/>
+      <machine name="cheyenne" compiler="intel" category="fates"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">30 day exact restart test with threading, running FATES-MIMICSplus on an f45 grid.</option>
+    </options>
+  </test>
   <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm">

diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsplus/README b/cime_config/testdefs/testmods_dirs/clm/mimicsplus/README
@@ -0,0 +1,2 @@
+This test mod turns on the MIMICSplus instead of the MIMICS or CENTURY below-ground
+biogeochemistry.
diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsplus/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/mimicsplus/include_user_mods
@@ -0,0 +1 @@
+../coldStart
diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsplus/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/mimicsplus/user_nl_clm
@@ -0,0 +1 @@
+soil_decomp_method = 'MIMICSplusAas2023'
diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsplusFatesCold/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/mimicsplusFatesCold/include_user_mods
@@ -0,0 +1,2 @@
+../Fates
+../mimicsplus
diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsplusFatesCold/shell_commands b/cime_config/testdefs/testmods_dirs/clm/mimicsplusFatesCold/shell_commands
@@ -0,0 +1 @@
+./xmlchange CLM_FORCE_COLDSTART="on"
diff --git a/python/ctsm/test/testinputs/default_data.cfg b/python/ctsm/test/testinputs/default_data.cfg
@@ -1,5 +1,5 @@
 [main]
-clmforcingindir = /glade/campaign/cesm/cesmdata/cseg/inputdata
+clmforcingindir = /cluster/shared/noresm/inputdata
 
 [datm_gswp3]
 dir = atm/datm7/atm_forcing.datm7.GSWP3.0.5d.v1.c170516
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This test mod turns on the MIMICSplus instead of the MIMICS or CENTURY below-ground
		biogeochemistry.