From 381897816d3ba70ec7c9430402c241728582df88 Mon Sep 17 00:00:00 2001
From: Daniel Abdi <daniel.abdi@noaa.gov>
Date: Mon, 3 Oct 2022 21:13:44 +0000
Subject: [PATCH 1/2] Temporary fix for Hera netcdf issue.

---
 modulefiles/build_hera_intel | 2 +-
 modulefiles/srw_common       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modulefiles/build_hera_intel b/modulefiles/build_hera_intel
index 275ef2fe32..d8506c9f66 100644
--- a/modulefiles/build_hera_intel
+++ b/modulefiles/build_hera_intel
@@ -20,9 +20,9 @@ module load hpc/1.2.0
 module load hpc-intel/2022.1.2
 module load hpc-impi/2022.1.2
 
+module load nccmp/1.8.9.0
 module load srw_common
 
-module load nccmp/1.8.9.0
 module load nco/4.9.3
 
 setenv CMAKE_C_COMPILER mpiicc
diff --git a/modulefiles/srw_common b/modulefiles/srw_common
index 9c3ece42fc..58fe66f8fe 100644
--- a/modulefiles/srw_common
+++ b/modulefiles/srw_common
@@ -4,6 +4,8 @@ module load jasper/2.0.25
 module load zlib/1.2.11
 module load-any png/1.6.35 libpng/1.6.37
 
+module load ncio/1.1.2
+
 module load-any netcdf/4.7.4 netcdf-c/4.7.4
 module load-any netcdf/4.7.4 netcdf-fortran/4.5.4
 module load-any pio/2.5.3 parallelio/2.5.2
@@ -29,5 +31,4 @@ module load sigio/2.3.2
 module load w3nco/2.4.1
 module load wrf_io/1.2.0
 
-module load ncio/1.1.2
 module load wgrib2/2.0.8

From aeada6d0933f6c250d6b084312e135d10f4a4f69 Mon Sep 17 00:00:00 2001
From: Daniel Abdi <daniel.abdi@noaa.gov>
Date: Tue, 4 Oct 2022 11:27:16 +0000
Subject: [PATCH 2/2] Cheyenne fix.

---
 ush/load_modules_run_task.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh
index ede2870429..ad19d3d36a 100755
--- a/ush/load_modules_run_task.sh
+++ b/ush/load_modules_run_task.sh
@@ -89,6 +89,7 @@ jjob_fp="$2"
 #
 #-----------------------------------------------------------------------
 #
+set +u
 if [ ! -z ${SLURM_JOB_ID} ]; then
     export job=${SLURM_JOB_NAME}
     export jobid=${job}.${SLURM_JOB_ID}
@@ -99,6 +100,7 @@ else
     export job=${task_name}
     export jobid=${job}.$$
 fi
+set -u
 #
 #-----------------------------------------------------------------------
 #