Merge branch 'feature/porting' into develop

theurich · theurich · commit a2997ef02aeb · 2025-10-09T18:50:29.000-07:00
diff --git a/build_config/Darwin.gfortranclang.default/build_rules.mk b/build_config/Darwin.gfortranclang.default/build_rules.mk
@@ -198,7 +198,7 @@ endif
 ############################################################
 # OpenMP compiler and linker flags
 #
-ESMF_OPENMP=OFF
+ESMF_OPENMPDEFAULT=OFF
 ESMF_OPENMP_F90COMPILEOPTS += -fopenmp
 # As of 2022-12-05, Apple's clang doesn't support -fopenmp directly; instead, it requires
 # -Xpreprocessor -fopenmp. In addition, you will need to install libomp and explicitly add
diff --git a/build_config/Darwin.intelclang.default/build_rules.mk b/build_config/Darwin.intelclang.default/build_rules.mk
@@ -167,7 +167,7 @@ endif
 ############################################################
 # OpenMP compiler and linker flags
 #
-ESMF_OPENMP=OFF
+ESMF_OPENMPDEFAULT=OFF
 
 ############################################################
 # Set rpath syntax
diff --git a/build_config/Darwin.intelgcc.default/build_rules.mk b/build_config/Darwin.intelgcc.default/build_rules.mk
@@ -172,7 +172,7 @@ endif
 # OpenMP compiler and linker flags
 #
 ifeq ($(ESMF_CLANGSTR), clang)
-ESMF_OPENMP=OFF
+ESMF_OPENMPDEFAULT=OFF
 else
 ifeq ($(shell [ $(ESMF_F90MAJORVERSION) -ge 16 ] && echo true), true)
 ESMF_OPENMP_F90COMPILEOPTS += -qopenmp
diff --git a/build_config/Linux.aocc.default/build_rules.mk b/build_config/Linux.aocc.default/build_rules.mk
@@ -211,7 +211,6 @@ endif
 ############################################################
 # OpenMP compiler and linker flags
 #
-ESMF_OPENMP=ON
 ESMF_OPENMP_F90COMPILEOPTS += -fopenmp
 ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp
 ESMF_OPENMP_F90LINKOPTS    += -fopenmp
diff --git a/build_config/Linux.arm.default/build_rules.mk b/build_config/Linux.arm.default/build_rules.mk
@@ -218,7 +218,7 @@ endif
 ############################################################
 # OpenMP compiler and linker flags
 #
-ESMF_OPENMP=OFF
+ESMF_OPENMPDEFAULT=OFF
 # ESMF_OPENMP_F90COMPILEOPTS += -fopenmp
 # ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp
 # ESMF_OPENMP_F90LINKOPTS    += -fopenmp
diff --git a/build_config/Linux.nag.default/build_rules.mk b/build_config/Linux.nag.default/build_rules.mk
@@ -139,7 +139,7 @@ endif
 ############################################################
 # OpenMP compiler and linker flags
 #
-ESMF_OPENMP=OFF
+ESMF_OPENMPDEFAULT=OFF
 ESMF_OPENMP_F90COMPILEOPTS += -openmp
 ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp
 ESMF_OPENMP_F90LINKOPTS    += -openmp
diff --git a/build_config/Unicos.aocc.default/build_rules.mk b/build_config/Unicos.aocc.default/build_rules.mk
@@ -9,6 +9,12 @@
 ESMF_F90DEFAULT         = ftn
 ESMF_CXXDEFAULT         = CC
 ESMF_CDEFAULT           = cc
+ESMF_CPPDEFAULT         = gcc -E -P -x c
+
+ESMF_CXXCOMPILECPPFLAGS += -x c++
+
+# Need this until __aocc__ macro shows up in Fortran preprocessing
+ESMF_CPPFLAGS          += -DESMF_COMPILER_AOCC
 
 ############################################################
 # Default MPI setting.
@@ -92,28 +98,20 @@ ESMF_CXXCOMPILECPPFLAGS += -DESMF_NO_POSIXIPC
 ifeq ($(ESMF_PTHREADS),ON)
 ESMF_F90COMPILEOPTS += -pthread
 ESMF_CXXCOMPILEOPTS += -pthread
