now working on cheyenne

Author: jedwards4b

config/cesm/machines/config_compilers.xml

@@ -77,7 +77,7 @@ using a fortran linker.
   </CPPDEFS>
 
   <INCLDIR>
-	<append MODEL="ufsatm"> -I$(EXEROOT)/atm/obj/FMS </append>
+        <append MODEL="ufsatm"> -I$(EXEROOT)/atm/obj/FMS </append>
   </INCLDIR>
   <FFLAGS>
     <append MODEL="ufsatm"> $(FC_AUTO_R8) </append>
@@ -121,10 +121,10 @@ using a fortran linker.
     <base>  -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </base>
     <append compile_threaded="TRUE"> -fopenmp </append>
     <!-- Ideally, we would also have 'invalid' in the ffpe-trap list. But at
-	 least with some versions of gfortran (confirmed with 5.4.0, 6.3.0 and
-	 7.1.0), gfortran's isnan (which is called in cime via the
-	 CPRGNU-specific shr_infnan_isnan) causes a floating point exception
-	 when called on a signaling NaN. -->
+         least with some versions of gfortran (confirmed with 5.4.0, 6.3.0 and
+         7.1.0), gfortran's isnan (which is called in cime via the
+         CPRGNU-specific shr_infnan_isnan) causes a floating point exception
+         when called on a signaling NaN. -->
     <append DEBUG="TRUE"> -g -Wall -Og -fbacktrace -ffpe-trap=zero,overflow -fcheck=bounds </append>
     <append DEBUG="FALSE"> -O </append>
   </FFLAGS>
@@ -207,10 +207,10 @@ using a fortran linker.
     <base>  -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </base>
     <append compile_threaded="TRUE"> -fopenmp </append>
     <!-- Ideally, we would also have 'invalid' in the ffpe-trap list. But at
-	 least with some versions of gfortran (confirmed with 5.4.0, 6.3.0 and
-	 7.1.0), gfortran's isnan (which is called in cime via the
-	 CPRGNU-specific shr_infnan_isnan) causes a floating point exception
-	 when called on a signaling NaN. -->
+         least with some versions of gfortran (confirmed with 5.4.0, 6.3.0 and
+         7.1.0), gfortran's isnan (which is called in cime via the
+         CPRGNU-specific shr_infnan_isnan) causes a floating point exception
+         when called on a signaling NaN. -->
     <append DEBUG="TRUE"> -g -Wall -Og -fbacktrace -ffpe-trap=zero,overflow -fcheck=bounds </append>
     <append DEBUG="FALSE"> -O </append>
   </FFLAGS>
@@ -913,7 +913,7 @@ using a fortran linker.
   </FFLAGS>
   <LDFLAGS>
     <!-- the path to gcc should match that used in building the SmartRedis lib -->
-    <append>-Wl,-rpath /glade/u/apps/dav/opt/gnu/9.1.0/lib64 -L/glade/u/apps/dav/opt/gnu/9.1.0/lib64 -lgcc </append>
+    <append>-Wl,-rpath /glade/u/apps/dav/opt/gnu/9.1.0/lib64 </append>
   </LDFLAGS>
   <CMAKE_OPTS>
     <append DEBUG="TRUE"> -DPIO_ENABLE_LOGGING=ON </append>
@@ -939,8 +939,8 @@ using a fortran linker.
   </CPPDEFS>
   <FFLAGS>
     <!-- -fallow-argument-mismatch is needed for building with the mpich library with gfortran10;
-	 -fallow-invalid-boz is needed for some components that have non-standard uses of BOZ literal constants with gfortran10.
-	 See https://github.com/ESMCI/cime/issues/3846 for details. -->
+         -fallow-invalid-boz is needed for some components that have non-standard uses of BOZ literal constants with gfortran10.
+         See https://github.com/ESMCI/cime/issues/3846 for details. -->
 <!--    <append> -fallow-argument-mismatch -fallow-invalid-boz </append> -->
   </FFLAGS>
   <SLIBS>
@@ -962,8 +962,14 @@ using a fortran linker.
   <PFUNIT_PATH MPILIB="mpt" compile_threaded="TRUE">$ENV{CESMDATAROOT}/tools/pFUnit/pFUnit3.2.8_cheyenne_Intel17.0.1_MPI_openMP</PFUNIT_PATH>
   <!-- SET to FALSE for intel 17 and 18 TRUE otherwise -->
   <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <!-- the path to gcc should match that used in building the SmartRedis lib -->
+    <append MPILIB="openmpi"> -std=c11 -gxx-name=/glade/u/apps/ch/opt/gnu/9.1.0/bin/g++ -Wl,-rpath,/glade/u/apps/ch/opt/gnu/9.1.0/lib64 -L/glade/u/apps/ch/opt/gnu/9.1.0/lib64 -lgcc </append>
+  </LDFLAGS>
+
 </compiler>
 
+
 <compiler MACH="cheyenne" COMPILER="pgi">
   <SLIBS>
     <append> -llapack -lblas </append>
@@ -1322,7 +1328,7 @@ using a fortran linker.
 <compiler MACH="homebrew" COMPILER="gnu">
   <LDFLAGS>
     <!-- These LDFLAGS provide lapack and blas support on a Mac. This
-	 may require installation of the Apple Developer Tools. -->
+         may require installation of the Apple Developer Tools. -->
     <append> -framework Accelerate -Wl,-rpath $(NETCDF)/lib</append>
   </LDFLAGS>
 </compiler>

config/cesm/machines/config_machines.xml

@@ -598,14 +598,22 @@ This allows using a different mpirun command to launch unit tests
       <modules compiler="pgi">
         <command name="load">pgi/20.4</command>
       </modules>
-      <modules compiler="intel" mpilib="!mpi-serial" DEBUG="TRUE">
+      <modules compiler="intel" mpilib="mpt" DEBUG="TRUE">
         <command name="use">/glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/</command>
         <command name="load">esmf-8.2.0b13-ncdfio-mpt-g</command>
       </modules>
-      <modules compiler="intel" mpilib="!mpi-serial" DEBUG="FALSE">
+      <modules compiler="intel" mpilib="mpt" DEBUG="FALSE">
         <command name="use">/glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/</command>
         <command name="load">esmf-8.2.0b13-ncdfio-mpt-O</command>
       </modules>
+      <modules compiler="intel" mpilib="openmpi" DEBUG="TRUE">
+        <command name="use">/glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/</command>
+        <command name="load">esmf-8.2.0b14-ncdfio-openmpi-g</command>
+      </modules>
+      <modules compiler="intel" mpilib="openmpi" DEBUG="FALSE">
+        <command name="use">/glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/</command>
+        <command name="load">esmf-8.2.0b14-ncdfio-openmpi-O</command>
+      </modules>
       <modules compiler="intel" mpilib="mpi-serial" DEBUG="TRUE">
         <command name="use">/glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/</command>
         <command name="load">esmf-8.2.0b13-ncdfio-mpiuni-g</command>
@@ -688,9 +696,9 @@ This allows using a different mpirun command to launch unit tests
         <command name="load">SmartRedis/0.1.1</command>
       </modules>
       <modules mpilib="openmpi" compiler="intel">
-        <command name="load">openmpi/4.0.5</command>
-        <command name="load">netcdf-mpi/4.7.4</command>
-        <command name="load">pnetcdf/1.12.1</command>
+        <command name="load">openmpi/4.1.0</command>
+        <command name="load">netcdf-mpi/4.8.0</command>
+        <command name="load">pnetcdf/1.12.2</command>
         <command name="load">SmartRedis/0.1.1</command>
       </modules>
       <modules>