From 8819293109b545e28ff67ca76f8f91bfff443471 Mon Sep 17 00:00:00 2001
From: "Kate.Friedman" <Kate.Friedman@noaa.gov>
Date: Mon, 6 Feb 2023 20:36:35 +0000
Subject: [PATCH 1/4] Cleanup and order check in modulefiles

- Adjust the order of module loads in module_base modulefiles
to conform with desired order: compilers, mpi, 3rd party,
hdf5, netcdf, nceplibs.
- Remove modules that aren't needed for runtime.
- Checked dependencies of remaining modules to make sure
prereqs are loaded beforehand as needed.

Refs #479
---
 modulefiles/module_base.hera.lua   | 31 ++++++++----------------------
 modulefiles/module_base.jet.lua    | 18 ++++++-----------
 modulefiles/module_base.orion.lua  | 31 +++++++-----------------------
 modulefiles/module_base.s4.lua     | 30 +++++++++--------------------
 modulefiles/module_base.wcoss2.lua |  7 +++----
 5 files changed, 33 insertions(+), 84 deletions(-)

diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
index 5126fdfd464..a4452b0eddb 100644
--- a/modulefiles/module_base.hera.lua
+++ b/modulefiles/module_base.hera.lua
@@ -8,46 +8,31 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "18.0.5.274"))
 load(pathJoin("hpc-impi", "2018.0.4"))
 
-load(pathJoin("cmake", "3.20.1"))
+load(pathJoin("esmf", "8.3.0b09"))
 
 load(pathJoin("hpss", "hpss"))
 load(pathJoin("nco", "4.9.1"))
 load(pathJoin("gempak", "7.4.2"))
 load(pathJoin("ncl", "6.6.2"))
-
-load(pathJoin("prod_util", "1.2.2"))
-load(pathJoin("grib_util", "1.2.2"))
-
-load(pathJoin("crtm", "2.3.0"))
-setenv("CRTM_FIX","/scratch2/NCEPDEV/nwprod/NCEPLIBS/fix/crtm_v2.3.0")
-
 load(pathJoin("jasper", "2.0.25"))
-load(pathJoin("zlib", "1.2.11"))
 load(pathJoin("png", "1.6.35"))
+load(pathJoin("cdo", "1.9.5"))
+load(pathJoin("R", "3.5.0"))
 
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
-load(pathJoin("pio", "2.5.7"))
-load(pathJoin("esmf", "8.3.0b09"))
-load(pathJoin("fms", "2021.03"))
 
-load(pathJoin("bacio", "2.4.1"))
-load(pathJoin("g2", "3.4.2"))
+load(pathJoin("prod_util", "1.2.2"))
+load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
-load(pathJoin("ip", "3.3.3"))
-load(pathJoin("nemsio", "2.5.2"))
-load(pathJoin("sp", "2.3.3"))
-load(pathJoin("w3emc", "2.7.3"))
-load(pathJoin("w3nco", "2.4.1"))
 load(pathJoin("ncdiag", "1.0.0"))
 
+load(pathJoin("crtm", "2.3.0"))
+setenv("CRTM_FIX","/scratch2/NCEPDEV/nwprod/NCEPLIBS/fix/crtm_v2.3.0")
+
 load(pathJoin("wgrib2", "2.0.8"))
 setenv("WGRIB2","wgrib2")
 
-load(pathJoin("cdo", "1.9.5"))
-
-load(pathJoin("R", "3.5.0"))
-
 prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v1.0.1/modulefiles"))
 load(pathJoin("prepobs", "1.0.1"))
 
diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
index 2a972dbd1aa..65eac8a9fba 100644
--- a/modulefiles/module_base.jet.lua
+++ b/modulefiles/module_base.jet.lua
@@ -8,26 +8,20 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "18.0.5.274"))
 load(pathJoin("hpc-impi", "2018.4.274"))
 