+ESMF_CCOMPILEOPTS   += -pthread
 ESMF_F90LINKOPTS    += -pthread
 ESMF_CXXLINKOPTS    += -pthread
+ESMF_CLINKOPTS      += -pthread
 endif
 
 ############################################################
 # OpenMP compiler and linker flags
 #
-ESMF_OPENMP=ON
 ESMF_OPENMP_F90COMPILEOPTS += -fopenmp
 ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp
 ESMF_OPENMP_F90LINKOPTS    += -fopenmp
 ESMF_OPENMP_CXXLINKOPTS    += -fopenmp
 
-############################################################
-# OpenACC compiler and linker flags
-#
-ESMF_OPENACCDEFAULT = OFF
-ESMF_OPENACC_F90COMPILEOPTS += -fopenacc
-ESMF_OPENACC_CXXCOMPILEOPTS += -fopenacc
-ESMF_OPENACC_F90LINKOPTS    += -fopenacc
-ESMF_OPENACC_CXXLINKOPTS    += -fopenacc
-
 ############################################################
 # Explicit flags for handling specific format and cpp combos
 #
@@ -137,6 +135,13 @@ ESMF_F90LINKLIBS += -lrt -lstdc++ -ldl
 #
 ESMF_CXXLINKLIBS += -lrt -lflang -lflangrti -lpgmath -ldl
 
+############################################################
+# Linker option that ensures that the specified libraries are 
+# used to also resolve symbols needed by other libraries.
+#
+ESMF_F90LINKOPTS          += -Wl,--no-as-needed
+ESMF_CXXLINKOPTS          += -Wl,--no-as-needed
+
 ############################################################
 # Shared library options
 #
@@ -159,8 +164,3 @@ ESMF_SO_CXXLINKOPTSEXE  = -Wl,-export-dynamic
 # TODO: WebService testing is robust enough to work on all systems.
 #
 ESMF_NOWEBSERVTESTING = TRUE
-
-############################################################
-# Override default C preprocessor on this platform
-#
-ESMF_CPPDEFAULT       = gcc -E -P -x c
diff --git a/src/addon/ESMX/Comps/ESMX_Data/CMakeLists.txt b/src/addon/ESMX/Comps/ESMX_Data/CMakeLists.txt
@@ -21,10 +21,26 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -fbacktrace -O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-g -fbacktrace -O0 -fcheck=all -ffpe-trap=invalid,zero,overflow,underflow")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Flang")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -traceback -O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-g -traceback -O0 -check all -fpe0 -ftrapuv -init=snan,arrays")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -traceback -O2")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g -traceback -O0 -check all -fpe0 -ftrapuv -init=snan,arrays")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+  set(CMAKE_Fortran_FLAGS_RELEASE "")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -gline")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g -gline -C=all")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fast")
   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -traceback -O2 -fast")
diff --git a/src/addon/ESMX/Driver/CMakeLists.txt b/src/addon/ESMX/Driver/CMakeLists.txt
@@ -121,15 +121,32 @@ message("ESMX_DISABLE_COMPS .......... ${ESMX_DISABLE_COMPS}")
 message("")
 
 # compiler options
-if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+  set(CMAKE_Fortran_FLAGS -ffree-line-length-none)
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -fbacktrace -O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-g -fbacktrace -O0 -fcheck=all -ffpe-trap=invalid,zero,overflow,underflow")
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Flang")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -traceback -O2")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g -traceback -O0 -check all -fpe0 -ftrapuv -init=snan,arrays")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -traceback -O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-g -traceback -O0 -check all -fpe0 -ftrapuv -init=snan,arrays")
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "NVHPC")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+  set(CMAKE_Fortran_FLAGS_RELEASE "")
+  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -gline")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g -gline -C=all")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fast")
   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -traceback -O2 -fast")
   set(CMAKE_Fortran_FLAGS_DEBUG "-g -traceback -O0")
diff --git a/src/addon/ESMX/Driver/ESMX_Driver.F90 b/src/addon/ESMX/Driver/ESMX_Driver.F90
@@ -19,37 +19,11 @@ module ESMX_Driver
 
   public SetServices, SetVM, HConfigCreateFoundNode
 
