Merge pull request #86 from ESMCI/intel_compiler_update_cheyenne

update the intel compiler for cheyenne
E3SM-Project · Apr 19, 2019 · b28740a · b28740a
2 parents 1af57c0 + 63c96a6
commit b28740a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
@@ -353,14 +353,14 @@ This allows using a different mpirun command to launch unit tests
 	<command name="load">ncarenv/1.2</command>
       </modules>
       <modules compiler="intel">
-	<command name="load">intel/17.0.1</command>
-	<command name="load">esmf_libs</command>
+	<command name="load">intel/19.0.2</command>
+<!--	<command name="load">esmf_libs</command> -->
 	<command name="load">mkl</command>
       </modules>
       <modules compiler="pgi">
 	<command name="load">pgi/17.9</command>
       </modules>
-      <modules compiler="intel" mpilib="!mpi-serial" DEBUG="TRUE" comp_interface="mct">
+<!--      <modules compiler="intel" mpilib="!mpi-serial" DEBUG="TRUE" comp_interface="mct">
 	<command name="load">esmf-7.1.0r-defio-mpi-g</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" DEBUG="FALSE" comp_interface="mct">
@@ -372,6 +372,7 @@ This allows using a different mpirun command to launch unit tests
       <modules compiler="intel" mpilib="mpi-serial" DEBUG="FALSE" comp_interface="mct">
 	<command name="load">esmf-7.1.0r-ncdfio-uni-O</command>
       </modules>
+-->
       <modules compiler="gnu">
         <command name="load">gnu/7.3.0</command>
         <command name="load">openblas/0.2.20</command>
@@ -385,12 +386,13 @@ This allows using a different mpirun command to launch unit tests
 	<command name="load">netcdf-mpi/4.6.1</command>
 	<command name="load">pnetcdf/1.11.0</command>
       </modules>
-      <modules mpilib="mpt" compiler="intel" PIO_VERSION="2">
+<!--      <modules mpilib="mpt" compiler="intel" PIO_VERSION="2">
 	<command name="load">pio/2.4.1</command>
       </modules>
       <modules mpilib="mpt" compiler="intel" PIO_VERSION="1">
 	<command name="load">pio/1.10.1</command>
       </modules>
+-->
       <modules mpilib="mpt" compiler="pgi">
 	<command name="load">mpt/2.19</command>
 	<command name="load">netcdf-mpi/4.6.1</command>
@@ -421,7 +423,7 @@ This allows using a different mpirun command to launch unit tests
       <env name="MPI_USE_ARRAY"/>
     </environment_variables>
     <environment_variables comp_interface="nuopc">
-      <env name="ESMFMKFILE">/glade/u/home/turuncu/progs/esmf-8.0.0b29/install_dir/lib/libO/Linux.intel.64.mpt.default/esmf.mk</env>
+      <env name="ESMFMKFILE">/glade/u/home/dunlap/ESMF-INSTALL/intel19/8.0.0bs32/lib/libg/Linux.intel.64.mpt.default/esmf.mk</env>
       <env name="ESMF_RUNTIME_PROFILE">ON</env>
       <env name="ESMF_RUNTIME_PROFILE_OUTPUT">SUMMARY</env>
       <env name="UGCSINPUTPATH">/glade/work/dunlap/FV3GFS/benchmark-20181016/</env>

diff --git a/scripts/Tools/Makefile b/scripts/Tools/Makefile
@@ -669,7 +669,7 @@ CMAKE_OPTS += -D CMAKE_Fortran_FLAGS:STRING="$(FFLAGS) $(EXTRA_PIO_FPPDEFS) $(IN
               -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
               -D GPTL_PATH:STRING=$(INSTALL_SHAREDPATH) \
               -D PIO_ENABLE_TESTS:BOOL=OFF \
-              -D PIO_USE_MALLOC:BOOL=ON \
+              -D PIO_USE_MALLOC:BOOL=OFF \
 	      -D USER_CMAKE_MODULE_PATH:LIST="$(CIMEROOT)/src/CMake;$(CIMEROOT)/src/externals/pio2/cmake" \
 
 # Allow for separate installations of the NetCDF C and Fortran libraries

diff --git a/src/drivers/nuopc/shr/med_constants_mod.F90 b/src/drivers/nuopc/shr/med_constants_mod.F90
@@ -36,6 +36,6 @@ module med_constants_mod
   integer,  parameter :: med_constants_SecPerDay = 86400    ! Seconds per day
 
   !-----------------------------------------------------------------------------
-  integer :: med_constants_dbug_flag = 5
+  integer :: med_constants_dbug_flag = 0
 
 end module med_constants_mod