From ac3433fffe918a6f3796b19fc32bd9a0864bccbd Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Tue, 23 Mar 2021 02:44:31 +0000
Subject: [PATCH 1/6] Add ufs_common modulefile

---
 .../{cheyenne.gnu/fv3 => ufs_cheyenne.gnu}    | 20 +--------------
 .../fv3_debug => ufs_cheyenne.gnu_debug}      | 20 +--------------
 .../fv3 => ufs_cheyenne.intel}                | 20 +--------------
 .../fv3_debug => ufs_cheyenne.intel_debug}    | 20 +--------------
 modulefiles/ufs_common                        | 21 ++++++++++++++++
 modulefiles/ufs_common_debug                  | 21 ++++++++++++++++
 .../{gaea.intel/fv3 => ufs_gaea.intel}        | 25 +++----------------
 .../fv3_debug => ufs_gaea.intel_debug}        | 25 +++----------------
 modulefiles/{hera.gnu/fv3 => ufs_hera.gnu}    | 22 ++--------------
 .../{hera.intel/fv3 => ufs_hera.intel}        | 20 +--------------
 .../fv3_debug => ufs_hera.intel_debug}        | 20 +--------------
 modulefiles/{jet.intel/fv3 => ufs_jet.intel}  | 20 +--------------
 .../fv3_debug => ufs_jet.intel_debug}         | 20 +--------------
 .../{orion.intel/fv3 => ufs_orion.intel}      | 20 +--------------
 .../fv3_debug => ufs_orion.intel_debug}       | 20 +--------------
 modulefiles/{wcoss2/fv3_debug => ufs_wcoss2}  | 20 +--------------
 modulefiles/{wcoss2/fv3 => ufs_wcoss2_debug}  | 20 +--------------
 .../{wcoss_cray/fv3 => ufs_wcoss_cray}        |  0
 .../fv3_debug => ufs_wcoss_cray_debug}        |  0
 .../{wcoss_dell_p3/fv3 => ufs_wcoss_dell_p3}  | 20 +--------------
 .../fv3_debug => ufs_wcoss_dell_p3_debug}     | 20 +--------------
 tests/compile.sh                              | 10 ++++----
 22 files changed, 69 insertions(+), 335 deletions(-)
 rename modulefiles/{cheyenne.gnu/fv3 => ufs_cheyenne.gnu} (61%)
 rename modulefiles/{cheyenne.gnu/fv3_debug => ufs_cheyenne.gnu_debug} (60%)
 rename modulefiles/{cheyenne.intel/fv3 => ufs_cheyenne.intel} (61%)
 rename modulefiles/{cheyenne.intel/fv3_debug => ufs_cheyenne.intel_debug} (61%)
 create mode 100644 modulefiles/ufs_common
 create mode 100644 modulefiles/ufs_common_debug
 rename modulefiles/{gaea.intel/fv3 => ufs_gaea.intel} (63%)
 rename modulefiles/{gaea.intel/fv3_debug => ufs_gaea.intel_debug} (63%)
 rename modulefiles/{hera.gnu/fv3 => ufs_hera.gnu} (55%)
 rename modulefiles/{hera.intel/fv3 => ufs_hera.intel} (58%)
 rename modulefiles/{hera.intel/fv3_debug => ufs_hera.intel_debug} (57%)
 rename modulefiles/{jet.intel/fv3 => ufs_jet.intel} (57%)
 rename modulefiles/{jet.intel/fv3_debug => ufs_jet.intel_debug} (57%)
 rename modulefiles/{orion.intel/fv3 => ufs_orion.intel} (57%)
 rename modulefiles/{orion.intel/fv3_debug => ufs_orion.intel_debug} (56%)
 rename modulefiles/{wcoss2/fv3_debug => ufs_wcoss2} (58%)
 rename modulefiles/{wcoss2/fv3 => ufs_wcoss2_debug} (58%)
 rename modulefiles/{wcoss_cray/fv3 => ufs_wcoss_cray} (100%)
 rename modulefiles/{wcoss_cray/fv3_debug => ufs_wcoss_cray_debug} (100%)
 rename modulefiles/{wcoss_dell_p3/fv3 => ufs_wcoss_dell_p3} (60%)
 rename modulefiles/{wcoss_dell_p3/fv3_debug => ufs_wcoss_dell_p3_debug} (59%)

diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/ufs_cheyenne.gnu
similarity index 61%
rename from modulefiles/cheyenne.gnu/fv3
rename to modulefiles/ufs_cheyenne.gnu
index 1ff61402ce..1421aaae77 100644
--- a/modulefiles/cheyenne.gnu/fv3
+++ b/modulefiles/ufs_cheyenne.gnu
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/cheyenne.gnu/fv3_debug b/modulefiles/ufs_cheyenne.gnu_debug
similarity index 60%
rename from modulefiles/cheyenne.gnu/fv3_debug
rename to modulefiles/ufs_cheyenne.gnu_debug
index 1cbf4dbd07..a9da2d8c46 100644
--- a/modulefiles/cheyenne.gnu/fv3_debug
+++ b/modulefiles/ufs_cheyenne.gnu_debug
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/ufs_cheyenne.intel
similarity index 61%
rename from modulefiles/cheyenne.intel/fv3
rename to modulefiles/ufs_cheyenne.intel
index 2c64847b3e..208915684c 100644
--- a/modulefiles/cheyenne.intel/fv3
+++ b/modulefiles/ufs_cheyenne.intel
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/cheyenne.intel/fv3_debug b/modulefiles/ufs_cheyenne.intel_debug
similarity index 61%
rename from modulefiles/cheyenne.intel/fv3_debug
rename to modulefiles/ufs_cheyenne.intel_debug
index fd32e5ea27..d866492d22 100644
--- a/modulefiles/cheyenne.intel/fv3_debug
+++ b/modulefiles/ufs_cheyenne.intel_debug
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
new file mode 100644
index 0000000000..8fc6523bf7
--- /dev/null
+++ b/modulefiles/ufs_common
@@ -0,0 +1,21 @@
+#%Module
+
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load upp/10.0.4
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
new file mode 100644
index 0000000000..b874914947
--- /dev/null
+++ b/modulefiles/ufs_common_debug
@@ -0,0 +1,21 @@
+#%Module
+
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27-debug
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load upp/10.0.4
diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/ufs_gaea.intel
similarity index 63%
rename from modulefiles/gaea.intel/fv3
rename to modulefiles/ufs_gaea.intel
index 175b9702da..48eeacc3a3 100644
--- a/modulefiles/gaea.intel/fv3
+++ b/modulefiles/ufs_gaea.intel
@@ -13,6 +13,8 @@ module rm netcdf
 module load intel/18.0.6.288
 module load cray-mpich/7.7.11
 module load cray-python/3.7.3.2
+# Needed at runtime:
+module load alps
 
 module load cmake/3.17.0
 setenv CMAKE_C_COMPILER cc
@@ -26,25 +28,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.6.288
 module load hpc-cray-mpich/7.7.11
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
-
-# Needed at runtime:
-module load alps
+module load ufs_common
diff --git a/modulefiles/gaea.intel/fv3_debug b/modulefiles/ufs_gaea.intel_debug
similarity index 63%
rename from modulefiles/gaea.intel/fv3_debug
rename to modulefiles/ufs_gaea.intel_debug
index 74c180a7d5..118356f6b5 100644
--- a/modulefiles/gaea.intel/fv3_debug
+++ b/modulefiles/ufs_gaea.intel_debug
@@ -13,6 +13,8 @@ module rm netcdf
 module load intel/18.0.6.288
 module load cray-mpich/7.7.11
 module load cray-python/3.7.3.2
+# Needed at runtime:
+module load alps
 
 module load cmake/3.17.0
 setenv CMAKE_C_COMPILER cc
@@ -26,25 +28,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.6.288
 module load hpc-cray-mpich/7.7.11
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
-
-# Needed at runtime:
-module load alps
+module load ufs_common_debug
diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/ufs_hera.gnu
similarity index 55%
rename from modulefiles/hera.gnu/fv3
rename to modulefiles/ufs_hera.gnu
index 31255b1b3d..7e36deab54 100644
--- a/modulefiles/hera.gnu/fv3
+++ b/modulefiles/ufs_hera.gnu
@@ -18,25 +18,7 @@ setenv CMAKE_Platform hera.gnu
 module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 module load hpc/1.1.0
 module load hpc-gnu/9.2.0