-#if defined (__NVCOMPILER)
-!TODO: remove once NVHPC and PGI compilers work correctly w/o work-around
-
-  abstract interface
-    recursive subroutine SetServicesRoutine(gridcomp, rc)
-      use ESMF
-      implicit none
-      type(ESMF_GridComp)        :: gridcomp ! must not be optional
-      integer, intent(out)       :: rc       ! must not be optional
-    end subroutine
-    recursive subroutine SetVMRoutine(gridcomp, rc)
-      use ESMF
-      implicit none
-      type(ESMF_GridComp)        :: gridcomp ! must not be optional
-      integer, intent(out)       :: rc       ! must not be optional
-    end subroutine
-  end interface
-
-  type type_CompDef
-    procedure(SetServicesRoutine), pointer, nopass :: ssPtr => null()
-    procedure(SetVMRoutine),       pointer, nopass :: svPtr => null()
-    character(ESMF_MAXSTR)                  :: name = "__uninitialized__"
-  end type
-
-#else
   type type_CompDef
-    procedure(SetServices), pointer, nopass :: ssPtr => null()
-    procedure(SetVM),       pointer, nopass :: svPtr => null()
+    procedure(SetServicesInterfaceGridComp), pointer, nopass :: ssPtr => null()
+    procedure(SetVMInterfaceGridComp),       pointer, nopass :: svPtr => null()
     character(ESMF_MAXSTR)                  :: name = "__uninitialized__"
   end type
-#endif
 
   include "compCnt.inc"
 
@@ -386,8 +360,8 @@ subroutine SetModelServices(driver, rc)
 
       if (inCompDef) then
         ! add child component with SetVM and SetServices in CompDef
-#if defined (__INTEL_LLVM_COMPILER) || defined (__NVCOMPILER) || defined (NAGFOR)
-!TODO: remove once IFX, NVHPC, and NAG compilers work correctly w/o work-around
+#if defined (NAGFOR)
+!TODO: remove once NAG compiler works correctly w/o work-around
         call NUOPC_DriverAddGridCompPtr(driver, trim(compLabel), hconfig=hconfig, &
           compSetServicesRoutine=CompDef(j)%ssPtr, compSetVMRoutine=CompDef(j)%svPtr, &
           info=info, petList=petList, devList=devList, comp=comp, rc=rc)
@@ -396,7 +370,8 @@ subroutine SetModelServices(driver, rc)
             "' to driver via Fortran module.", &
           line=__LINE__, file=FILENAME)) return  ! bail out
 #else
