Merge pull request #10 from fvitt/ccs_config_pleiades

Updates needed for CESM on NAS Pleiades machines Fixes issue #7 so that CESM will run on pleiades-ivy and pleiades-san machines modified: machines/cmake_macros/pleiades-bro.cmake modified: machines/cmake_macros/pleiades-has.cmake modified: machines/cmake_macros/pleiades-ivy.cmake modified: machines/cmake_macros/pleiades-san.cmake modified: machines/config_batch.xml modified: machines/config_compilers.xml modified: machines/config_machines.xml modified: machines/Depends.intel
ESMCI · Feb 4, 2022 · 651987b · 651987b
2 parents 5aa2ffb + 79367af
commit 651987b
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 57 deletions.
diff --git a/machines/Depends.intel b/machines/Depends.intel
@@ -46,6 +46,6 @@ ifeq ($(DEBUG),FALSE)
   $(SHR_RANDNUM_C_OBJS): %.o: %.c
 	  $(CC) -c $(INCLDIR) $(INCS) $(CFLAGS) -O3 -fp-model fast $<
   $(PUMAS_MG_OBJS): %.o: %.F90
-	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -xCORE-AVX2 -no-fma -ftz -no-prec-sqrt -qoverride-limits -no-inline-max-total-size -inline-factor=200 -qopt-report=5 $<
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -no-fma -ftz -no-prec-sqrt -qoverride-limits -no-inline-max-total-size -inline-factor=200 -qopt-report=5 $<
 
 endif