+load(pathJoin("esmf", "8_2_0_beta_snapshot_14"))
+
 load(hpss)
 load(pathJoin("nco", "4.9.1"))
 load(pathJoin("gempak", "7.4.2"))
-
-load(pathJoin("prod_util", "1.2.2"))
-load(pathJoin("grib_util", "1.2.2"))
-
-load(pathJoin("crtm", "2.3.0"))
+load(pathJoin("cdo", "1.9.5"))
 
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
-load(pathJoin("esmf", "8_2_0_beta_snapshot_14"))
-load(pathJoin("fms", "2021.03"))
 
+load(pathJoin("prod_util", "1.2.2"))
+load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
-
+load(pathJoin("crtm", "2.3.0"))
 load(pathJoin("wgrib2", "2.0.8"))
 
-load(pathJoin("cdo", "1.9.5"))
-
-load(rocoto)
-
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index e838355555c..8de1c97f3e4 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -8,47 +8,30 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "2018.4"))
 load(pathJoin("hpc-impi", "2018.4"))
 
-load(pathJoin("cmake", "3.22.1"))
+load(pathJoin("esmf", "8.3.0b09"))
 
 load(pathJoin("nco", "4.8.1"))
 load(pathJoin("gempak", "7.5.1"))
 load(pathJoin("ncl", "6.6.2"))
-
-load(pathJoin("prod_util", "1.2.2"))
-load(pathJoin("grib_util", "1.2.2"))
-
-load(pathJoin("crtm", "2.3.0"))
-setenv("CRTM_FIX","/apps/contrib/NCEPLIBS/orion/fix/crtm_v2.3.0")
-
 load(pathJoin("jasper", "2.0.25"))
 load(pathJoin("zlib", "1.2.11"))
 load(pathJoin("png", "1.6.35"))
+load(pathJoin("cdo", "1.9.5"))
 
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
-load(pathJoin("pio", "2.5.7"))
-load(pathJoin("esmf", "8.3.0b09"))
-load(pathJoin("fms", "2021.03"))
 
-load(pathJoin("bacio", "2.4.1"))
-load(pathJoin("g2", "3.4.2"))
+load(pathJoin("prod_util", "1.2.2"))
+load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
-load(pathJoin("ip", "3.3.3"))
-load(pathJoin("nemsio", "2.5.2"))
-load(pathJoin("sp", "2.3.3"))
-load(pathJoin("w3emc", "2.7.3"))
-load(pathJoin("w3nco", "2.4.1"))
 load(pathJoin("ncdiag", "1.0.0"))
 
+load(pathJoin("crtm", "2.3.0"))
+setenv("CRTM_FIX","/apps/contrib/NCEPLIBS/orion/fix/crtm_v2.3.0")
+
 load(pathJoin("wgrib2", "2.0.8"))
 setenv("WGRIB2","wgrib2")
 
-load("contrib")
-load(pathJoin("rocoto", "1.3.3"))
-load(pathJoin("slurm", "19.05.3-2"))
-
-load(pathJoin("cdo", "1.9.5"))
-
 prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v1.0.1/modulefiles"))
 load(pathJoin("prepobs", "1.0.1"))
 
diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
index 93d95de6b98..9b183c3ed02 100644
--- a/modulefiles/module_base.s4.lua
+++ b/modulefiles/module_base.s4.lua
@@ -9,42 +9,30 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "18.0.4"))
 load(pathJoin("hpc-impi", "18.0.4"))
 
+load(pathJoin("esmf", "8.2.1b04"))
+
+load(pathJoin("miniconda", "3.8-s4"))
 load(pathJoin("nco", "4.9.3"))
 load(pathJoin("ncl", "6.4.0-precompiled"))