-        call NUOPC_DriverAddComp(driver, trim(compLabel), hconfig=hconfig, &
+!TODO: call through generic NUOPC_DriverAddComp() once AOCC issues resolved
+        call NUOPC_DriverAddGridComp(driver, trim(compLabel), hconfig=hconfig, &
           compSetServicesRoutine=CompDef(j)%ssPtr, compSetVMRoutine=CompDef(j)%svPtr, &
           info=info, petList=petList, devList=devList, comp=comp, rc=rc)
         if (ESMF_LogFoundError(rcToCheck=rc, &
diff --git a/src/addon/NUOPC/src/NUOPC_Driver.F90 b/src/addon/NUOPC/src/NUOPC_Driver.F90
@@ -34,7 +34,9 @@ module NUOPC_Driver
   public &
     SetVM, &
     SetServices, &
-    routine_Run
+    routine_Run, &
+    SetServicesInterfaceGridComp, SetVMInterfaceGridComp, &
+    SetServicesInterfaceCplComp, SetVMInterfaceCplComp
 
   public &
     label_PreChildrenAdvertise, &
@@ -80,6 +82,33 @@ module NUOPC_Driver
   character(*), parameter :: &
     label_SetRunClock = "Driver_SetRunClock"
 
+  abstract interface
+    recursive subroutine SetServicesInterfaceGridComp(gridcomp, rc)
+      use ESMF
+      implicit none
+      type(ESMF_GridComp)        :: gridcomp ! must not be optional
+      integer, intent(out)       :: rc       ! must not be optional
+    end subroutine
+    recursive subroutine SetVMInterfaceGridComp(gridcomp, rc)
+      use ESMF
+      implicit none
+      type(ESMF_GridComp)        :: gridcomp ! must not be optional
+      integer, intent(out)       :: rc       ! must not be optional
+    end subroutine
+    recursive subroutine SetServicesInterfaceCplComp(cplcomp, rc)
+      use ESMF
+      implicit none
+      type(ESMF_CplComp)         :: cplcomp  ! must not be optional
+      integer, intent(out)       :: rc       ! must not be optional
+    end subroutine
+    recursive subroutine SetVMInterfaceCplComp(cplcomp, rc)
+      use ESMF
+      implicit none
+      type(ESMF_CplComp)         :: cplcomp  ! must not be optional
+      integer, intent(out)       :: rc       ! must not be optional
+    end subroutine
+  end interface
+
   type type_InternalStateStruct
     integer                           :: modelCount
     ! - static references to child components
@@ -119,8 +148,9 @@ module NUOPC_Driver
 
   ! Generic methods
   public NUOPC_DriverAddComp
-#if defined (__INTEL_LLVM_COMPILER) || defined (__NVCOMPILER) || defined (NAGFOR)
-  public NUOPC_DriverAddGridCompPtr !TODO: remove once compliers are fixed
+  public NUOPC_DriverAddGridComp    !TODO: remove public once all compilers work
+#if defined (NAGFOR)
+  public NUOPC_DriverAddGridCompPtr !TODO: remove once NAG complier is fixed
 #endif
   public NUOPC_DriverAddRunElement
   public NUOPC_DriverEgestRunSequence
@@ -4523,7 +4553,7 @@ recursive subroutine FinalizeReset(driver, importState, exportState, clock, rc)
   !-----------------------------------------------------------------------------
   !-----------------------------------------------------------------------------
 
-#if defined (__INTEL_LLVM_COMPILER) || defined (__NVCOMPILER) || defined (NAGFOR)
+#if defined (NAGFOR)
   !-----------------------------------------------------------------------------
 !BOPI
 ! !IROUTINE: NUOPC_DriverAddComp - Add a GridComp child to a Driver using procedure pointers
@@ -4598,42 +4628,8 @@ recursive subroutine NUOPC_DriverAddGridComp(driver, compLabel, &
 ! !ARGUMENTS:
     type(ESMF_GridComp)                               :: driver
     character(len=*),    intent(in)                   :: compLabel
-#if defined (__NVCOMPILER) || defined (__PGI) || defined (ESMF_COMPILER_AOCC)
-    interface
-      recursive subroutine compSetServicesRoutine(gridcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_GridComp)        :: gridcomp ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-    end interface
-    interface
-      recursive subroutine compSetVMRoutine(gridcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_GridComp)        :: gridcomp ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-    end interface
-    optional                                          :: compSetVMRoutine
-#else
-    abstract interface
-      recursive subroutine SetServicesRoutine(gridcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_GridComp)        :: gridcomp ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-      recursive subroutine SetVMRoutine(gridcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_GridComp)        :: gridcomp ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-    end interface
-    procedure(SetServicesRoutine)                     :: compSetServicesRoutine
-    procedure(SetVMRoutine),                 optional :: compSetVMRoutine
-#endif
+    procedure(SetServicesInterfaceGridComp)           :: compSetServicesRoutine
+    procedure(SetVMInterfaceGridComp),       optional :: compSetVMRoutine
     integer,             intent(in),         optional :: petList(:)
     integer,             intent(in),         optional :: devList(:)
     type(ESMF_Info),     intent(in),         optional :: info
@@ -5001,42 +4997,8 @@ recursive subroutine NUOPC_DriverAddCplComp(driver, srcCompLabel, &
     type(ESMF_GridComp)                               :: driver
     character(len=*),    intent(in)                   :: srcCompLabel
     character(len=*),    intent(in)                   :: dstCompLabel
-#if defined (__NVCOMPILER) || defined (__PGI) || defined (ESMF_COMPILER_AOCC)
-    interface
-      recursive subroutine compSetServicesRoutine(cplcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_CplComp)         :: cplcomp  ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-    end interface
-    interface
-      recursive subroutine compSetVMRoutine(cplcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_CplComp)         :: cplcomp  ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-    end interface
-    optional                                          :: compSetVMRoutine
-#else
-    abstract interface
-      recursive subroutine SetServicesRoutine(cplcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_CplComp)         :: cplcomp  ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-      recursive subroutine SetVMRoutine(cplcomp, rc)
-        use ESMF
-        implicit none
-        type(ESMF_CplComp)         :: cplcomp  ! must not be optional
-        integer, intent(out)       :: rc       ! must not be optional
-      end subroutine
-    end interface
-    procedure(SetServicesRoutine)                     :: compSetServicesRoutine
-    procedure(SetVMRoutine),                 optional :: compSetVMRoutine
-#endif
+    procedure(SetServicesInterfaceCplComp)            :: compSetServicesRoutine
+    procedure(SetVMInterfaceCplComp),        optional :: compSetVMRoutine
     integer, target,     intent(in),         optional :: petList(:)
     integer, target,     intent(in),         optional :: devList(:)
     type(ESMF_Info),     intent(in),         optional :: info

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ endif`
`198`	`198`	`############################################################`
`199`	`199`	`# OpenMP compiler and linker flags`
`200`	`200`	`#`
`201`		`-ESMF_OPENMP=OFF`
	`201`	`+ESMF_OPENMPDEFAULT=OFF`
`202`	`202`	`ESMF_OPENMP_F90COMPILEOPTS += -fopenmp`
`203`	`203`	`# As of 2022-12-05, Apple's clang doesn't support -fopenmp directly; instead, it requires`
`204`	`204`	`# -Xpreprocessor -fopenmp. In addition, you will need to install libomp and explicitly add`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ endif`
`167`	`167`	`############################################################`
`168`	`168`	`# OpenMP compiler and linker flags`
`169`	`169`	`#`
`170`		`-ESMF_OPENMP=OFF`
	`170`	`+ESMF_OPENMPDEFAULT=OFF`
`171`	`171`
`172`	`172`	`############################################################`
`173`	`173`	`# Set rpath syntax`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ endif`
`172`	`172`	`# OpenMP compiler and linker flags`
`173`	`173`	`#`
`174`	`174`	`ifeq ($(ESMF_CLANGSTR), clang)`
`175`		`-ESMF_OPENMP=OFF`
	`175`	`+ESMF_OPENMPDEFAULT=OFF`
`176`	`176`	`else`
`177`	`177`	`ifeq ($(shell [ $(ESMF_F90MAJORVERSION) -ge 16 ] && echo true), true)`
`178`	`178`	`ESMF_OPENMP_F90COMPILEOPTS += -qopenmp`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,6 @@ endif`
`211`	`211`	`############################################################`
`212`	`212`	`# OpenMP compiler and linker flags`
`213`	`213`	`#`
`214`		`-ESMF_OPENMP=ON`
`215`	`214`	`ESMF_OPENMP_F90COMPILEOPTS += -fopenmp`
`216`	`215`	`ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp`
`217`	`216`	`ESMF_OPENMP_F90LINKOPTS += -fopenmp`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ endif`
`218`	`218`	`############################################################`
`219`	`219`	`# OpenMP compiler and linker flags`
`220`	`220`	`#`
`221`		`-ESMF_OPENMP=OFF`
	`221`	`+ESMF_OPENMPDEFAULT=OFF`
`222`	`222`	`# ESMF_OPENMP_F90COMPILEOPTS += -fopenmp`
`223`	`223`	`# ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp`
`224`	`224`	`# ESMF_OPENMP_F90LINKOPTS += -fopenmp`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ endif`
`139`	`139`	`############################################################`
`140`	`140`	`# OpenMP compiler and linker flags`
`141`	`141`	`#`
`142`		`-ESMF_OPENMP=OFF`
	`142`	`+ESMF_OPENMPDEFAULT=OFF`
`143`	`143`	`ESMF_OPENMP_F90COMPILEOPTS += -openmp`
`144`	`144`	`ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp`
`145`	`145`	`ESMF_OPENMP_F90LINKOPTS += -openmp`