E3SM-Project · rljacob · Dec 21, 2023 · Jan 3, 2023 · Jan 3, 2023 · Jan 3, 2023
diff --git a/cime_config/machines/cmake_macros/gnu_anlgce-ub18.cmake b/cime_config/machines/cmake_macros/gnu_anlgce-ub18.cmake
@@ -7,3 +7,4 @@ if (NOT DEBUG)
 endif()
 string(APPEND SLIBS " -lblas -llapack")
 set(ZLIB_PATH "$ENV{ZLIB_PATH}")
+set(MOAB_PATH "$ENV{MOAB_PATH}")
diff --git a/cime_config/machines/cmake_macros/gnu_anlgce.cmake b/cime_config/machines/cmake_macros/gnu_anlgce.cmake
@@ -7,3 +7,4 @@ if (NOT DEBUG)
 endif()
 string(APPEND SLIBS " -lblas -llapack")
 set(ZLIB_PATH "$ENV{ZLIB_PATH}")
+set(MOAB_PATH "$ENV{MOAB_PATH}")
diff --git a/cime_config/machines/cmake_macros/gnu_chrysalis.cmake b/cime_config/machines/cmake_macros/gnu_chrysalis.cmake
@@ -2,5 +2,6 @@ if (COMP_NAME STREQUAL gptl)
   string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
 endif()
 set(PIO_FILESYSTEM_HINTS "gpfs")
+set(MOAB_PATH "/lcrc/soft/climate/moab/chrysalis/gnu")
 string(APPEND SLIBS " -Wl,--start-group $ENV{MKLROOT}/lib/intel64/libmkl_gf_lp64.a $ENV{MKLROOT}/lib/intel64/libmkl_sequential.a $ENV{MKLROOT}/lib/intel64/libmkl_core.a -Wl,--end-group -lpthread -lm -ldl")
 string(APPEND CXX_LIBS " -lstdc++")
diff --git a/cime_config/machines/cmake_macros/intel_chrysalis.cmake b/cime_config/machines/cmake_macros/intel_chrysalis.cmake
@@ -17,6 +17,7 @@ if (NOT DEBUG)
   string(APPEND FFLAGS " -O3 -qno-opt-dynamic-align")
 endif()
 set(PIO_FILESYSTEM_HINTS "gpfs")
+set(MOAB_PATH "/lcrc/soft/climate/moab/chrysalis/intel")
 string(APPEND SLIBS " -mkl")
 string(APPEND LDFLAGS " -static-intel")
 if (MPILIB STREQUAL impi)

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -1804,6 +1804,8 @@
       <env name="HDF5_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/hdf5/1.12.1/mpich-4.0/gcc-11.1.0</env>
       <env name="NETCDF_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/netcdf/4.8.0c-4.3.1cxx-4.5.3f-parallel/mpich-4.0/gcc-11.1.0</env>
       <env name="PNETCDF_PATH">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/pnetcdf/1.12.2/mpich-4.0/gcc-11.1.0</env>
+      <env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /nfs/gce/projects/climate/software/moab/devel/mpich-4.0/gcc-11.1.0; else echo "$MOAB_ROOT"; fi}</env>
+      <env name="MOAB_PATH">/nfs/gce/projects/climate/software/moab/devel/mpich-4.0/gcc-11.1.0</env>
     </environment_variables>
     <environment_variables mpilib="openmpi">
       <!-- We currently don't have modules for HDF5, NetCDF & PnetCDF -->
@@ -2240,9 +2242,11 @@
     </environment_variables>
     <environment_variables compiler="intel" mpilib="openmpi">
       <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/openmpi-4.1.3/intel-20.0.4; else echo "$ADIOS2_ROOT"; fi}</env>
+      <env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/chrysalis/intel; else echo "$MOAB_ROOT"; fi}</env>
     </environment_variables>
     <environment_variables compiler="gnu" mpilib="openmpi">
       <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/openmpi-4.1.3/gcc-9.2.0; else echo "$ADIOS2_ROOT"; fi}</env>
+      <env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/chrysalis/gnu; else echo "$MOAB_ROOT"; fi}</env>
     </environment_variables>
     <environment_variables compiler="intel" mpilib="impi">
       <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/intel-mpi-2019.9.304/intel-20.0.4; else echo "$ADIOS2_ROOT"; fi}</env>

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -92,6 +92,11 @@ endif()
 
 project(E3SM C CXX Fortran)
 
