From 79367af52526b4674be45aa96cb6cb23b88e4197 Mon Sep 17 00:00:00 2001
From: Francis Vitt <fvitt@ucar.edu>
Date: Fri, 28 Jan 2022 15:44:24 -0700
Subject: [PATCH] updates for pleiades

        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
---
 machines/Depends.intel                   |  2 +-
 machines/cmake_macros/pleiades-bro.cmake |  6 +--
 machines/cmake_macros/pleiades-has.cmake |  6 +--
 machines/cmake_macros/pleiades-ivy.cmake |  6 +--
 machines/cmake_macros/pleiades-san.cmake |  6 +--
 machines/config_batch.xml                | 16 ++++----
 machines/config_compilers.xml            |  8 ----
 machines/config_machines.xml             | 48 ++++++++++++++----------
 8 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/machines/Depends.intel b/machines/Depends.intel
index d412aad0..b024db74 100644
--- 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
index 518c1d2e..f3e3bf82 100644
--- 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
index 518c1d2e..f3e3bf82 100644
--- 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
index 518c1d2e..f3e3bf82 100644
--- 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
index 518c1d2e..f3e3bf82 100644
--- 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
index 65da34e0..7a28fffb 100644
--- 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
index 72c68b02..30c720aa 100644
--- 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
index 6a8336fd..c3e91f44 100644
--- a/machines/config_machines.xml
+++ b/machines/config_machines.xml
@@ -2794,10 +2794,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>
@@ -2806,8 +2806,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>
@@ -2819,6 +2820,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>
 
@@ -2846,10 +2848,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>
@@ -2858,8 +2860,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>
@@ -2871,6 +2874,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>
 
@@ -2898,10 +2902,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>
@@ -2910,8 +2914,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>
@@ -2923,6 +2928,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>
 
@@ -2950,10 +2956,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>
@@ -2962,8 +2968,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>
@@ -2975,6 +2982,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>