-module load hpc-mpich/3.3.2  
+module load hpc-mpich/3.3.2
 module load mpich/3.3.2
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/ufs_hera.intel
similarity index 58%
rename from modulefiles/hera.intel/fv3
rename to modulefiles/ufs_hera.intel
index 7b20135794..fc128bbf60 100644
--- a/modulefiles/hera.intel/fv3
+++ b/modulefiles/ufs_hera.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/ufs_hera.intel_debug
similarity index 57%
rename from modulefiles/hera.intel/fv3_debug
rename to modulefiles/ufs_hera.intel_debug
index dd65fa1b95..c0490949c1 100644
--- a/modulefiles/hera.intel/fv3_debug
+++ b/modulefiles/ufs_hera.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/ufs_jet.intel
similarity index 57%
rename from modulefiles/jet.intel/fv3
rename to modulefiles/ufs_jet.intel
index c94db9a4c0..4c0d64bcf2 100644
--- a/modulefiles/jet.intel/fv3
+++ b/modulefiles/ufs_jet.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/jet.intel/fv3_debug b/modulefiles/ufs_jet.intel_debug
similarity index 57%
rename from modulefiles/jet.intel/fv3_debug
rename to modulefiles/ufs_jet.intel_debug
index c94db9a4c0..720705fcdf 100644
--- a/modulefiles/jet.intel/fv3_debug
+++ b/modulefiles/ufs_jet.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/ufs_orion.intel
similarity index 57%
rename from modulefiles/orion.intel/fv3
rename to modulefiles/ufs_orion.intel
index 55f9a7b721..3cb832fcf3 100644
--- a/modulefiles/orion.intel/fv3
+++ b/modulefiles/ufs_orion.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/orion.intel/fv3_debug b/modulefiles/ufs_orion.intel_debug
similarity index 56%
rename from modulefiles/orion.intel/fv3_debug
rename to modulefiles/ufs_orion.intel_debug
index 7f3e02d608..54cf102816 100644
--- a/modulefiles/orion.intel/fv3_debug
+++ b/modulefiles/ufs_orion.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/wcoss2/fv3_debug b/modulefiles/ufs_wcoss2
similarity index 58%
rename from modulefiles/wcoss2/fv3_debug
rename to modulefiles/ufs_wcoss2
index fbb682affc..5e093f573a 100644
--- a/modulefiles/wcoss2/fv3_debug
+++ b/modulefiles/ufs_wcoss2
@@ -21,22 +21,4 @@ module load hpc/1.0.0-beta1
 module load hpc-intel/19.1.1.217
 module load hpc-cray-mpich/8.0.15
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.0
+module load ufs_common
diff --git a/modulefiles/wcoss2/fv3 b/modulefiles/ufs_wcoss2_debug
similarity index 58%
rename from modulefiles/wcoss2/fv3
rename to modulefiles/ufs_wcoss2_debug
index fbb682affc..8b93843466 100644
--- a/modulefiles/wcoss2/fv3
+++ b/modulefiles/ufs_wcoss2_debug
@@ -21,22 +21,4 @@ module load hpc/1.0.0-beta1
 module load hpc-intel/19.1.1.217
 module load hpc-cray-mpich/8.0.15
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.0
+module load ufs_common_debug
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/ufs_wcoss_cray
similarity index 100%
rename from modulefiles/wcoss_cray/fv3
rename to modulefiles/ufs_wcoss_cray
diff --git a/modulefiles/wcoss_cray/fv3_debug b/modulefiles/ufs_wcoss_cray_debug
similarity index 100%
rename from modulefiles/wcoss_cray/fv3_debug
rename to modulefiles/ufs_wcoss_cray_debug
diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/ufs_wcoss_dell_p3
similarity index 60%
rename from modulefiles/wcoss_dell_p3/fv3
rename to modulefiles/ufs_wcoss_dell_p3
index a675477c49..e9059a1b89 100644
--- a/modulefiles/wcoss_dell_p3/fv3
+++ b/modulefiles/ufs_wcoss_dell_p3
@@ -23,22 +23,4 @@ module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/wcoss_dell_p3/fv3_debug b/modulefiles/ufs_wcoss_dell_p3_debug
similarity index 59%
rename from modulefiles/wcoss_dell_p3/fv3_debug
rename to modulefiles/ufs_wcoss_dell_p3_debug
index 89b4a7ca85..d6e9beed68 100644
--- a/modulefiles/wcoss_dell_p3/fv3_debug
+++ b/modulefiles/ufs_wcoss_dell_p3_debug
@@ -23,22 +23,4 @@ module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/tests/compile.sh b/tests/compile.sh
index 96b847e7c7..0c2bed6bc3 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -64,10 +64,10 @@ else
     source /lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/init/init_lmod.sh
   fi
   # Load fv3 module
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  modulefile="fv3"
+  module use $PATHTR/modulefiles
+  modulefile="ufs_${MACHINE_ID}"
   if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then
-    [[ -f $PATHTR/modulefiles/${MACHINE_ID}/fv3_debug ]] && modulefile="fv3_debug"
+    [[ -f $PATHTR/modulefiles/ufs_${MACHINE_ID}_debug ]] && modulefile="ufs_${MACHINE_ID}_debug"
   fi
   module load $modulefile
   module list
