From 7ce55c484bde4c02c5bb3a4732f5a99e1a04ad6a Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Thu, 5 May 2022 20:58:16 +0000
Subject: [PATCH 1/5] updates for noaacloud

---
 modulefiles/build_noaacloud_intel | 20 ++++++++++++++++++++
 modulefiles/srw_common            | 28 +++++++++++++++++++---------
 modulefiles/wflow_noaacloud       | 19 +++++++++++++++++++
 3 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 modulefiles/build_noaacloud_intel
 create mode 100644 modulefiles/wflow_noaacloud

diff --git a/modulefiles/build_noaacloud_intel b/modulefiles/build_noaacloud_intel
new file mode 100644
index 0000000000..eea4816c57
--- /dev/null
+++ b/modulefiles/build_noaacloud_intel
@@ -0,0 +1,20 @@
+#%Module
+
+proc ModulesHelp { } {
+   puts stderr "This module loads libraries for building SRW on"
+   puts stderr "the NOAA cloud using Intel-oneapi"
+}
+
+module purge
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load cmake/3.22.1 
+
+module use /apps/modules/modulefiles 
+module load rocoto
+
+module load srw_common
+module load esmf/8.2.0
+prepend-path PATH /contrib/spack-stack/apps/miniconda/py39_4.11.0/bin
+
diff --git a/modulefiles/srw_common b/modulefiles/srw_common
index 6de48669e9..71c1482710 100644
--- a/modulefiles/srw_common
+++ b/modulefiles/srw_common
@@ -1,13 +1,20 @@
 #%Module
 
-module load jasper/2.0.25
-module load zlib/1.2.11
-module load png/1.6.35
+module try-load jasper/2.0.25
+#module try-load jasper/2.0.32
+module try-load zlib/1.2.11
+#module try-load zlib/1.2.12
+module try-load png/1.6.35
+module try-load libpng/1.6.35
 
 module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.2
-module load esmf/8_2_0
+module try-load netcdf/4.7.4
+module try-load netcdf-c/4.7.4
+module try-load netcdf-fortran/4.5.4
+module try-load pio/2.5.2
+module try-load parallelio/2.5.2
+module try-load esmf/8_2_0
+module try-load esmf/8.2.0
 module load fms/2021.03
 
 module load bacio/2.4.1
@@ -19,9 +26,12 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load upp/10.0.10
 
-module load gftl-shared/v1.3.3
-module load yafyaml/v0.5.1
-module load mapl/2.11.0-esmf-8_2_0
+module try-load gftl-shared/v1.3.3
+module try-load gftl-shared/1.3.3
+module try-load yafyaml/v0.5.1
+module try-load yafyaml/0.5.1
+module try-load mapl/2.11.0-esmf-8_2_0
+module try-load mapl/2.11.0-esmf-8.2.0
 
 module load gfsio/1.4.1
 module load landsfcutil/2.4.1
diff --git a/modulefiles/wflow_noaacloud b/modulefiles/wflow_noaacloud
new file mode 100644
index 0000000000..c785e2530a
--- /dev/null
+++ b/modulefiles/wflow_noaacloud
@@ -0,0 +1,19 @@
+#%Module
+
+proc ModulesHelp { } {
+   put stderr "This module loads python environement for running SRW on"
+   put stderr "the NOAA cloud"
+}
+
+module-whatis "Loads libraries needed for running SRW on NOAA cloud"
+
+
+module use /apps/modules/modulefiles 
+module load rocoto
+
+if { [module-info mode load] } {
+  puts stderr "Please do the following to activate conda:
+       > conda activate regional_workflow"
+}
+
+

From 59a3071d2e0dc5a9ca60677c6a4c4b1b20708ac9 Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Sat, 7 May 2022 14:40:35 +0000
Subject: [PATCH 2/5] working version

---
 modulefiles/build_noaacloud_intel | 1 -
 modulefiles/wflow_noaacloud       | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modulefiles/build_noaacloud_intel b/modulefiles/build_noaacloud_intel
index eea4816c57..10d01fc6ac 100644
--- a/modulefiles/build_noaacloud_intel
+++ b/modulefiles/build_noaacloud_intel
@@ -16,5 +16,4 @@ module load rocoto
 
 module load srw_common
 module load esmf/8.2.0
-prepend-path PATH /contrib/spack-stack/apps/miniconda/py39_4.11.0/bin
 
