Fix S4 modules. NOAA-EMC#1868

DavidHuber-NOAA · Nov 20, 2023 · 856f7cc · 856f7cc
1 parent 123c8ff
commit 856f7cc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
@@ -38,9 +38,9 @@ load(pathJoin("met", os.getenv("met_ver")))
 load(pathJoin("metplus", os.getenv("metplus_ver")))
 
 setenv("WGRIB2","wgrib2")
-setenv("UTILROOT",os.getenv("prod_util_ROOT"))
+setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. os.getenv("prepobs_run_ver"), "modulefiles"))
+--prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
 load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
 

diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
@@ -35,13 +35,13 @@ load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
 load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
 
 setenv("WGRIB2","wgrib2")
-setenv("UTILROOT",os.getenv("prod_util_ROOT"))
+setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. os.getenv("prepobs_run_ver"), "modulefiles"))
+--prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
 load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
 
-prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. os.getenv("fit2obs_ver"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
@@ -33,12 +33,13 @@ load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
 load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
 
 setenv("WGRIB2","wgrib2")
+setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v" .. os.getenv("prepobs_run_ver"), "modulefiles"))
+--prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
 load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
 
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. os.getenv("fit2obs_ver"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
@@ -11,34 +11,34 @@ load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver")))
 load(pathJoin("python", os.getenv("python_ver")))
 
 load(pathJoin("ncl", os.getenv("ncl_ver")))
-load(pathJoin("cdo", os.getenv("cdo_ver")))
 load(pathJoin("jasper", os.getenv("jasper_ver")))
 load(pathJoin("libpng", os.getenv("libpng_ver")))
+load(pathJoin("cdo", os.getenv("cdo_ver")))
 
 load(pathJoin("hdf5", os.getenv("hdf5_ver")))
 load(pathJoin("netcdf-c", os.getenv("netcdf_c_ver")))
 load(pathJoin("netcdf-fortran", os.getenv("netcdf_fortran_ver")))
 
 load(pathJoin("nco", os.getenv("nco_ver")))
 load(pathJoin("prod_util", os.getenv("prod_util_ver")))
-load(pathJoin("grib_util", os.getenv("grib_util_ver")))
+load(pathJoin("grib-util", os.getenv("grib_util_ver")))
 load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver")))
 load(pathJoin("gsi-ncdiag", os.getenv("gsi_ncdiag_ver")))
 load(pathJoin("crtm", os.getenv("crtm_ver")))
-load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
 load(pathJoin("bufr", os.getenv("bufr_ver")))
+load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
 load(pathJoin("py-netcdf4", os.getenv("py_netcdf4_ver")))
 load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
 load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
 
 setenv("WGRIB2","wgrib2")
-setenv("UTILROOT",os.getenv("prod_util_ROOT"))
+setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/v" .. os.getenv("prepobs_run_ver"), "modulefiles"))
-prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/feature-GFSv17_com_reorg/modulefiles"))
+--prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
 load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))
 
-prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/Fit2Obs/v" .. os.getenv("fit2obs_ver"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", os.getenv("fit2obs_ver")))
 
 whatis("Description: GFS run environment")
diff --git a/versions/build.s4.ver b/versions/build.s4.ver
@@ -1,2 +1,2 @@
 export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
+export stack_impi_ver=2021.5.0
diff --git a/versions/run.s4.ver b/versions/run.s4.ver
@@ -1,4 +1,4 @@
 export stack_intel_ver=2021.5.0
-export stack_impi_ver=2021.5.1
+export stack_impi_ver=2021.5.0
 
-export ncl_ver=6.6.2
+export ncl_ver=6.4.0-precompiled