-
-load(pathJoin("prod_util", "1.2.2"))
-load(pathJoin("grib_util", "1.2.2"))
-
-load(pathJoin("crtm", "2.3.0"))
-setenv("CRTM_FIX","/data/prod/hpc-stack/fix/crtm/2.3.0")
-
+load(pathJoin("cdo", "1.9.8"))
 load(pathJoin("jasper", "2.0.25"))
 load(pathJoin("zlib", "1.2.11"))
 load(pathJoin("png", "1.6.35"))
 
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
-load(pathJoin("pio", "2.5.2"))
-load(pathJoin("esmf", "8.2.1b04"))
-load(pathJoin("fms", "2021.03"))
 
-load(pathJoin("bacio", "2.4.1"))
-load(pathJoin("g2", "3.4.2"))
+load(pathJoin("prod_util", "1.2.2"))
+load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
-load(pathJoin("ip", "3.3.3"))
-load(pathJoin("nemsio", "2.5.2"))
-load(pathJoin("sp", "2.3.3"))
-load(pathJoin("w3emc", "2.7.3"))
-load(pathJoin("w3nco", "2.4.1"))
 load(pathJoin("ncdiag", "1.0.0"))
 
+load(pathJoin("crtm", "2.3.0"))
+setenv("CRTM_FIX","/data/prod/hpc-stack/fix/crtm/2.3.0")
+
 load(pathJoin("wgrib2", "2.0.8"))
 setenv("WGRIB2","wgrib2")
 
-load(pathJoin("miniconda", "3.8-s4"))
-
-load(pathJoin("cdo", "1.9.8"))
-
 prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/v1.0.1/modulefiles"))
 load(pathJoin("prepobs", "1.0.1"))
 
diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua
index 37ace99ffc3..67ea8755692 100644
--- a/modulefiles/module_base.wcoss2.lua
+++ b/modulefiles/module_base.wcoss2.lua
@@ -12,18 +12,17 @@ load(pathJoin("cfp", "2.0.4"))
 setenv("USE_CFP","YES")
 
 load(pathJoin("python", "3.8.6"))
+load(pathJoin("nco", "4.7.9"))
 load(pathJoin("gempak", "7.14.1"))
 load(pathJoin("perl", "5.32.0"))
 load(pathJoin("libjpeg", "9c"))
-
+load(pathJoin("udunits", "2.2.28"))
+load(pathJoin("gsl", "2.7"))
 load(pathJoin("cdo", "1.9.8"))
 
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
 
-load(pathJoin("udunits", "2.2.28"))
-load(pathJoin("gsl", "2.7"))
-load(pathJoin("nco", "4.7.9"))
 load(pathJoin("prod_util", "2.0.9"))
 load(pathJoin("grib_util", "1.2.3"))
 load(pathJoin("bufr_dump", "1.0.0"))

From 39d5b35a357fcd3325806e89d8ed5a42629abbe8 Mon Sep 17 00:00:00 2001
From: "Kate.Friedman" <Kate.Friedman@noaa.gov>
Date: Fri, 10 Feb 2023 14:20:46 +0000
Subject: [PATCH 2/4] Move nco module back after netcdf module load

- Move the nco module load back down after the netcdf
module load since the netcdf module is a prereq for the
nco module.
- The prereq is defined on WCOSS2 and not on R&Ds. Changing
on all plaforms for consistency.

Refs #479
---
 modulefiles/module_base.hera.lua   | 2 +-
 modulefiles/module_base.jet.lua    | 2 +-
 modulefiles/module_base.orion.lua  | 2 +-
 modulefiles/module_base.s4.lua     | 2 +-
 modulefiles/module_base.wcoss2.lua | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
index a4452b0eddb..6dcd9b2ee7f 100644
--- a/modulefiles/module_base.hera.lua
+++ b/modulefiles/module_base.hera.lua
@@ -11,7 +11,6 @@ load(pathJoin("hpc-impi", "2018.0.4"))
 load(pathJoin("esmf", "8.3.0b09"))
 
 load(pathJoin("hpss", "hpss"))
-load(pathJoin("nco", "4.9.1"))
 load(pathJoin("gempak", "7.4.2"))
 load(pathJoin("ncl", "6.6.2"))
 load(pathJoin("jasper", "2.0.25"))