diff --git a/machines/cmake_macros/pleiades-bro.cmake b/machines/cmake_macros/pleiades-bro.cmake
@@ -1,10 +1,6 @@
-set(CONFIG_ARGS "--host=cray")
 string(APPEND CFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 string(APPEND FFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 set(MPICC "icc")
-set(MPI_LIB_NAME "mpi")
 set(MPI_PATH "$ENV{MPI_ROOT}")
 set(NETCDF_PATH "$ENV{NETCDF}")
-string(APPEND SLIBS " -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf")
-set(PNETCDF_PATH "/home6/fvitt/pnetcdf-1.12.2")
-set(ESMF_LIBDIR "/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default")
+set(PNETCDF_PATH "/home6/fvitt/pnetcdf/pnetcdf-1.12.2")
diff --git a/machines/cmake_macros/pleiades-has.cmake b/machines/cmake_macros/pleiades-has.cmake
@@ -1,10 +1,6 @@
-set(CONFIG_ARGS "--host=cray")
 string(APPEND CFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 string(APPEND FFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 set(MPICC "icc")
-set(MPI_LIB_NAME "mpi")
 set(MPI_PATH "$ENV{MPI_ROOT}")
 set(NETCDF_PATH "$ENV{NETCDF}")
-string(APPEND SLIBS " -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf")
-set(PNETCDF_PATH "/home6/fvitt/pnetcdf-1.12.2")
-set(ESMF_LIBDIR "/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default")
+set(PNETCDF_PATH "/home6/fvitt/pnetcdf/pnetcdf-1.12.2")
diff --git a/machines/cmake_macros/pleiades-ivy.cmake b/machines/cmake_macros/pleiades-ivy.cmake
@@ -1,10 +1,6 @@
-set(CONFIG_ARGS "--host=cray")
 string(APPEND CFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 string(APPEND FFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 set(MPICC "icc")
-set(MPI_LIB_NAME "mpi")
 set(MPI_PATH "$ENV{MPI_ROOT}")
 set(NETCDF_PATH "$ENV{NETCDF}")
-string(APPEND SLIBS " -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf")
-set(PNETCDF_PATH "/home6/fvitt/pnetcdf-1.12.2")
-set(ESMF_LIBDIR "/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default")
+set(PNETCDF_PATH "/home6/fvitt/pnetcdf/pnetcdf-1.12.2")
diff --git a/machines/cmake_macros/pleiades-san.cmake b/machines/cmake_macros/pleiades-san.cmake
@@ -1,10 +1,6 @@
-set(CONFIG_ARGS "--host=cray")
 string(APPEND CFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 string(APPEND FFLAGS " -axCORE-AVX2 -xSSE4.2 -no-fma")
 set(MPICC "icc")
-set(MPI_LIB_NAME "mpi")
 set(MPI_PATH "$ENV{MPI_ROOT}")
 set(NETCDF_PATH "$ENV{NETCDF}")
-string(APPEND SLIBS " -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf")
-set(PNETCDF_PATH "/home6/fvitt/pnetcdf-1.12.2")
-set(ESMF_LIBDIR "/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default")
+set(PNETCDF_PATH "/home6/fvitt/pnetcdf/pnetcdf-1.12.2")
diff --git a/machines/config_batch.xml b/machines/config_batch.xml
@@ -639,8 +639,8 @@
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
     </directives>
     <queues>
-      <queue walltimemin="" walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
-      <queue walltimemin="" walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
+      <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
+      <queue walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
     </queues>
   </batch_system>
 
@@ -654,8 +654,8 @@
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
     </directives>
     <queues>
-      <queue walltimemin="" walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
-      <queue walltimemin="" walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
+      <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
+      <queue walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
     </queues>
   </batch_system>
 
@@ -669,8 +669,8 @@
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
     </directives>
     <queues>
-      <queue walltimemin="" walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
-      <queue walltimemin="" walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
+      <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
+      <queue walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
     </queues>
   </batch_system>
 
@@ -684,8 +684,8 @@
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
     </directives>
     <queues>
-      <queue walltimemin="" walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
-      <queue walltimemin="" walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
+      <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
+      <queue walltimemax="02:00:00" nodemin="1" nodemax="1800" default="false">devel</queue>
     </queues>
   </batch_system>
 

diff --git a/machines/config_compilers.xml b/machines/config_compilers.xml
@@ -1465,8 +1465,6 @@ using a fortran linker.
   <SLIBS>
     <append>-L$ENV{NETCDF}/lib -lnetcdff -lnetcdf</append>
   </SLIBS>
-  <PNETCDF_PATH>/home6/fvitt/pnetcdf-1.12.2</PNETCDF_PATH>
-  <ESMF_LIBDIR>/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default</ESMF_LIBDIR>
 </compiler>
 
 <compiler MACH="pleiades-has">
@@ -1486,8 +1484,6 @@ using a fortran linker.
   <SLIBS>
     <append>-L$ENV{NETCDF}/lib -lnetcdff -lnetcdf</append>
   </SLIBS>
-  <PNETCDF_PATH>/home6/fvitt/pnetcdf-1.12.2</PNETCDF_PATH>
-  <ESMF_LIBDIR>/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default</ESMF_LIBDIR>
 </compiler>
 
 <compiler MACH="pleiades-ivy">
@@ -1507,8 +1503,6 @@ using a fortran linker.
   <SLIBS>
     <append>-L$ENV{NETCDF}/lib -lnetcdff -lnetcdf</append>
   </SLIBS>
-  <PNETCDF_PATH>/home6/fvitt/pnetcdf-1.12.2</PNETCDF_PATH>
-  <ESMF_LIBDIR>/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default</ESMF_LIBDIR>
 </compiler>
 
 <compiler MACH="pleiades-san">
@@ -1528,8 +1522,6 @@ using a fortran linker.
   <SLIBS>
     <append>-L$ENV{NETCDF}/lib -lnetcdff -lnetcdf</append>
   </SLIBS>
-  <PNETCDF_PATH>/home6/fvitt/pnetcdf-1.12.2</PNETCDF_PATH>
-  <ESMF_LIBDIR>/home6/fvitt/esmf-8_1_1/lib/libO/Linux.intel.64.mpt.default</ESMF_LIBDIR>
 </compiler>
 
 <compiler MACH="sandiatoss3" COMPILER="intel">

diff --git a/machines/config_machines.xml b/machines/config_machines.xml
@@ -2811,10 +2811,10 @@ This allows using a different mpirun command to launch unit tests
       </arguments>
     </mpirun>
     <module_system type="module">
-      <init_path lang="perl">/usr/share/Modules/3.2.10/init/perl.pm</init_path>
-      <init_path lang="sh">/usr/share/Modules/3.2.10/init/sh</init_path>
-      <init_path lang="csh">/usr/share/Modules/3.2.10/init/csh</init_path>
-      <init_path lang="python">/usr/share/Modules/3.2.10/init/python.py</init_path>
+      <init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
+      <init_path lang="sh">/usr/share/Modules/init/sh</init_path>
+      <init_path lang="csh">/usr/share/Modules/init/csh</init_path>
+      <init_path lang="python">/usr/share/Modules/init/python.py</init_path>
       <cmd_path lang="perl">/usr/bin/modulecmd perl</cmd_path>
       <cmd_path lang="python">/usr/bin/modulecmd python</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
@@ -2823,8 +2823,9 @@ This allows using a different mpirun command to launch unit tests
         <command name="purge"/>
         <command name="load">nas</command>
         <command name="load">pkgsrc</command>
+        <command name="load">python3</command>
         <command name="load">comp-intel/2020.4.304</command>
-        <command name="load">mpi-hpe/mpt.2.23</command>
+        <command name="load">mpi-hpe/mpt.2.25</command>
         <command name="load">szip/2.1.1</command>
         <command name="load">hdf4/4.2.12</command>
         <command name="load">hdf5/1.8.18_mpt</command>
@@ -2836,6 +2837,7 @@ This allows using a different mpirun command to launch unit tests
       <env name="MPI_TYPE_MAX">100000</env>
       <env name="MPI_TYPE_DEPTH">16</env>
       <env name="OMP_STACKSIZE">256M</env>
+      <env name="ESMFMKFILE">/home6/fvitt/esmf-8_2_0/lib/libO/Linux.intel.64.mpt.default/esmf.mk</env>
     </environment_variables>
   </machine>
 
@@ -2863,10 +2865,10 @@ This allows using a different mpirun command to launch unit tests
       </arguments>
     </mpirun>
     <module_system type="module">
-      <init_path lang="perl">/usr/share/Modules/3.2.10/init/perl.pm</init_path>
-      <init_path lang="sh">/usr/share/Modules/3.2.10/init/sh</init_path>
-      <init_path lang="csh">/usr/share/Modules/3.2.10/init/csh</init_path>
-      <init_path lang="python">/usr/share/Modules/3.2.10/init/python.py</init_path>
+      <init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
+      <init_path lang="sh">/usr/share/Modules/init/sh</init_path>
+      <init_path lang="csh">/usr/share/Modules/init/csh</init_path>
+      <init_path lang="python">/usr/share/Modules/init/python.py</init_path>
       <cmd_path lang="perl">/usr/bin/modulecmd perl</cmd_path>
       <cmd_path lang="python">/usr/bin/modulecmd python</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
@@ -2875,8 +2877,9 @@ This allows using a different mpirun command to launch unit tests
         <command name="purge"/>
         <command name="load">nas</command>
         <command name="load">pkgsrc</command>
+        <command name="load">python3</command>
         <command name="load">comp-intel/2020.4.304</command>
-        <command name="load">mpi-hpe/mpt.2.23</command>
+        <command name="load">mpi-hpe/mpt.2.25</command>
         <command name="load">szip/2.1.1</command>
         <command name="load">hdf4/4.2.12</command>
         <command name="load">hdf5/1.8.18_mpt</command>
@@ -2888,6 +2891,7 @@ This allows using a different mpirun command to launch unit tests
       <env name="MPI_TYPE_MAX">100000</env>
       <env name="MPI_TYPE_DEPTH">16</env>
       <env name="OMP_STACKSIZE">256M</env>
+      <env name="ESMFMKFILE">/home6/fvitt/esmf-8_2_0/lib/libO/Linux.intel.64.mpt.default/esmf.mk</env>
     </environment_variables>
   </machine>
 
@@ -2915,10 +2919,10 @@ This allows using a different mpirun command to launch unit tests
       </arguments>
     </mpirun>
     <module_system type="module">
-      <init_path lang="perl">/usr/share/Modules/3.2.10/init/perl.pm</init_path>
-      <init_path lang="sh">/usr/share/Modules/3.2.10/init/sh</init_path>
-      <init_path lang="csh">/usr/share/Modules/3.2.10/init/csh</init_path>
-      <init_path lang="python">/usr/share/Modules/3.2.10/init/python.py</init_path>
+      <init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
+      <init_path lang="sh">/usr/share/Modules/init/sh</init_path>
+      <init_path lang="csh">/usr/share/Modules/init/csh</init_path>
+      <init_path lang="python">/usr/share/Modules/init/python.py</init_path>
       <cmd_path lang="perl">/usr/bin/modulecmd perl</cmd_path>
       <cmd_path lang="python">/usr/bin/modulecmd python</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
@@ -2927,8 +2931,9 @@ This allows using a different mpirun command to launch unit tests
         <command name="purge"/>
         <command name="load">nas</command>
         <command name="load">pkgsrc</command>
+        <command name="load">python3</command>
         <command name="load">comp-intel/2020.4.304</command>
-        <command name="load">mpi-hpe/mpt.2.23</command>
+        <command name="load">mpi-hpe/mpt.2.25</command>
         <command name="load">szip/2.1.1</command>
         <command name="load">hdf4/4.2.12</command>
         <command name="load">hdf5/1.8.18_mpt</command>
@@ -2940,6 +2945,7 @@ This allows using a different mpirun command to launch unit tests
       <env name="MPI_TYPE_MAX">100000</env>
       <env name="MPI_TYPE_DEPTH">16</env>
       <env name="OMP_STACKSIZE">256M</env>
+      <env name="ESMFMKFILE">/home6/fvitt/esmf-8_2_0/lib/libO/Linux.intel.64.mpt.default/esmf.mk</env>
     </environment_variables>
   </machine>
 
@@ -2967,10 +2973,10 @@ This allows using a different mpirun command to launch unit tests
       </arguments>
     </mpirun>
     <module_system type="module">
-      <init_path lang="perl">/usr/share/Modules/3.2.10/init/perl.pm</init_path>
-      <init_path lang="sh">/usr/share/Modules/3.2.10/init/sh</init_path>
-      <init_path lang="csh">/usr/share/Modules/3.2.10/init/csh</init_path>
-      <init_path lang="python">/usr/share/Modules/3.2.10/init/python.py</init_path>
+      <init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
+      <init_path lang="sh">/usr/share/Modules/init/sh</init_path>
+      <init_path lang="csh">/usr/share/Modules/init/csh</init_path>
+      <init_path lang="python">/usr/share/Modules/init/python.py</init_path>
       <cmd_path lang="perl">/usr/bin/modulecmd perl</cmd_path>
       <cmd_path lang="python">/usr/bin/modulecmd python</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
@@ -2979,8 +2985,9 @@ This allows using a different mpirun command to launch unit tests
         <command name="purge"/>
         <command name="load">nas</command>
         <command name="load">pkgsrc</command>
+        <command name="load">python3</command>
         <command name="load">comp-intel/2020.4.304</command>
-        <command name="load">mpi-hpe/mpt.2.23</command>
+        <command name="load">mpi-hpe/mpt.2.25</command>
         <command name="load">szip/2.1.1</command>
         <command name="load">hdf4/4.2.12</command>
         <command name="load">hdf5/1.8.18_mpt</command>
@@ -2992,6 +2999,7 @@ This allows using a different mpirun command to launch unit tests
       <env name="MPI_TYPE_MAX">100000</env>
       <env name="MPI_TYPE_DEPTH">16</env>
       <env name="OMP_STACKSIZE">256M</env>
+      <env name="ESMFMKFILE">/home6/fvitt/esmf-8_2_0/lib/libO/Linux.intel.64.mpt.default/esmf.mk</env>
     </environment_variables>
   </machine>