Modify hpc stack to point to hpc-stack-gfsv16 since hpc-stack is outd… (

#562)
NOAA-EMC · May 16, 2023 · aef6f02 · aef6f02
1 parent a25590c
commit aef6f02
Show file tree

Hide file tree

Showing 45 changed files with 3,011 additions and 11,087 deletions.
diff --git a/modulefiles/gsi_common.lua b/modulefiles/gsi_common.lua
@@ -6,7 +6,8 @@ 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 w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
 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"
@@ -21,6 +22,7 @@ load(pathJoin("netcdf", netcdf_ver))
 load(pathJoin("bufr", bufr_ver))
 load(pathJoin("bacio", bacio_ver))
 load(pathJoin("w3emc", w3emc_ver))
+load(pathJoin("w3nco", w3nco_ver))
 load(pathJoin("sp", sp_ver))
 load(pathJoin("ip", ip_ver))
 load(pathJoin("sigio", sigio_ver))

diff --git a/modulefiles/gsi_hera.intel.lua b/modulefiles/gsi_hera.intel.lua
@@ -1,9 +1,9 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack-gfsv16/modulefiles/stack")
 
-local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
+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 impi_ver=os.getenv("hpc_impi_ver") or "2018.0.4"
 local cmake_ver=os.getenv("cmake_ver") or "3.20.1"

diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt
@@ -38,19 +38,14 @@ endif()
 
 # GSI regression test names
 list(APPEND GSI_REG_TEST_NAMES
-  global_T62 global_T62_ozonly global_4dvar_T62 global_4denvar_T126
-  global_fv3_4denvar_T126 global_fv3_4denvar_C192 global_lanczos_T62
-  arw_netcdf arw_binary nmm_binary nmm_netcdf
-  nmmb_nems_4denvar
-  hwrf_nmm_d2 hwrf_nmm_d3
-  rtma
-  netcdf_fv3_regional
-  global_C96_fv3aero global_C96_fv3aerorad
+  global_3dvar global_4dvar global_4denvar
+  hwrf_nmm_d2 hwrf_nmm_d3 rtma
+  rrfs_3denvar_glbens netcdf_fv3_regional
 )
 
 # EnKF regression test names
 list(APPEND ENKF_REG_TEST_NAMES
-  global_enkf_T62
+  global_enkf
 )
 
 # Add GSI regression tests to list of tests

diff --git a/regression/arw_binary.sh b/regression/arw_binary.sh