Merge remote-tracking branch 'upstream/develop' into GSI_fed_3denvar

hongli-wang · Sep 19, 2023 · 1b5ff95 · 1b5ff95
2 parents 4b3cc96 + 008c63c
commit 1b5ff95
Show file tree

Hide file tree

Showing 61 changed files with 1,764 additions and 1,276 deletions.
diff --git a/ci/spack.yaml b/ci/spack.yaml
@@ -15,11 +15,11 @@ spack:
   - [email protected]
   - [email protected]
   - [email protected]
-  - [email protected].2
+  - [email protected].4
   - [email protected]
   - [email protected]
   - [email protected]
-  - gsi-ncdiag@1.0.0
+  - gsi-ncdiag@1.1.1
   view: true
   concretizer:
     unify: true
diff --git a/fix b/fix
diff --git a/modulefiles/gsi_cheyenne.gnu.lua b/modulefiles/gsi_cheyenne.gnu.lua
@@ -4,26 +4,24 @@ help([[
 load("cmake/3.22.0")
 load("python/3.7.9")
 load("ncarenv/1.3")
-load("gnu/10.1.0")
-load("mpt/2.22")
+load("gnu/11.2.0")
+load("mpt/2.25")
 load("ncarcompilers/0.5.0")
+unload("intel")
 unload("netcdf")
 
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/modulefiles/stack")
 
 load("hpc/1.2.0")
-load("hpc-gnu/10.1.0")
-load("hpc-mpt/2.22")
-
--- Preload w3nco to work around nemsio "find_dependency(w3nco)" hpc-stack bug
-load("w3nco/2.4.1")
+load("hpc-gnu/11.2.0")
+load("hpc-mpt/2.25")
 
 load("gsi_common")
 
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
-load(pathJoin("prod_util", prod_util_ver))
+load(pathJoin("prod_util", os.getenv("prod_util_ver") or "1.2.2"))
+load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.23"))
 
-pushenv("MKLROOT", "/glade/u/apps/opt/intel/2022.1/mkl/latest")
+pushenv("GSI_BINARY_SOURCE_DIR", "/glade/work/epicufsrt/contrib/GSI_fix/fix")
 
 pushenv("CC",  "mpicc")
 pushenv("FC",  "mpif90")

diff --git a/modulefiles/gsi_cheyenne.intel.lua b/modulefiles/gsi_cheyenne.intel.lua
@@ -8,7 +8,7 @@ load("intel/2022.1")
 load("mpt/2.25")
 load("ncarcompilers/0.5.0")
 
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/modulefiles/stack")
 
 load("hpc/1.2.0")
 load("hpc-intel/2022.1")
@@ -17,8 +17,8 @@ load("mkl/2022.1")
 
 load("gsi_common")
 
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
-load(pathJoin("prod_util", prod_util_ver))
+load(pathJoin("prod_util", os.getenv("prod_util_ver") or "1.2.2"))
+pushenv("GSI_BINARY_SOURCE_DIR", "/glade/work/epicufsrt/contrib/GSI_data/fix/20230911")
 
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")

diff --git a/modulefiles/gsi_common.lua b/modulefiles/gsi_common.lua
@@ -6,16 +6,16 @@ local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
 
 local bufr_ver=os.getenv("bufr_ver") or "11.7.0"
 local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
-local w3emc_ver=os.getenv("w3emc_ver") or "2.9.1"
+local w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 local sp_ver=os.getenv("sp_ver") or "2.3.3"
 local ip_ver=os.getenv("ip_ver") or "3.3.3"
 local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
-local nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
+local nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
 local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
 local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
 local crtm_ver=os.getenv("crtm_ver") or "2.4.0"
-local ncdiag_ver=os.getenv("ncdiag_ver") or "1.0.0"
+local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1"
 
 load(pathJoin("netcdf", netcdf_ver))
 
@@ -31,4 +31,3 @@ load(pathJoin("wrf_io", wrf_io_ver))
 load(pathJoin("ncio", ncio_ver))
 load(pathJoin("crtm", crtm_ver))
 load(pathJoin("ncdiag",ncdiag_ver))
-
diff --git a/modulefiles/gsi_gaea b/modulefiles/gsi_gaea
diff --git a/modulefiles/gsi_gaea.lua b/modulefiles/gsi_gaea.lua
@@ -0,0 +1,34 @@
+help([[
+]])
+
+load("cmake/3.20.1")
+
+prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2/modulefiles/stack")
+load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
+
+load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2022.0.2"))
+load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "7.7.20"))
+load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2022.0.2"))
+load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.20"))
+
+load("gsi_common")
+
+local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+load(pathJoin("prod_util", prod_util_ver))
+
+-- Needed at runtime:
+load("alps")
+
+local MKLROOT="/opt/intel/oneapi/mkl/2022.0.2/"
+prepend_path("LD_LIBRARY_PATH",pathJoin(MKLROOT,"lib/intel64"))
+pushenv("MKLROOT", MKLROOT)
+
+pushenv("GSI_BINARY_SOURCE_DIR", "/lustre/f2/dev/role.epic/contrib/GSI_data/fix/20230911")
+
+setenv("CC","cc")
+setenv("FC","ftn")
+setenv("CXX","CC")
+pushenv("CRAYPE_LINK_TYPE","dynamic")
+
+whatis("Description: GSI environment on Gaea with Intel Compilers")
+
diff --git a/modulefiles/gsi_hera.gnu.lua b/modulefiles/gsi_hera.gnu.lua
@@ -1,25 +1,27 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/gnu-9.2/modulefiles/stack")
 
-local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "9.2.0"
+local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+local gnu_ver=os.getenv("gnu_ver") or "9.2.0"
+local hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "9.2"
 local hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "3.3.2"
 local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+local openblas_ver=os.getenv("openblas_ver") or "0.3.23"
 
 load(pathJoin("hpc", hpc_ver))
+load(pathJoin("gnu", gnu_ver))
 load(pathJoin("hpc-gnu", hpc_gnu_ver))
 load(pathJoin("hpc-mpich", hpc_mpich_ver))
 load(pathJoin("cmake", cmake_ver))
 
 load("gsi_common")
 
 load(pathJoin("prod_util", prod_util_ver))
+load(pathJoin("openblas", openblas_ver))
 
-pushenv("MKLROOT", "/apps/oneapi/mkl/2022.0.2")
-
-pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20230601")
+pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20230911")
 
 whatis("Description: GSI environment on Hera with GNU Compilers")
diff --git a/modulefiles/gsi_hera.intel.lua b/modulefiles/gsi_hera.intel.lua
@@ -1,31 +1,30 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
+load(pathJoin("miniconda3", miniconda3_ver))
 
-local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
-local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.0.4"
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
+
+local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
+local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
 local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
-local anaconda_ver=os.getenv("anaconda_ver") or "2.3.0"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
 load(pathJoin("hpc", hpc_ver))
 load(pathJoin("hpc-intel", hpc_intel_ver))
 load(pathJoin("hpc-impi", hpc_impi_ver))
 load(pathJoin("cmake", cmake_ver))
 
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
-load(pathJoin("anaconda", anaconda_ver))
-
 load("gsi_common")
 
 load(pathJoin("prod_util", prod_util_ver))
 
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20230601")
+pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20230911")
 
 whatis("Description: GSI environment on Hera with Intel Compilers")
diff --git a/modulefiles/gsi_jet.lua b/modulefiles/gsi_jet.lua
@@ -1,24 +1,23 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-18.0.5.274/modulefiles/stack")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
+load(pathJoin("miniconda3", miniconda3_ver))
+
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
 
 local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
-local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4.274"
+local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
+local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
 local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
-local anaconda_ver=os.getenv("anaconda_ver") or "5.3.1"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
 load(pathJoin("hpc", hpc_ver))
 load(pathJoin("hpc-intel", hpc_intel_ver))
 load(pathJoin("hpc-impi", hpc_impi_ver))
 load(pathJoin("cmake", cmake_ver))
 
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
-load(pathJoin("anaconda", anaconda_ver))
-
 load("gsi_common")
 
 load(pathJoin("prod_util", prod_util_ver))
@@ -27,6 +26,6 @@ pushenv("CFLAGS", "-axSSE4.2,AVX,CORE-AVX2")
 pushenv("FFLAGS", "-axSSE4.2,AVX,CORE-AVX2")
 
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20230601")
+pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20230911")
 
 whatis("Description: GSI environment on Jet with Intel Compilers")
diff --git a/modulefiles/gsi_orion.lua b/modulefiles/gsi_orion.lua
@@ -1,20 +1,22 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/miniconda3/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
+load(pathJoin("miniconda3", miniconda3_ver))
 
-local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2018.4"
-local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4"
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2/modulefiles/stack")
+
+local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
+local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
 local cmake_ver=os.getenv("cmake_ver") or "3.22.1"
-local python_ver=os.getenv("python_ver") or "3.7.5"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
 load(pathJoin("hpc", hpc_ver))
 load(pathJoin("hpc-intel", hpc_intel_ver))
 load(pathJoin("hpc-impi", hpc_impi_ver))
 load(pathJoin("cmake", cmake_ver))
-load(pathJoin("python", python_ver))
 
 load("gsi_common")
 
@@ -23,6 +25,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20230601")
+pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20230911")
 
 whatis("Description: GSI environment on Orion with Intel Compilers")
diff --git a/modulefiles/gsi_s4.lua b/modulefiles/gsi_s4.lua
@@ -1,9 +1,9 @@
 help([[
 ]])
 
-local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.4"
-local hpc_impi_ver=os.getenv("hpc_impi_ver") or "18.0.4"
+local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1"
+local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1"
 local miniconda_ver=os.getenv("miniconda_ver") or "3.8-s4"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
@@ -23,6 +23,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-march=ivybridge")
 pushenv("FFLAGS", "-march=ivybridge")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/data/prod/glopara/fix/gsi/20230601")
+pushenv("GSI_BINARY_SOURCE_DIR", "/data/prod/glopara/fix/gsi/20230911")
 
 whatis("Description: GSI environment on S4 with Intel Compilers")
diff --git a/modulefiles/gsi_wcoss2.lua b/modulefiles/gsi_wcoss2.lua
@@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver))
 
 load("gsi_common")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20230601")
+pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20230911")
 
 whatis("Description: GSI environment on WCOSS2")
diff --git a/regression/regression_driver.sh b/regression/regression_driver.sh
@@ -35,9 +35,11 @@ for jn in `seq ${RSTART} ${REND}`; do
    if [ $jn -le 2 ]; then
       export scripts=${scripts_updat:-$scripts}
       export fixgsi=${fixgsi_updat:-$fixgsi}
+      export modulefiles=${modulefiles_updat:-$modulefiles}
    else
       export scripts=${scripts_contrl:-$scripts}
       export fixgsi=${fixgsi_contrl:-$fixgsi}
+      export modulefiles=${modulefiles_contrl:-$modulefiles}
    fi
    rm -f ${job[$jn]}.out