Merge pull request #239 from jedwards4b/openmpi_derecho

add openmpi support on derecho

Author: jedwards4b

machines/cmake_macros/CNL.cmake

@@ -6,9 +6,9 @@ endif()
 set(MPICC "cc")
 set(MPICXX "CC")
 set(MPIFC "ftn")
-set(NETCDF_PATH "$ENV{NETCDF_DIR}")
-set(PIO_FILESYSTEM_HINTS "lustre")
-set(PNETCDF_PATH "$ENV{PARALLEL_NETCDF_DIR}")
 set(SCC "cc")
 set(SCXX "CC")
 set(SFC "ftn")
+set(NETCDF_PATH "$ENV{NETCDF_DIR}")
+set(PIO_FILESYSTEM_HINTS "lustre")
+set(PNETCDF_PATH "$ENV{PARALLEL_NETCDF_DIR}")

machines/cmake_macros/nvhpc.cmake

@@ -9,7 +9,7 @@ else()
   string(APPEND CXXFLAGS " -O0 -Mnofma -g -Wall -Kieee -traceback")
   string(APPEND FFLAGS " -O0 -g -Ktrap=fp -Mbounds -Kieee")
 endif()
-string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16 -DCPRNVIDIA")
+string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16 -DCPRNVIDIA -DNO_QUAD_PRECISION")
 set(CXX_LINKER "CXX")
 set(FC_AUTO_R8 "-r8")
 string(APPEND FFLAGS " -i4 -gopt -time -Mextend -byteswapio -Mflushz -Kieee")

machines/derecho/config_machines.xml

@@ -2,7 +2,7 @@
     <DESC>NCAR AMD EPYC system</DESC>
     <OS>CNL</OS>
     <COMPILERS>intel,gnu,nvhpc,cray</COMPILERS>
-    <MPILIBS>mpich</MPILIBS>
+    <MPILIBS>mpich,openmpi</MPILIBS>
     <CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
     <DIN_LOC_ROOT_CLMFORC>$ENV{CESMDATAROOT}/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
@@ -76,6 +76,9 @@
       <modules>
         <command name="load">ncarcompilers/1.0.0</command>
       </modules>
+      <modules mpilib="openmpi" compiler="!gnu">
+        <command name="load">openmpi/5.0.7</command>
+      </modules>
       <modules mpilib="mpich" compiler="!gnu">
         <command name="load">cray-mpich/8.1.29</command>
       </modules>

machines/derecho/derecho.cmake

@@ -12,3 +12,11 @@ endif()
 # If we want to use cray-libsci instead of mkl uncomment this line as well as the module in config_machines.xml
 string(REPLACE "-mkl=cluster" "" SLIBS "${SLIBS}")
 string(APPEND CPPDEFS " -DHAVE_GETTID")
+if (MPILIB STREQUAL openmpi)
+  set(MPICC "mpicc")
+  set(MPICXX "mpicxx")
+  set(MPIFC "mpif90")
+  set(SCC "$ENV{CC}")
+  set(SCXX "$ENV{CXX}")
+  set(SFC "$ENV{FC}")
+endif()