Upgrade modules to spack-stack/1.5.1 on non-production machines.

.github/workflows/intel.yml

@@ -9,7 +9,7 @@ defaults:
 
 # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran
 env:
-  cache_key: intel5  # The number (#) following the cache_key "intel" is to flush Action cache.
+  cache_key: intel6  # The number (#) following the cache_key "intel" is to flush Action cache.
   CC: icc
   FC: ifort
   CXX: icpc

ci/spack.yaml

@@ -7,20 +7,20 @@ spack:
     all:
       compiler: [intel, gcc]
   specs:
-  - netcdf-c@4.7.4
-  - netcdf-fortran@4.5.3
+  - netcdf-c@4.9.2
+  - netcdf-fortran@4.6.0
   - bufr@11.7.0
   - bacio@2.4.1
-  - w3emc@2.9.2
+  - w3emc@2.10.0
   - sp@2.3.3
-  - ip@3.3.3
+  - ip@4.3.0
   - sigio@2.3.2
   - sfcio@1.4.1
-  - nemsio@2.5.2
+  - nemsio@2.5.4
   - wrf-io@1.2.0
   - crtm@2.3.0
   - ncio@1.1.2
-  - gsi-ncdiag@1.0.0
+  - gsi-ncdiag@1.1.2
   view: true
   concretizer:
     unify: true

modulefiles/gsiutils_common.lua

@@ -2,22 +2,24 @@ help([[
 Load common modules to build GSI utilities on all machines
 ]])
 
-local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+local netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
+local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
 
 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.10.0"
 local sp_ver=os.getenv("sp_ver") or "2.3.3"
-local ip_ver=os.getenv("ip_ver") or "3.3.3"
+local ip_ver=os.getenv("ip_ver") or "4.3.0"
 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.3.0"
-local ncdiag_ver=os.getenv("ncdiag_ver") or "1.0.0"
+local crtm_ver=os.getenv("crtm_ver") or "2.4.0"
+local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2"
 
-load(pathJoin("netcdf", netcdf_ver))
+load(pathJoin("netcdf-c", netcdf_c_ver))
+load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
 load(pathJoin("bufr", bufr_ver))
 load(pathJoin("bacio", bacio_ver))
@@ -27,8 +29,7 @@ load(pathJoin("ip", ip_ver))
 load(pathJoin("sigio", sigio_ver))
 load(pathJoin("sfcio", sfcio_ver))
 load(pathJoin("nemsio", nemsio_ver))
-load(pathJoin("wrf_io", wrf_io_ver))
+load(pathJoin("wrf-io", wrf_io_ver))
 load(pathJoin("ncio", ncio_ver))
 load(pathJoin("crtm", crtm_ver))
-load(pathJoin("ncdiag", ncdiag_ver))
-
+load(pathJoin("gsi-ncdiag", ncdiag_ver))

modulefiles/gsiutils_hera.gnu.lua

@@ -1,23 +1,24 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+--Needed for openmpi build
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
-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_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 python_ver=os.getenv("python_ver") or "3.10.8"
+local stack_intel_ver=os.getenv("stack_gcc_ver") or "9.2.0"
+local stack_impi_ver=os.getenv("stack_openmpi_ver") or "4.1.5"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local openblas_ver=os.getenv("cmake_ver") or "0.3.19"
 
-load(pathJoin("hpc", hpc_ver))
-load(pathJoin("hpc-gnu", hpc_gnu_ver))
-load(pathJoin("hpc-mpich", hpc_mpich_ver))
+load(pathJoin("stack-gcc", stack_gcc_ver))
+load(pathJoin("stack-openmpi", stack_openmpi_ver))
+load(pathJoin("python", python_ver))
 load(pathJoin("cmake", cmake_ver))
 
 load("gsiutils_common")
 
 load(pathJoin("prod_util", prod_util_ver))
-
-pushenv("MKLROOT", "/apps/oneapi/mkl/2022.0.2")
+load(pathJoin("openblas", openblas_ver))
 
 whatis("Description: GSI utilities environment on Hera with GNU Compilers")

modulefiles/gsiutils_hera.intel.lua

@@ -1,24 +1,19 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
-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"
-local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
-local anaconda_ver=os.getenv("anaconda_ver") or "2.3.0"
+local python_ver=os.getenv("python_ver") or "3.10.8"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.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("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("python", python_ver))
 load(pathJoin("cmake", cmake_ver))
 
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
-load(pathJoin("anaconda", anaconda_ver))
-
 load("gsiutils_common")
 
 load(pathJoin("prod_util", prod_util_ver))

modulefiles/gsiutils_jet.lua

@@ -1,21 +1,21 @@
 help([[
 ]])
 
-load("cmake/3.20.1")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
-load("anaconda/5.3.1")
-
-prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack")
+local python_ver=os.getenv("python_ver") or "3.10.8"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
-load("hpc/1.1.0")
-load("hpc-intel/18.0.5.274")
-load("hpc-impi/2018.4.274")
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("python", python_ver))
+load(pathJoin("cmake", cmake_ver))
 
 load("gsiutils_common")
 
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 load(pathJoin("prod_util", prod_util_ver))
 
 pushenv("CFLAGS", "-axSSE4.2,AVX,CORE-AVX2")