@@ -163,9 +163,9 @@ bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
 if [[ "${MAKE_OPT}" == "DEBUG=Y" ]]; then
-  cp ${PATHTR}/modulefiles/${MACHINE_ID}/fv3_debug ${PATHTR}/tests/modules.${BUILD_NAME}
+  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
 else
-  cp ${PATHTR}/modulefiles/${MACHINE_ID}/fv3 ${PATHTR}/tests/modules.${BUILD_NAME}
+  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
 fi
 
 if [ $clean_after = YES ] ; then

From 1dd665553420057dcaad6e0574d072385a158da8 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 25 Mar 2021 12:16:14 +0000
Subject: [PATCH 2/6] Update linux.gnu and macos.gnu modulefiles

---
 modulefiles/{linux.gnu/fv3 => ufs_linux.gnu}               | 0
 modulefiles/{linux.gnu/fv3_debug => ufs_linux.gnu_debug}   | 0
 modulefiles/{macosx.gnu/fv3 => ufs_macosx.gnu}             | 0
 modulefiles/{macosx.gnu/fv3_debug => ufs_macosx.gnu_debug} | 0
 modulefiles/{stampede.intel/fv3 => ufs_stampede.intel}     | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename modulefiles/{linux.gnu/fv3 => ufs_linux.gnu} (100%)
 mode change 100755 => 100644
 rename modulefiles/{linux.gnu/fv3_debug => ufs_linux.gnu_debug} (100%)
 mode change 100755 => 100644
 rename modulefiles/{macosx.gnu/fv3 => ufs_macosx.gnu} (100%)
 mode change 100755 => 100644
 rename modulefiles/{macosx.gnu/fv3_debug => ufs_macosx.gnu_debug} (100%)
 mode change 100755 => 100644
 rename modulefiles/{stampede.intel/fv3 => ufs_stampede.intel} (100%)

diff --git a/modulefiles/linux.gnu/fv3 b/modulefiles/ufs_linux.gnu
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/linux.gnu/fv3
rename to modulefiles/ufs_linux.gnu
diff --git a/modulefiles/linux.gnu/fv3_debug b/modulefiles/ufs_linux.gnu_debug
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/linux.gnu/fv3_debug
rename to modulefiles/ufs_linux.gnu_debug
diff --git a/modulefiles/macosx.gnu/fv3 b/modulefiles/ufs_macosx.gnu
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/macosx.gnu/fv3
rename to modulefiles/ufs_macosx.gnu
diff --git a/modulefiles/macosx.gnu/fv3_debug b/modulefiles/ufs_macosx.gnu_debug
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/macosx.gnu/fv3_debug
rename to modulefiles/ufs_macosx.gnu_debug
diff --git a/modulefiles/stampede.intel/fv3 b/modulefiles/ufs_stampede.intel
similarity index 100%
rename from modulefiles/stampede.intel/fv3
rename to modulefiles/ufs_stampede.intel

From 28862d91dfc27ff6b97791229946c46d16a14fc8 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 25 Mar 2021 12:25:55 +0000
Subject: [PATCH 3/6] Update tests/compile.sh

---
 tests/compile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/compile.sh b/tests/compile.sh
index bab63bd2cf..0c74b7e4ee 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -54,7 +54,7 @@ hostname
 
 set +x
 if [[ $MACHINE_ID == macosx.* ]] || [[ $MACHINE_ID == linux.* ]]; then
-  source $PATHTR/modulefiles/${MACHINE_ID}/fv3
+  source $PATHTR/modulefiles/ufs_${MACHINE_ID}
 else
   if [[ $MACHINE_ID == wcoss2 ]]; then
     source /apps/prod/lmodules/startLmod

From 961971c258a7d634413720b1c69693264173a74e Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 25 Mar 2021 15:40:56 +0000
Subject: [PATCH 4/6] remove loading mpich from ufs_hera.gnu. add odin and s4.
 copy ufs_common to run directory

---
 modulefiles/ufs_hera.gnu                   | 1 -
 modulefiles/{odin/fv3 => ufs_odin}         | 0
 modulefiles/{s4.intel/fv3 => ufs_s4.intel} | 0
 tests/run_test.sh                          | 1 +
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename modulefiles/{odin/fv3 => ufs_odin} (100%)
 rename modulefiles/{s4.intel/fv3 => ufs_s4.intel} (100%)

