Merge branch 'azamat/machines/update-improv' (PR #6539)

Update ANL LCRC Improv machine config:
- force-purge sticky modules
- add env-var to avoid lock-files while reading netcdf files
- increase ne30 PE-layout 4->6 nodes to avoid OOM errors

[BFB]

Author: amametjanov

cime_config/machines/config_machines.xml

@@ -3006,7 +3006,7 @@
       <cmd_path lang="sh">module</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
       <modules>
-        <command name="purge"/>
+        <command name="--force purge"/>
         <command name="load">cmake/3.27.4</command>
       </modules>
       <modules compiler="gnu">
@@ -3023,6 +3023,7 @@
       <env name="PNETCDF_PATH">/lcrc/group/e3sm/soft/improv/pnetcdf/1.12.3/gcc-12.3.0/openmpi-4.1.6</env>
       <env name="PATH">/lcrc/group/e3sm/soft/improv/pnetcdf/1.12.3/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/bin:/lcrc/group/e3sm/soft/perl/improv/bin:$ENV{PATH}</env>
       <env name="LD_LIBRARY_PATH">$SHELL{lp=/lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0:/lcrc/group/e3sm/soft/improv/pnetcdf/1.12.3/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/lib:/opt/pbs/lib:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/lib; if [ -z "$LD_LIBRARY_PATH" ]; then echo $lp; else echo "$lp:$LD_LIBRARY_PATH"; fi}</env>
+      <env name="OMPI_MCA_sharedfp">^lockedfile</env>
     </environment_variables>
     <environment_variables BUILD_THREADED="TRUE">
       <env name="OMP_STACKSIZE">128M</env>

components/eam/cime_config/config_pes.xml

@@ -772,17 +772,17 @@
       </pes>
     </mach>
     <mach name="improv">
-      <pes compset=".*EAM.+ELM.+MPASSI.+DOCN.+SGLC_SWAV_SIAC_SESP_BGC.*" pesize="any">
-        <comment>improv pelayout for tri-grid BGC tests with EAM+DOCN </comment>
-        <ntasks>
-          <ntasks_atm>-4</ntasks_atm>
-          <ntasks_cpl>-4</ntasks_cpl>
-          <ntasks_lnd>-4</ntasks_lnd>
-          <ntasks_rof>-4</ntasks_rof>
-          <ntasks_ocn>-4</ntasks_ocn>
-          <ntasks_ice>-4</ntasks_ice>
-          <ntasks_glc>-4</ntasks_glc>
-          <ntasks_wav>-4</ntasks_wav>
+      <pes compset="any" pesize="any">
+        <comment>improv pelayout for any EAM compset on ne30np4.pg2 grid </comment>
+        <ntasks>
+          <ntasks_atm>-6</ntasks_atm>
+          <ntasks_cpl>-6</ntasks_cpl>
+          <ntasks_lnd>-6</ntasks_lnd>
+          <ntasks_rof>-6</ntasks_rof>
+          <ntasks_ocn>-6</ntasks_ocn>
+          <ntasks_ice>-6</ntasks_ice>
+          <ntasks_glc>-6</ntasks_glc>
+          <ntasks_wav>-6</ntasks_wav>
         </ntasks>
       </pes>
     </mach>