diff --git a/modulefiles/wflow_noaacloud b/modulefiles/wflow_noaacloud
index c785e2530a..0335013240 100644
--- a/modulefiles/wflow_noaacloud
+++ b/modulefiles/wflow_noaacloud
@@ -10,6 +10,8 @@ module-whatis "Loads libraries needed for running SRW on NOAA cloud"
 
 module use /apps/modules/modulefiles 
 module load rocoto
+module use /contrib/GST/miniconda3/modulefiles
+module load miniconda3/4.10.3
 
 if { [module-info mode load] } {
   puts stderr "Please do the following to activate conda:

From ccf005b569b9d66846c140f38956e6b24d0f940c Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Sat, 7 May 2022 14:42:33 +0000
Subject: [PATCH 3/5] pointing to noaa-epic for testing

---
 Externals.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 0958315c45..00b61b6d32 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -1,9 +1,9 @@
 [regional_workflow]
 protocol = git
-repo_url = https://github.com/ufs-community/regional_workflow
+repo_url = https://github.com/NOAA-EPIC/regional_workflow
 # Specify either a branch name or a hash but not both.
-#branch = develop
-hash = 6800643
+branch = feature/epic
+#hash = 6800643
 local_path = regional_workflow
 required = True
 

From 2afd981ca9fd2b9653dd33cdf1666da5e90c9314 Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Tue, 10 May 2022 22:39:55 +0000
Subject: [PATCH 4/5] changes for noaacloud

---
 Externals.cfg                     | 2 +-
 modulefiles/build_noaacloud_intel | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 00b61b6d32..1839e4ee9a 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -2,7 +2,7 @@
 protocol = git
 repo_url = https://github.com/NOAA-EPIC/regional_workflow
 # Specify either a branch name or a hash but not both.
-branch = feature/epic
+branch = feature/noaacloud
 #hash = 6800643
 local_path = regional_workflow
 required = True
diff --git a/modulefiles/build_noaacloud_intel b/modulefiles/build_noaacloud_intel
index 10d01fc6ac..f4827fa3e0 100644
--- a/modulefiles/build_noaacloud_intel
+++ b/modulefiles/build_noaacloud_intel
@@ -17,3 +17,5 @@ module load rocoto
 module load srw_common
 module load esmf/8.2.0
 
+module use /contrib/GST/miniconda3/modulefiles
+module load miniconda3/4.10.3

From 3b15f29c97e56f75dfd1bac63ee60d2636c3d2e4 Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Thu, 12 May 2022 20:55:42 +0000
Subject: [PATCH 5/5] switched to load-any

---
 modulefiles/srw_common | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/modulefiles/srw_common b/modulefiles/srw_common
index 71c1482710..c8c87f92a8 100644
--- a/modulefiles/srw_common
+++ b/modulefiles/srw_common
@@ -1,20 +1,14 @@
 #%Module
 
-module try-load jasper/2.0.25
-#module try-load jasper/2.0.32
-module try-load zlib/1.2.11
-#module try-load zlib/1.2.12
-module try-load png/1.6.35
-module try-load libpng/1.6.35
+module load jasper/2.0.25
+module load zlib/1.2.11
+module load-any png/1.6.35 libpng/1.6.35
 
 module load hdf5/1.10.6
-module try-load netcdf/4.7.4
-module try-load netcdf-c/4.7.4
-module try-load netcdf-fortran/4.5.4
-module try-load pio/2.5.2
-module try-load parallelio/2.5.2
-module try-load esmf/8_2_0
-module try-load esmf/8.2.0
+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.2 parallelio/2.5.2
+module load-any esmf/8_2_0 esmf/8.2.0
 module load fms/2021.03
 
 module load bacio/2.4.1
@@ -26,12 +20,9 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load upp/10.0.10
 
-module try-load gftl-shared/v1.3.3
-module try-load gftl-shared/1.3.3
-module try-load yafyaml/v0.5.1
-module try-load yafyaml/0.5.1
-module try-load mapl/2.11.0-esmf-8_2_0
-module try-load mapl/2.11.0-esmf-8.2.0
+module load-any gftl-shared/v1.3.3 gftl-shared/1.3.3
+module load-any yafyaml/v0.5.1 yafyaml/0.5.1
+module load-any mapl/2.11.0-esmf-8_2_0 mapl/2.11.0-esmf-8.2.0
 
 module load gfsio/1.4.1
 module load landsfcutil/2.4.1