From 33da91b4083e21bdf43d2bddca5aca12c60f642b Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Tue, 21 Jul 2020 14:44:50 -0600
Subject: [PATCH] add support for mpi-serial

---
 CMakeLists.txt       | 19 ++++---------------
 cime_config/buildlib | 21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ffbc34c55..d3b12130fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,6 @@ cmake_minimum_required(VERSION 3.10)
 project(NUOPC_DATA_MODELS LANGUAGES Fortran VERSION 0.1)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(ExternalProject)
-
-find_package(MPI REQUIRED)
 find_package(ESMF REQUIRED)
 
 if (DEFINED CIMEROOT)
@@ -16,20 +14,11 @@ if (DEFINED CIMEROOT)
   set(FOX ${LIBROOT})
   set(CMAKE_Fortran_FLAGS "${FFLAGS} -I${LIBROOT}/include -I${LIBROOT}/finclude -I${LIBROOT}/nuopc/esmf/${NINST_VALUE}/include")
 else ()
-  message("CIMEROOT not found, downloading cime")
-  ExternalProject_Add (cime
-    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/cime
-    GIT_REPOSITORY https://github.com/ESMCI/cime
-    GIT_TAG cd1238247e71f0336fd790bc9716ac6f0bf91c21
-    GIT_PROGRESS TRUE
-    UPDATE_COMMAND ""
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND "")
-  ExternalProject_Get_Property (cime SOURCE_DIR)
-  set (CIMEROOT ${SOURCE_DIR})
-  unset (SOURCE_DIR)
+  set(BLD_STANDALONE TRUE)
 endif ()
+if (NOT DEFINED MPILIB OR NOT ${MPILIB} STREQUAL "mpi-serial")
+  find_package(MPI REQUIRED)
+endif()
 
 if(BLD_STANDALONE)
   add_subdirectory(share)
diff --git a/cime_config/buildlib b/cime_config/buildlib
index e001601b70..24a498e032 100755
--- a/cime_config/buildlib
+++ b/cime_config/buildlib
@@ -32,9 +32,10 @@ def buildlib(bldroot, libroot, case, compname=None):
         strthread = "threads"
     else:
         strthread = "nothreads"
+    mpilib = case.get_value("MPILIB")
 
-    sharedpath = os.path.join(case.get_value("COMPILER"),
-                              case.get_value("MPILIB"), strdebug, strthread, "nuopc")
+    sharedpath = os.path.join(case.get_value("COMPILER"),mpilib,
+                              strdebug, strthread, "nuopc")
 
 
     if compname:
@@ -52,10 +53,11 @@ def buildlib(bldroot, libroot, case, compname=None):
 
         cmake_flags = get_standard_cmake_args(case, os.path.join(sharedpath,"cdeps"), shared_lib=True)
         ccomp, cxxcomp, fcomp = get_compiler_names(case)
+
         cmake_flags += " -DCMAKE_C_COMPILER={} -DCMAKE_CXX_COMPILER={} -DCMAKE_Fortran_COMPILER={}".format(ccomp, cxxcomp, fcomp)
         cmake_flags += " -DCMAKE_INSTALL_PREFIX={} ".format(libroot)
         cmake_flags += " -DLIBROOT={} ".format(libroot) + srcpath
-        
+        cmake_flags += " -DMPILIB={} ".format(mpilib)
 
         logger.info("cmake_flags {}".format(cmake_flags))
         s,o,e = run_cmd("cmake {} ".format(cmake_flags), from_dir=bldroot, verbose=True)
@@ -74,13 +76,18 @@ def buildlib(bldroot, libroot, case, compname=None):
                     os.rmdir(comppath)
                 symlink_force(os.path.join(bldroot,compname), comppath)
 
-                
+
 def get_compiler_names(case):
     machobj = Machines(machine=case.get_value("MACH"))
     compobj = Compilers(machobj)
-    ccomp = compobj.get_value("MPICC").strip()
-    cxxcomp = compobj.get_value("MPICXX").strip()
-    fcomp = compobj.get_value("MPIFC").strip()
+    if case.get_value("MPILIB") == 'mpi-serial':
+        ccomp = compobj.get_value("SCC").strip()
+        cxxcomp = compobj.get_value("SCXX").strip()
+        fcomp = compobj.get_value("SFC").strip()
+    else:
+        ccomp = compobj.get_value("MPICC").strip()
+        cxxcomp = compobj.get_value("MPICXX").strip()
+        fcomp = compobj.get_value("MPIFC").strip()
 
     return ccomp, cxxcomp, fcomp