@@ -22,6 +21,7 @@ load(pathJoin("R", "3.5.0"))
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
 
+load(pathJoin("nco", "4.9.1"))
 load(pathJoin("prod_util", "1.2.2"))
 load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
index 65eac8a9fba..c409eef02e1 100644
--- a/modulefiles/module_base.jet.lua
+++ b/modulefiles/module_base.jet.lua
@@ -11,13 +11,13 @@ load(pathJoin("hpc-impi", "2018.4.274"))
 load(pathJoin("esmf", "8_2_0_beta_snapshot_14"))
 
 load(hpss)
-load(pathJoin("nco", "4.9.1"))
 load(pathJoin("gempak", "7.4.2"))
 load(pathJoin("cdo", "1.9.5"))
 
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
 
+load(pathJoin("nco", "4.9.1"))
 load(pathJoin("prod_util", "1.2.2"))
 load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index 8de1c97f3e4..56875b7408b 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -10,7 +10,6 @@ load(pathJoin("hpc-impi", "2018.4"))
 
 load(pathJoin("esmf", "8.3.0b09"))
 
-load(pathJoin("nco", "4.8.1"))
 load(pathJoin("gempak", "7.5.1"))
 load(pathJoin("ncl", "6.6.2"))
 load(pathJoin("jasper", "2.0.25"))
@@ -21,6 +20,7 @@ load(pathJoin("cdo", "1.9.5"))
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
 
+load(pathJoin("nco", "4.8.1"))
 load(pathJoin("prod_util", "1.2.2"))
 load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
index 9b183c3ed02..275bcd15a89 100644
--- a/modulefiles/module_base.s4.lua
+++ b/modulefiles/module_base.s4.lua
@@ -12,7 +12,6 @@ load(pathJoin("hpc-impi", "18.0.4"))
 load(pathJoin("esmf", "8.2.1b04"))
 
 load(pathJoin("miniconda", "3.8-s4"))
-load(pathJoin("nco", "4.9.3"))
 load(pathJoin("ncl", "6.4.0-precompiled"))
 load(pathJoin("cdo", "1.9.8"))
 load(pathJoin("jasper", "2.0.25"))
@@ -22,6 +21,7 @@ load(pathJoin("png", "1.6.35"))
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
 
+load(pathJoin("nco", "4.9.3"))
 load(pathJoin("prod_util", "1.2.2"))
 load(pathJoin("grib_util", "1.2.2"))
 load(pathJoin("g2tmpl", "1.10.0"))
diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua
index 67ea8755692..0d31dc7429d 100644
--- a/modulefiles/module_base.wcoss2.lua
+++ b/modulefiles/module_base.wcoss2.lua
@@ -12,7 +12,6 @@ load(pathJoin("cfp", "2.0.4"))
 setenv("USE_CFP","YES")
 
 load(pathJoin("python", "3.8.6"))
-load(pathJoin("nco", "4.7.9"))
 load(pathJoin("gempak", "7.14.1"))
 load(pathJoin("perl", "5.32.0"))
 load(pathJoin("libjpeg", "9c"))
@@ -23,6 +22,7 @@ load(pathJoin("cdo", "1.9.8"))
 load(pathJoin("hdf5", "1.10.6"))
 load(pathJoin("netcdf", "4.7.4"))
 
+load(pathJoin("nco", "4.7.9"))
 load(pathJoin("prod_util", "2.0.9"))
 load(pathJoin("grib_util", "1.2.3"))
 load(pathJoin("bufr_dump", "1.0.0"))

From db77600f96d2520ed4871b93b212312e72e0a562 Mon Sep 17 00:00:00 2001
From: "Kate.Friedman" <Kate.Friedman@noaa.gov>
Date: Fri, 10 Feb 2023 19:33:07 +0000
Subject: [PATCH 3/4] Correct bug with hpss module in module_base.jet.lua

Refs #479
---
 modulefiles/module_base.jet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
