Merge pull request #245 from jedwards4b/perlmutter_update

perlmutter_update

Author: jedwards4b

machines/config_machines.xml

@@ -64,7 +64,7 @@ This allows using a different mpirun command to launch unit tests
     <value MACH="lobato">lobata</value>
     <value MACH="lonestar5">.*ls5\.tacc\.utexas\.edu</value>
     <value MACH="melvin">(melvin|watson)</value>
-    <value MACH="perlmutter">$ENV{NERSC_HOST}:perlmutter</value>
+    <value MACH="perlmutter">.*.perlmutter.*</value>
     <value MACH="sandia-srn-sems">(s999964|climate|penn)</value>
     <value MACH="sandiatoss3">(skybridge|chama)-login</value>
     <value MACH="stampede2-skx">.*stampede2</value>

machines/perlmutter/config_machines.xml

@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
   <machine MACH="perlmutter">
     <DESC>NERSC EX AMD EPYC, os is CNL, 64 pes/node, batch system is Slurm</DESC>
     <OS>CNL</OS>
-    <COMPILERS>gnu,cray,nvidia,aocc</COMPILERS>
+    <COMPILERS>intel,gnu,cray,nvidia,aocc</COMPILERS>
     <MPILIBS>mpich</MPILIBS>
     <PROJECT>mp9_g</PROJECT>
     <CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
@@ -25,7 +26,7 @@
         <arg name="binding"> -c {{ srun_binding }}</arg>
       </arguments>
     </mpirun>
-    <module_system type="module">
+    <module_system type="module" allow_error="true">
       <init_path lang="perl">/usr/share/lmod/lmod/init/perl</init_path>
       <init_path lang="python">/usr/share/lmod/lmod/init/env_modules_python.py</init_path>
       <init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
@@ -52,24 +53,14 @@
         <command name="rm">cray-netcdf</command>
         <command name="rm">craype</command>
       </modules>
-
-      <modules compiler="cray">
-        <command name="load">PrgEnv-cray</command>
-        <command name="switch">cce cce/12.0.3</command>
-      </modules>
-      <modules compiler="gnu">
-        <command name="load">PrgEnv-gnu</command>
-	
-      </modules>
       <modules>
+	<command name="load">python/3.11</command>
+        <command name="load">cmake/3.30.2</command>
+        <command name="load">PrgEnv-intel</command>
+        <command name="switch">intel intel/2024.1.0</command>
         <command name="swap">craype craype/2.7.30</command>
-      </modules>
-      <modules>
         <command name="switch">cray-libsci/23.12.5</command>
       </modules>
-      <modules>
-        <command name="load">cray-mpich/8.1.28</command>
-      </modules>
       <modules mpilib="mpi-serial">
         <command name="rm">cray-netcdf-hdf5parallel</command>
         <command name="rm">cray-hdf5-parallel</command>
@@ -78,15 +69,18 @@
         <command name="load">cray-netcdf</command>
       </modules>
       <modules mpilib="!mpi-serial">
+        <command name="load">cray-mpich/8.1.28</command>
         <command name="load">cray-hdf5-parallel</command>
         <command name="load">cray-netcdf-hdf5parallel</command>
         <command name="load">cray-parallel-netcdf</command>
-      </modules>
-      <modules>
-        <command name="load">cmake/3.22.0</command>
+	<command name="use">/global/cfs/cdirs/ccsm1/modulefiles/perlmutter/cray-mpich/8.1.28/intel/2023.2.0</command>
+	<command name="load">parallelio/2.6.3</command>
+	<command name="load">esmf/8.7.0</command>
       </modules>
     </module_system>
     <environment_variables>
+      <env name="ESMF_RUNTIME_PROFILE">ON</env>
+      <env name="ESMF_RUNTIME_PROFILE_OUTPUT">SUMMARY</env>
       <env name="OMP_STACKSIZE">256M</env>
 <!--      <env name="OMP_PROC_BIND">spread</env>
       <env name="OMP_PLACES">threads</env> -->