Merge branch 'jgfouca/moab_cmake_mpas' into master (PR E3SM-Project#6308

) MOAB: Fixes to MPAS cmake Also, remove a few occurances of MOAB_PATH in cime_config. [BFB]
E3SM-Ocean-Discussion · Mar 28, 2024 · 7792c63 · 7792c63
2 parents cba69e6 + 49a6c46
commit 7792c63
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/cime_config/machines/cmake_macros/gnu_chrysalis.cmake b/cime_config/machines/cmake_macros/gnu_chrysalis.cmake
@@ -2,4 +2,3 @@ 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")
diff --git a/cime_config/machines/cmake_macros/intel_chrysalis.cmake b/cime_config/machines/cmake_macros/intel_chrysalis.cmake
@@ -12,7 +12,6 @@ string(APPEND CMAKE_Fortran_FLAGS " -axCORE-AVX2")
 string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O3 -qno-opt-dynamic-align")
 set(PIO_FILESYSTEM_HINTS "gpfs")
 string(APPEND CMAKE_EXE_LINKER_FLAGS " -static-intel")
-set(MOAB_PATH "/lcrc/soft/climate/moab/chrysalis/intel")
 if (MPILIB STREQUAL impi)
   set(MPICC "mpiicc")
   set(MPICXX "mpiicpc")

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -2218,7 +2218,6 @@
       <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 -->

diff --git a/components/mpas-framework/src/CMakeLists.txt b/components/mpas-framework/src/CMakeLists.txt
@@ -71,8 +71,7 @@ set(COMMON_RAW_SOURCES external/ezxml/ezxml.c)
 include(${CMAKE_CURRENT_SOURCE_DIR}/framework/framework.cmake)
 if (COMP_INTERFACE STREQUAL "moab")
   list(APPEND COMMON_RAW_SOURCES framework/mpas_moabmesh.F)
-  include(${MOAB_PATH}/lib/cmake/MOAB/MOABConfig.cmake)
-  list(APPEND INCLUDES "${MOAB_PATH}/include")
+  list(APPEND INCLUDES ${MOAB_INCLUDE_DIRS})
   list(APPEND CPPDEFS "-DHAVE_MOAB")
 endif()
 include(${CMAKE_CURRENT_SOURCE_DIR}/operators/operators.cmake)