+if (COMP_INTERFACE STREQUAL "moab")
+  set(USE_MOAB True)
+  set(CPPDEFS "${CPPDEFS} -DHAVE_MOAB")
+endif()
+
 if(USE_CUDA)
   enable_language(CUDA)
 elseif(USE_HIP)

diff --git a/components/cice/bld/config_files/definition.xml b/components/cice/bld/config_files/definition.xml
@@ -4,7 +4,7 @@
 
 <config_definition>
 
-<entry id="comp_intf" valid_values="MCT,ESMF" value="MCT">
+<entry id="comp_intf" valid_values="MCT,ESMF,MOAB" value="MOAB">
 CICE build directory; contains .o and .mod files.
 </entry>
 

diff --git a/components/cmake/build_model.cmake b/components/cmake/build_model.cmake
@@ -233,6 +233,9 @@ function(build_model COMP_CLASS COMP_NAME)
         target_link_libraries(${TARGET_NAME} ${ITEM})
       endif()
     endforeach()
+    if (USE_MOAB)
+      target_include_directories(${TARGET_NAME} PRIVATE ${MOAB_INCLUDE_DIRS})
+    endif()
 
     foreach(ITEM IN LISTS ALL_LIBS_LIST)
       target_link_libraries(${TARGET_NAME} ${ITEM})
@@ -243,6 +246,10 @@ function(build_model COMP_CLASS COMP_NAME)
     add_library(${TARGET_NAME})
     target_sources(${TARGET_NAME} PRIVATE ${REAL_SOURCES})
     target_link_libraries(${TARGET_NAME} PRIVATE csm_share)
+    if (USE_MOAB)
+      target_link_libraries(${TARGET_NAME} PRIVATE ${MOAB_LIBRARIES})
+      target_include_directories(${TARGET_NAME} PRIVATE ${MOAB_INCLUDE_DIRS})
+    endif()
     if (COMP_NAME STREQUAL "eam")
       if (USE_YAKL)
         target_link_libraries(${TARGET_NAME} PRIVATE yakl)

diff --git a/components/cmake/find_dep_packages.cmake b/components/cmake/find_dep_packages.cmake
@@ -30,6 +30,10 @@ if (USE_ALBANY OR USE_TRILINOS)
   find_package(Trilinos REQUIRED)
 endif()
 
+if (USE_MOAB)
+  find_package(MOAB REQUIRED)
+endif()
+
 if (USE_ALBANY)
   find_package(Albany REQUIRED)
 endif()

diff --git a/components/eam/bld/config_files/definition.xml b/components/eam/bld/config_files/definition.xml
@@ -23,8 +23,8 @@ are specified as a comma separated list with no embedded white space.
 <entry id="ccsm_seq" valid_values="0,1" value="0">
 Switch specifies whether CAM is being built by the CCSM sequential scripts.  0 => no, 1 => yes.
 </entry>
-<entry id="comp_intf" valid_values="mct,esmf" value="mct">
-Component interfaces: mct or esmf.  Default: mct.
+<entry id="comp_intf" valid_values="mct,esmf,moab" value="mct">
+Component interfaces: mct, esmf, or moab.  Default: mct.
 </entry>
 <entry id="dyn" valid_values="eul,sld,fv,homme,se" value="">
 Dynamics package: eul, sld, fv, or se.

diff --git a/components/eam/bld/configure b/components/eam/bld/configure
@@ -131,7 +131,7 @@ OPTIONS
                         clubb_single_prec (Run CLUBB in single precision)
      -co2_cycle         This option is meant to be used with the -ccsm_seq option.  It modifies the
                         EAM configuration by increasing the number of advected constituents by 4.
-     -comp_intf         Specify the component interfaces [mct | esmf] (default: mct).
+     -comp_intf         Specify the component interfaces [mct | esmf | moab] (default: mct).
      -cppdefs <string>  A string of user specified CPP defines.  Appended to
                         Makefile defaults.  E.g. -cppdefs '-DVAR1 -DVAR2'
      -dyn <name>        Build EAM with specified dynamical core [eul | sld | fv | se].

diff --git a/components/eam/cime_config/buildnml b/components/eam/cime_config/buildnml
@@ -92,6 +92,7 @@ def buildnml(case, caseroot, compname):
         comp = ""
         if comp_interface == "mct":  comp = "mct"
         if comp_interface == "esmf": comp = "esmf"
+        if comp_interface == "moab": comp = "moab"
 
         cam_lib_dirs = "-cosp_libdir {}/atm/obj/cosp".format(exeroot) if "cosp" in cam_config_opts else ""