Merge branch 'azamat/theta/update-modules-20191106' into next (PR #3293)

Update modules on Theta [BFB]
E3SM-Project · Nov 7, 2019 · 37d9784 · 37d9784
2 parents fe82551 + 669f3ec
commit 37d9784
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 48 deletions.
diff --git a/cime/config/e3sm/allactive/config_pesall.xml b/cime/config/e3sm/allactive/config_pesall.xml
@@ -7682,7 +7682,7 @@
       </pes>
     </mach>
   </grid>
-  <grid name="a%ne30np4_l%ne30np4_oi%oEC60to30">
+  <grid name="a%ne30np4_l%.+_oi%oEC60to30">
     <mach name="anvil|bebop|anvil-centos7">
       <pes compset=".*CAM5.+CLM45.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV" pesize="S">
         <comment> -compset A_WCYCL* -res ne30_oEC* on 27 nodes pure-MPI </comment>

diff --git a/cime/config/e3sm/machines/config_compilers.xml b/cime/config/e3sm/machines/config_compilers.xml
@@ -2104,13 +2104,18 @@ ntel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/include </base>
   </CONFIG_ARGS>
   <CFLAGS>
     <append DEBUG="FALSE"> -O2  </append>
+    <append DEBUG="TRUE"> -O0 </append>
   </CFLAGS>
   <FFLAGS>
     <append DEBUG="FALSE"> -O2  </append>
+    <append DEBUG="TRUE"> -O0 </append>
   </FFLAGS>
   <SLIBS>
     <append>$SHELL{nf-config --flibs}</append>
   </SLIBS>
+  <CXX_LIBS>
+    <base>-lstdc++</base>
+  </CXX_LIBS>
 </compiler>
 
 <compiler MACH="theta" COMPILER="intel">

diff --git a/cime/config/e3sm/machines/config_machines.xml b/cime/config/e3sm/machines/config_machines.xml
@@ -1557,17 +1557,17 @@
     <DESC>ALCF Cray XC40 KNL, os is CNL, 64 pes/node, batch system is cobalt</DESC>
     <NODENAME_REGEX>theta.*</NODENAME_REGEX>
     <OS>CNL</OS>
-    <COMPILERS>intel,gnu,cray</COMPILERS>
+    <COMPILERS>intel,gnu</COMPILERS>
     <MPILIBS>mpt</MPILIBS>
     <SAVE_TIMING_DIR>/projects/$PROJECT</SAVE_TIMING_DIR>
-    <SAVE_TIMING_DIR_PROJECTS>ClimateEnergy_3,OceanClimate_2</SAVE_TIMING_DIR_PROJECTS>
+    <SAVE_TIMING_DIR_PROJECTS>ClimateEnergy_3,ClimateEnergy_4,OceanClimate_2</SAVE_TIMING_DIR_PROJECTS>
     <CIME_OUTPUT_ROOT>/projects/$PROJECT/$USER</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>/projects/ccsm/acme/inputdata</DIN_LOC_ROOT>
     <DIN_LOC_ROOT_CLMFORC>/projects/ccsm/acme/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
     <BASELINE_ROOT>/projects/$PROJECT/acme/baselines/$COMPILER</BASELINE_ROOT>
     <CCSM_CPRNC>/projects/ccsm/acme/tools/cprnc/cprnc</CCSM_CPRNC>
-    <GMAKE_J>8</GMAKE_J>
+    <GMAKE_J>16</GMAKE_J>
     <TESTS>e3sm_developer</TESTS>
     <NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
     <BATCH_SYSTEM>cobalt_theta</BATCH_SYSTEM>
@@ -1596,10 +1596,8 @@
       <modules>
         <command name="rm">craype-mic-knl</command>
         <command name="rm">PrgEnv-intel</command>
-        <command name="rm">PrgEnv-cray</command>
         <command name="rm">PrgEnv-gnu</command>
         <command name="rm">intel</command>
-        <command name="rm">cce</command>
         <command name="rm">cray-mpich</command>
         <command name="rm">cray-parallel-netcdf</command>
         <command name="rm">cray-hdf5-parallel</command>
@@ -1608,34 +1606,30 @@
         <command name="rm">cray-netcdf-hdf5parallel</command>
         <command name="rm">cray-libsci</command>
         <command name="rm">craype</command>
-        <command name="load">craype/2.5.12</command>
-        <command name="load">cmake/3.11.4</command>
+        <command name="rm">perftools-base</command>
+        <command name="rm">darshan</command>
+        <command name="load">craype/2.6.1</command>
+        <command name="load">cmake/3.14.5</command>
       </modules>
       <modules compiler="intel">
         <command name="load">intel/18.0.0.128</command>
-        <command name="load">PrgEnv-intel/6.0.4</command>
-      </modules>
-      <modules compiler="cray">
-        <command name="load">cce/8.6.2</command>
-        <command name="load">PrgEnv-cray/6.0.4</command>
+        <command name="load">PrgEnv-intel/6.0.5</command>
       </modules>
       <modules compiler="gnu">
-        <command name="load">gcc/7.3.0</command>
-        <command name="load">PrgEnv-gnu/6.0.4</command>
+        <command name="load">gcc/8.3.0</command>
+        <command name="load">PrgEnv-gnu/6.0.5</command>
       </modules>
       <modules compiler="!intel">
-        <command name="switch">cray-libsci/17.09.1</command>
+        <command name="load">cray-libsci/19.06.1</command>
       </modules>
       <modules>
+        <command name="load">perftools-base/7.1.1</command>
+        <command name="load">darshan/3.1.5</command>
         <command name="load">craype-mic-knl</command>
-        <command name="load">cray-mpich/7.6.2</command>
-      </modules>
-      <modules mpilib="mpt">
-        <command name="load">cray-netcdf/4.4.1.1.3</command>
-        <command name="load">cray-parallel-netcdf/1.8.1.3</command>
-      </modules>
-      <modules mpilib="mpi-serial">
-        <command name="load">cray-netcdf/4.4.1.1.3</command>
+        <command name="load">cray-mpich/7.7.10</command>
+        <command name="load">cray-hdf5/1.10.5.1</command>
+        <command name="load">cray-netcdf/4.6.3.1</command>
+        <command name="load">cray-parallel-netcdf/1.11.1.0</command>
       </modules>
     </module_system>
     <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
@@ -1644,10 +1638,9 @@
     <environment_variables>
       <env name="MPICH_ENV_DISPLAY">1</env>
       <env name="MPICH_VERSION_DISPLAY">1</env>
-      <!--env name="MPICH_CPUMASK_DISPLAY">1</env-->
       <env name="MPAS_TOOL_DIR">/projects/ccsm/acme/tools/mpas</env>
-      <env name="HDF5_DISABLE_VERSION_CHECK">2</env>
-      <env name="labeling"> </env>
+      <env name="HDF5_DISABLE_VERSION_CHECK">1</env>
+      <env name="labeling">-e PMI_LABEL_ERROUT=1</env>
       <env name="SMP_VARS"> </env>
     </environment_variables>
     <environment_variables SMP_PRESENT="TRUE" compiler="intel">
@@ -1656,9 +1649,6 @@
     <environment_variables SMP_PRESENT="TRUE" compiler="!intel">
       <env name="SMP_VARS">-e OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS} -e OMP_STACKSIZE=128M -e OMP_PROC_BIND=spread -e OMP_PLACES=threads</env>
     </environment_variables>
