Merge branch 'rgknox/lnd/spinup-np-tweaks-v2' (PR #5604)

This set of changes refactors the logic behind N and P supplementation in land bgc. Also, ecosystem (free-living) N fixation was enabled for fates runs. [non-BFB]
E3SM-Project · May 16, 2023 · 28feac5 · 28feac5
2 parents a0487df + 03ee01d
commit 28feac5
Show file tree

Hide file tree

Showing 8 changed files with 259 additions and 155 deletions.
diff --git a/cime_config/machines/cmake_macros/gnu_eddi.cmake b/cime_config/machines/cmake_macros/gnu_eddi.cmake
@@ -4,10 +4,10 @@ if (COMP_NAME STREQUAL gptl)
 endif()
 set(NETCDF_PATH "$ENV{NETCDF_HOME}")
 if (NOT DEBUG)
-  string(APPEND FFLAGS " -fno-unsafe-math-optimizations")
+  string(APPEND FFLAGS " -fno-unsafe-math-optimizations -fallow-argument-mismatch -fallow-invalid-boz")
 endif()
 if (DEBUG)
-  string(APPEND FFLAGS " -g -fbacktrace -fbounds-check -ffpe-trap=invalid,zero,overflow")
+  string(APPEND FFLAGS " -g -fbacktrace -fbounds-check -ffpe-trap=invalid,zero,overflow -fallow-argument-mismatch -fallow-invalid-boz -Wall")
 endif()
 string(APPEND SLIBS " -L$ENV{NETCDF_HOME}/lib/ -lnetcdff -lnetcdf -lcurl -llapack -lblas")
 if (MPILIB STREQUAL mpi-serial)

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -4319,31 +4319,34 @@
     <DESC>small developer workhorse at lbl climate sciences</DESC>
     <OS>LINUX</OS>
     <COMPILERS>gnu</COMPILERS>
-    <MPILIBS>mpi-serial</MPILIBS>
+    <MPILIBS>openmpi</MPILIBS>
     <PROJECT>ngeet</PROJECT>
     <CIME_OUTPUT_ROOT>/raid1/lbleco/e3sm/</CIME_OUTPUT_ROOT>
-    <DIN_LOC_ROOT>/raid1/lbleco/cesm/cesm_input_datasets/</DIN_LOC_ROOT>
-    <DIN_LOC_ROOT_CLMFORC>/raid1/lbleco/cesm/cesm_input_datasets/atm/datm7/</DIN_LOC_ROOT_CLMFORC>
-    <DOUT_S_ROOT>/raid1/lbleco/acme/cesm_archive/$CASE</DOUT_S_ROOT>
-    <BASELINE_ROOT>/raid1/lbleco/acme/cesm_baselines/$COMPILER</BASELINE_ROOT>
+    <DIN_LOC_ROOT>/home/rgknox/Models/InputDatasets/cesm_input_data/</DIN_LOC_ROOT>
+    <DIN_LOC_ROOT_CLMFORC>/home/rgknox/Models/InputDatasets/cesm_input_data/atm/datm7/</DIN_LOC_ROOT_CLMFORC>
+    <DOUT_S_ROOT>/home/rgknox/Models//cesm_archive/$CASE</DOUT_S_ROOT>
+    <BASELINE_ROOT>/home/rgknox/Models//cesm_baselines/$COMPILER</BASELINE_ROOT>
     <CCSM_CPRNC>/raid1/lbleco/cesm/cesm_tools/cprnc/cprnc</CCSM_CPRNC>
     <GMAKE_J>1</GMAKE_J>
     <BATCH_SYSTEM>none</BATCH_SYSTEM>
     <SUPPORTED_BY>rgknox at lbl gov</SUPPORTED_BY>
-    <MAX_TASKS_PER_NODE>4</MAX_TASKS_PER_NODE>
-    <MAX_MPITASKS_PER_NODE>4</MAX_MPITASKS_PER_NODE>
+    <MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
+    <MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
     <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
     <mpirun mpilib="mpi-serial">
       <executable/>
     </mpirun>
-    <mpirun mpilib="default">
+    <mpirun mpilib="openmpi">
       <executable>mpirun</executable>
       <arguments>
         <arg name="num_tasks">-np {{ total_tasks }}</arg>
         <arg name="tasks_per_node"> -npernode $MAX_MPITASKS_PER_NODE</arg>
       </arguments>
     </mpirun>
     <module_system type="none"/>
+    <environment_variables compiler="gnu" > 
+      <env name="CMAKE_ROOT">/usr/local/share/cmake-3.21/</env>
+    </environment_variables>
   </machine>
 
   <machine MACH="summit">