index c409eef02e1..0d05e7ba717 100644
--- a/modulefiles/module_base.jet.lua
+++ b/modulefiles/module_base.jet.lua
@@ -10,7 +10,7 @@ load(pathJoin("hpc-impi", "2018.4.274"))
 
 load(pathJoin("esmf", "8_2_0_beta_snapshot_14"))
 
-load(hpss)
+load("hpss")
 load(pathJoin("gempak", "7.4.2"))
 load(pathJoin("cdo", "1.9.5"))
 

From e9d307644677255857d9c6044ff557fa9ba033f6 Mon Sep 17 00:00:00 2001
From: "kate.friedman" <kate.friedman@noaa.gov>
Date: Tue, 14 Feb 2023 15:40:28 +0000
Subject: [PATCH 4/4] Remove esmf module load from module_base files

- The esmf module is not needed at runtime, removing.

Refs #479
---
 modulefiles/module_base.hera.lua   | 2 --
 modulefiles/module_base.jet.lua    | 2 --
 modulefiles/module_base.orion.lua  | 2 --
 modulefiles/module_base.s4.lua     | 2 --
 modulefiles/module_base.wcoss2.lua | 1 -
 5 files changed, 9 deletions(-)

diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
index 6dcd9b2ee7f..5b412049c14 100644
--- a/modulefiles/module_base.hera.lua
+++ b/modulefiles/module_base.hera.lua
@@ -8,8 +8,6 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "18.0.5.274"))
 load(pathJoin("hpc-impi", "2018.0.4"))
 
-load(pathJoin("esmf", "8.3.0b09"))
-
 load(pathJoin("hpss", "hpss"))
 load(pathJoin("gempak", "7.4.2"))
 load(pathJoin("ncl", "6.6.2"))
diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
index 0d05e7ba717..8971b0c894b 100644
--- a/modulefiles/module_base.jet.lua
+++ b/modulefiles/module_base.jet.lua
@@ -8,8 +8,6 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "18.0.5.274"))
 load(pathJoin("hpc-impi", "2018.4.274"))
 
-load(pathJoin("esmf", "8_2_0_beta_snapshot_14"))
-
 load("hpss")
 load(pathJoin("gempak", "7.4.2"))
 load(pathJoin("cdo", "1.9.5"))
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index 56875b7408b..f62f3d78048 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -8,8 +8,6 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "2018.4"))
 load(pathJoin("hpc-impi", "2018.4"))
 
-load(pathJoin("esmf", "8.3.0b09"))
-
 load(pathJoin("gempak", "7.5.1"))
 load(pathJoin("ncl", "6.6.2"))
 load(pathJoin("jasper", "2.0.25"))
diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
index 275bcd15a89..689ae54ea9e 100644
--- a/modulefiles/module_base.s4.lua
+++ b/modulefiles/module_base.s4.lua
@@ -9,8 +9,6 @@ load(pathJoin("hpc", "1.1.0"))
 load(pathJoin("hpc-intel", "18.0.4"))
 load(pathJoin("hpc-impi", "18.0.4"))
 
-load(pathJoin("esmf", "8.2.1b04"))
-
 load(pathJoin("miniconda", "3.8-s4"))
 load(pathJoin("ncl", "6.4.0-precompiled"))
 load(pathJoin("cdo", "1.9.8"))
diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua
index 0d31dc7429d..a89e1dc3687 100644
--- a/modulefiles/module_base.wcoss2.lua
+++ b/modulefiles/module_base.wcoss2.lua
@@ -7,7 +7,6 @@ load(pathJoin("craype", "2.7.10"))
 load(pathJoin("intel", "19.1.3.304"))
 load(pathJoin("cray-mpich", "8.1.9"))
 load(pathJoin("cray-pals", "1.0.17"))
-load(pathJoin("esmf", "8.0.1"))
 load(pathJoin("cfp", "2.0.4"))
 setenv("USE_CFP","YES")