From a66b9f1b7f51e1938235c599f33c42992512c355 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 15 May 2026 09:07:46 +0000
Subject: [PATCH 1/2] Initial plan


From 1cefd25f4072651bee2797acb485099e0dd37d35 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 15 May 2026 09:11:01 +0000
Subject: [PATCH 2/2] Update config_machines.xml from upstream E3SM b3c664d

Upstream revision: b3c664d650255e5564b3eea486f2479f3daf8551

Changes for aurora:
- Remove mpich1024 from MPILIBS (now just mpich)
- Add moab/5.6.0 module load in the mpich module section
- Replace FI_LOG_PROV/FI_LOG_LEVEL with FI_CXI_DEFAULT_TX_SIZE
  in the main environment_variables section
- Move FI_LOG_PROV/FI_LOG_LEVEL to the DEBUG environment_variables
  section
- Remove UR_L0 and SYCL PI Level Zero environment variables from
  the oneapi-ifxgpu compiler section

No Spack template changes required (no package group drift
detected for aurora).

Agent-Logs-Url: https://github.com/E3SM-Project/mache/sessions/f6455af9-fc77-42f1-8733-4362712dd6ba

Co-authored-by: xylar <4179064+xylar@users.noreply.github.com>
---
 mache/cime_machine_config/config_machines.xml | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml
index 0da81562..318d0da7 100644
--- a/mache/cime_machine_config/config_machines.xml
+++ b/mache/cime_machine_config/config_machines.xml
@@ -1763,7 +1763,7 @@
         <command name="load">sems-cmake/3.27.9</command>
       </modules>
       <modules compiler="gnu">
-        <command name="load">sems-gcc/11.4.0</command>
+        <command name="load">sems-gcc/13.2.0</command>
         <command name="load">sems-openblas</command>
       </modules>
       <modules mpilib="mpi-serial">
@@ -1772,6 +1772,7 @@
       </modules>
       <modules mpilib="!mpi-serial">
         <command name="load">sems-openmpi-no-cuda/4.1.6</command>
+        <command name="load">sems-hdf5/1.14.5</command>
         <command name="load">sems-netcdf-c/4.9.2</command>
         <command name="load">sems-netcdf-cxx/4.2</command>
         <command name="load">sems-netcdf-fortran/4.6.1</command>
@@ -1796,6 +1797,9 @@
     <environment_variables mpilib="!mpi-serial">
       <env name="PNETCDF_PATH">$ENV{PARALLEL_NETCDF_ROOT}</env>
     </environment_variables>
+    <environment_variables compiler="gnu">
+      <env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /sems-data-store/ACME/mappy/moab; else echo "$MOAB_ROOT"; fi}</env>
+    </environment_variables>
     <resource_limits>
       <resource name="RLIMIT_STACK">-1</resource>
     </resource_limits>
@@ -3412,7 +3416,7 @@
     <NODENAME_REGEX>aurora-uan-.*</NODENAME_REGEX>
     <OS>LINUX</OS>
     <COMPILERS>oneapi-ifxgpu,oneapi-ifx</COMPILERS>
-    <MPILIBS>mpich,mpich1024</MPILIBS>
+    <MPILIBS>mpich</MPILIBS>
     <PROJECT>E3SM_Dec</PROJECT>
     <SAVE_TIMING_DIR>/lus/flare/projects/E3SMinput/baselines</SAVE_TIMING_DIR>
     <SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>
@@ -3458,8 +3462,7 @@
         <command name="load">oneapi/release/2025.3.1</command>
         <command name="load">netcdf-c/4.9.3</command>
         <command name="load">netcdf-fortran/4.6.2</command>
-      </modules>
-      <modules mpilib="mpich1024">
+        <command name="load">moab/5.6.0</command>
         <command name="load">mpich-config/collective-tuning/1024</command>
       </modules>
     </module_system>
@@ -3473,20 +3476,12 @@
         <env name="FI_CXI_CQ_FILL_PERCENT">20</env>
         <env name="FI_CXI_RX_MATCH_MODE">hybrid</env>
         <env name="FI_MR_CACHE_MONITOR">disabled</env>
-        <env name="FI_LOG_PROV">cxi</env>
-        <env name="FI_LOG_LEVEL">warn</env>
+        <env name="FI_CXI_DEFAULT_TX_SIZE">$SHELL{if [ 2048 -lt `./xmlquery --value NUM_NODES` ]; then echo "4096 FI_CXI_DEFAULT_RX_SIZE=4096"; else echo $FI_CXI_DEFAULT_TX_SIZE; fi;}</env>
         <env name="PALS_PING_PERIOD">240</env>
         <env name="PALS_RPC_TIMEOUT">240</env>
         <env name="RLIMITS"> </env>
      </environment_variables>
      <environment_variables compiler="oneapi-ifxgpu">
-        <env name="UR_L0_USE_DRIVER_INORDER_LISTS">1</env>
-        <env name="UR_L0_USE_RELAXED_ALLOCATION_LIMITS">1</env>
-        <env name="UR_L0_USE_COPY_ENGINE">1</env>
-        <env name="SYCL_PI_LEVEL_ZERO_SINGLE_THREAD_MODE">1</env>
-        <env name="SYCL_PI_LEVEL_ZERO_DISABLE_USM_ALLOCATOR">1</env>
-        <env name="SYCL_PI_LEVEL_ZERO_USM_RESIDENT">0x001</env>
-
         <env name="MPIR_CVAR_ENABLE_GPU">1</env>
         <env name="romio_cb_read">disable</env>
         <env name="romio_cb_write">disable</env>
@@ -3514,6 +3509,8 @@
         <env name="OMP_STACKSIZE">128M</env>
     </environment_variables>
     <environment_variables DEBUG="TRUE">
+        <env name="FI_LOG_PROV">cxi</env><!--log cassini fabric interface events-->
+        <env name="FI_LOG_LEVEL">warn</env>
         <env name="RLIMITS">--rlimits CORE</env>
     </environment_variables>
     <resource_limits DEBUG="TRUE">