modulefiles/gsiutils_orion.lua

@@ -1,20 +1,18 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
-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"
-local cmake_ver=os.getenv("cmake_ver") or "3.22.1"
-local python_ver=os.getenv("python_ver") or "3.7.5"
+local stack_python_ver=os.getenv("python_ver") or "3.10.8"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.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("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("python", stack_python_ver))
 load(pathJoin("cmake", cmake_ver))
-load(pathJoin("python", python_ver))
 
 load("gsiutils_common")
 

modulefiles/gsiutils_s4.lua

@@ -1,20 +1,18 @@
 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 miniconda_ver=os.getenv("miniconda_ver") or "3.8-s4"
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
-
-prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
-load("license_intel/S4")
-load(pathJoin("hpc", hpc_ver))
-load(pathJoin("hpc-intel", hpc_intel_ver))
-load(pathJoin("hpc-impi", hpc_impi_ver))
+local python_ver=os.getenv("python_ver") or "3.10.8"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
-load(pathJoin("miniconda", miniconda_ver))
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("python", python_ver))
+load(pathJoin("cmake", cmake_ver))
 
 load("gsiutils_common")
 

modulefiles/gsiutils_wcoss2.lua

@@ -7,6 +7,19 @@ local craype_ver=os.getenv("craype_ver") or "2.7.8"
 local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
 local cmake_ver= os.getenv("cmake_ver") or "3.20.2"
 local python_ver=os.getenv("python_ver") or "3.8.6"
+
+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 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 wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
+local crtm_ver=os.getenv("crtm_ver") or "2.3.0"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10"
 
 load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
@@ -16,11 +29,20 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
 load(pathJoin("cmake", cmake_ver))
 load(pathJoin("python", python_ver))
 
-load(pathJoin("prod_util", prod_util_ver))
+load(pathJoin("netcdf", netcdf_ver))
 
-load("gsiutils_common")
-unload("ncio")
-unload("ncdiag")
+load(pathJoin("bufr", bufr_ver))
+load(pathJoin("bacio", bacio_ver))
+load(pathJoin("w3emc", w3emc_ver))
+load(pathJoin("sp", sp_ver))
+load(pathJoin("ip", ip_ver))
+load(pathJoin("sigio", sigio_ver))
+load(pathJoin("sfcio", sfcio_ver))
+load(pathJoin("nemsio", nemsio_ver))
+load(pathJoin("wrf_io", wrf_io_ver))
+load(pathJoin("crtm", crtm_ver))
+
+load(pathJoin("prod_util", prod_util_ver))
 
 pushenv("HPC_OPT", "/apps/ops/para/libs")
 prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")

src/netcdf_io/interp_inc.fd/CMakeLists.txt

@@ -4,13 +4,17 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fconvert=big-endian -ffree-line-length-0 -ffast-math -fno-second-underscore -frecord-marker=4")
 endif()
 
-add_executable(interp_inc.x driver.f90)
+add_executable(interp_inc.x driver.F90)
 target_link_libraries(interp_inc.x PRIVATE NetCDF::NetCDF_Fortran)
 target_link_libraries(interp_inc.x PRIVATE MPI::MPI_Fortran)
 target_link_libraries(interp_inc.x PRIVATE w3emc::w3emc_d)
 target_link_libraries(interp_inc.x PRIVATE ip::ip_d)
 target_link_libraries(interp_inc.x PRIVATE sp::sp_d)
 
+if(ip_VERSION VERSION_GREATER_EQUAL 4.0.0)
+   target_compile_definitions(interp_inc.x PRIVATE "IP_V4")
+endif()
+
 # Install executable targets
 install(TARGETS interp_inc.x RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 

src/netcdf_io/interp_inc.fd/driver.f90 → src/netcdf_io/interp_inc.fd/driver.F90

@@ -24,14 +24,19 @@ program interp_inc
 
  use netcdf
  use mpi
+#ifdef IP_V4
+ use ip_mod, only: ipolates, ipolatev
+#endif
 
  implicit none
 
  integer, parameter :: num_recs = 9
 
 ! Declare externals
- external :: w3tagb, netcdf_err, splat, ipolatev, &
-    ipolates, w3tage
+ external :: w3tagb, netcdf_err, splat, w3tage
+#ifndef IP_V4
+ external :: ipolates, ipolatev
+#endif
 
  character(len=128) :: outfile, infile
  character(len=11)  :: records(num_recs)