diff --git a/modulefiles/ufs_hera.gnu b/modulefiles/ufs_hera.gnu
index 7e36deab54..041b5d3d14 100644
--- a/modulefiles/ufs_hera.gnu
+++ b/modulefiles/ufs_hera.gnu
@@ -19,6 +19,5 @@ module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 module load hpc/1.1.0
 module load hpc-gnu/9.2.0
 module load hpc-mpich/3.3.2
-module load mpich/3.3.2
 
 module load ufs_common
diff --git a/modulefiles/odin/fv3 b/modulefiles/ufs_odin
similarity index 100%
rename from modulefiles/odin/fv3
rename to modulefiles/ufs_odin
diff --git a/modulefiles/s4.intel/fv3 b/modulefiles/ufs_s4.intel
similarity index 100%
rename from modulefiles/s4.intel/fv3
rename to modulefiles/ufs_s4.intel
diff --git a/tests/run_test.sh b/tests/run_test.sh
index 5e9cb3ac52..201eb949ee 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -78,6 +78,7 @@ cp ${PATHRT}/fv3_${COMPILE_NR}.exe                 fv3.exe
 
 # modulefile for FV3 prerequisites:
 cp ${PATHRT}/modules.fv3_${COMPILE_NR}             modules.fv3
+cp ${PATHTR}/modulefiles/ufs_common*               .
 
 # Get the shell file that loads the "module" command and purges modules:
 cp ${PATHRT}/../NEMS/src/conf/module-setup.sh.inc  module-setup.sh

From ddb023c224aad4c44b5283cd920d2a67fd4fc29a Mon Sep 17 00:00:00 2001
From: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com>
Date: Thu, 25 Mar 2021 17:18:34 -0400
Subject: [PATCH 5/6] add utest related changes (#11)

* Add utest change for hera
* Add utest change for orion
* Add utest change for dell p3
---
 tests/utest | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/tests/utest b/tests/utest
index 28a2a9b8d5..158773aa3f 100755
--- a/tests/utest
+++ b/tests/utest
@@ -428,16 +428,13 @@ fi
 # utility functions in rt_utils need to be able to see variables in utest
 source rt_utils.sh
 
+source $PATHTR/NEMS/src/conf/module-setup.sh.inc
 # Machine-dependent libraries, modules, variables, etc.
 if [[ $MACHINE_ID = hera.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
-  export PATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin:$PATH
-  export PYTHONPATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/lib/python2.7/site-packages
-  ECFLOW_START=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin/ecflow_start.sh
+  export PATH=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/bin:$PATH
+  export PYTHONPATH=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
+  ECFLOW_START=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
 
   PARTITION=
@@ -453,15 +450,11 @@ if [[ $MACHINE_ID = hera.* ]]; then
 
 elif [[ $MACHINE_ID = orion.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
   module load gcc/8.3.0
 
-  export PATH=/work/noaa/fv3-cam/djovic/ecflow/bin:$PATH
-  export PYTHONPATH=/work/noaa/fv3-cam/djovic/ecflow/lib/python2.7/site-packages
-  ECFLOW_START=/work/noaa/fv3-cam/djovic/ecflow/bin/ecflow_start.sh
+  export PATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin:$PATH
+  export PYTHONPATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
+  ECFLOW_START=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
   QUEUE=batch
   COMPILE_QUEUE=batch
@@ -477,17 +470,12 @@ elif [[ $MACHINE_ID = orion.* ]]; then
 
 elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
   module load lsf/10.1
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
-  module load python/2.7.14
+  module load python/3.6.3
 
   module load ips/18.0.1.163
-  module load ecflow/4.7.1
-  ECFLOW_START=${ECF_ROOT}/intel/bin/ecflow_start.sh
+  module load ecflow/4.17.0
+  ECFLOW_START=${ECF_ROOT}/bin/ecflow_start.sh
   ECF_PORT=$(grep $USER /usrx/local/sys/ecflow/assigned_ports.txt | awk '{print $2}')
 
   DISKNM=/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT

From d9e75dfafa83131a1995077c05f19c898bc03a26 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Wed, 7 Apr 2021 14:10:51 +0000
Subject: [PATCH 6/6] update upp to 10.0.5

---
 modulefiles/ufs_common       | 2 +-
 modulefiles/ufs_common_debug | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
index 3dc1f9fd0e..c4f5707fbc 100644
--- a/modulefiles/ufs_common
+++ b/modulefiles/ufs_common
@@ -18,4 +18,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.4
+module load upp/10.0.5
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
index 54a023a68c..865379e77a 100644
--- a/modulefiles/ufs_common_debug
+++ b/modulefiles/ufs_common_debug
@@ -18,4 +18,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.4
+module load upp/10.0.5