-    <environment_variables DEBUG="TRUE">
-      <env name="labeling">-e PMI_LABEL_ERROUT=1</env>
-    </environment_variables>
   </machine>
 
   <machine MACH="jlse">

diff --git a/components/homme/cmake/machineFiles/theta.cmake b/components/homme/cmake/machineFiles/theta.cmake
@@ -11,24 +11,6 @@ SET (CPRNC_DIR /projects/ccsm/acme/tools/cprnc CACHE FILEPATH "")
 SET (PREFER_SHARED FALSE CACHE FILEPATH "")
 SET (PREFER_STATIC TRUE CACHE FILEPATH "")
 
-EXECUTE_PROCESS(COMMAND which nf-config
-  RESULT_VARIABLE NFCONFIG_PATH_RESULT
-  OUTPUT_VARIABLE NFCONFIG_PATH_OUTPUT
-  ERROR_VARIABLE  NFCONFIG_PATH_ERROR
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-EXECUTE_PROCESS(COMMAND ${NFCONFIG_PATH_OUTPUT} --flibs
-  RESULT_VARIABLE NFCONFIG_RESULT
-  OUTPUT_VARIABLE NFCONFIG_OUTPUT
-  ERROR_VARIABLE  NFCONFIG_ERROR
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-IF (${NFCONFIG_ERROR})
-  MESSAGE(WARNING "${NETCDF_DIR}/bin/nf-config --flibs produced an error. Default linking will be used.")
-ELSE ()
-  SET (ADD_LINKER_FLAGS " ${NFCONFIG_OUTPUT} " CACHE STRING "")
-ENDIF ()
-
 SET (USE_QUEUING FALSE CACHE BOOL "")
 SET (USE_MPIEXEC "aprun" CACHE STRING "")