Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
50edd18
Remove unsupported machines module files
DavidHuber-NOAA Jun 3, 2025
76cc38a
Update to spack-stack 1.9.1 libraries everywhere
DavidHuber-NOAA Jun 3, 2025
38ca9e1
Start transitioning Fortran code to use ip/sp_mod module for sp packages
DavidHuber-NOAA Jun 4, 2025
8cfcdf7
Update ip sp_mod interfaces
DavidHuber-NOAA Jun 4, 2025
83ac42f
Send 1-element array to splegend
DavidHuber-NOAA Jun 4, 2025
e001190
Make mp variable scalar (as expected by sp)
DavidHuber-NOAA Jun 4, 2025
11d7633
Move general_transform.f90 to ip implementation of sp
DavidHuber-NOAA Jun 4, 2025
573e0e3
Create temporary arrays for calls to spffte
DavidHuber-NOAA Jun 4, 2025
298c490
Use BUFR 12 everywhere
DavidHuber-NOAA Jun 4, 2025
ebf1b95
Update src/gsi/strong_fast_global_mod.f90
DavidHuber-NOAA Jun 5, 2025
eac7a3b
Update WCOSS2 module file versions
DavidHuber-NOAA Jun 5, 2025
c590fd3
Further remove unsupported machines
DavidHuber-NOAA Jun 5, 2025
e6f2fe6
Remove remaining references
DavidHuber-NOAA Jun 5, 2025
43b75cb
Merge remote-tracking branch 'me/feature/ss_191' into feature/ss_191
DavidHuber-NOAA Jun 5, 2025
c36fec9
update hera and hercules spack-stack/1.9.1 modulefiles (#887)
RussTreadon-NOAA Jun 5, 2025
a862f94
Merge remote-tracking branch 'russ/feature/ss_191' into feature/ss_191
DavidHuber-NOAA Jun 5, 2025
4601e28
Correct gaea c6 machine_id
DavidHuber-NOAA Jun 5, 2025
9ac330a
Update CI library versions
DavidHuber-NOAA Jun 5, 2025
2f0bf37
Correct calls to sp subroutines
DavidHuber-NOAA Jun 5, 2025
80a614e
add tar/1.34 to hercules modulefile
RussTreadon-NOAA Jun 6, 2025
d4653ab
Add netCDF-D prerequisite libraries
DavidHuber-NOAA Jun 6, 2025
b35d381
Reorder loads so envvar is loaded before attempting to load hpc-stack…
DavidHuber-NOAA Jun 6, 2025
e3520f7
Merge branch 'NOAA-EMC:develop' into feature/ss_191
RussTreadon-NOAA Jun 6, 2025
0b0663a
Merge remote-tracking branch 'dave/feature/ss_191' into feature/ss_191
RussTreadon-NOAA Jun 6, 2025
5745b93
Merge branch 'NOAA-EMC:develop' into feature/ss_191
RussTreadon-NOAA Jun 9, 2025
73678d9
Revert netcdf to 4.7.4
DavidHuber-NOAA Jun 9, 2025
748194f
Revert netcdf to 4.7.4 on Acorn
DavidHuber-NOAA Jun 9, 2025
25051b6
Update ip_ver to 5.2.0
DavidHuber-NOAA Jun 9, 2025
21e29f5
Update modulefiles/gsi_wcoss2.intel.lua
DavidHuber-NOAA Jun 9, 2025
ba06748
Merge remote-tracking branch 'dave/feature/ss_191' into feature/ss_191
RussTreadon-NOAA Jun 9, 2025
56ce202
Merge branch 'NOAA-EMC:develop' into feature/ss_191
RussTreadon-NOAA Jun 11, 2025
aeaded2
update gsi_acorn.intel modulefile
RussTreadon-NOAA Jun 11, 2025
9a9faad
remove references to sp from gsi_acorn.intel.lua
RussTreadon-NOAA Jun 12, 2025
8e24388
Merge pull request #1 from RussTreadon-NOAA/feature/ss_191
DavidHuber-NOAA Jun 12, 2025
e221151
Merge branch 'NOAA-EMC:develop' into feature/ss_191
DavidHuber-NOAA Jun 17, 2025
1ebb902
Merge branch 'NOAA-EMC:develop' into feature/ss_191
DavidHuber-NOAA Jun 18, 2025
d3b32a3
Update MSU resources to match other HPCs
DavidHuber-NOAA Jul 1, 2025
b021214
Revert Hercules' modulefile
DavidHuber-NOAA Jul 1, 2025
b14ec9d
Update to spack-stack 1.9.2
DavidHuber-NOAA Jul 1, 2025
fcd734b
Revert MSU resources
DavidHuber-NOAA Jul 1, 2025
6059b14
Update netCDF to 4.9.2 on wcoss2
DavidHuber-NOAA Jul 3, 2025
0d1b45a
update casesdir for gaeac6
RussTreadon-NOAA Jul 9, 2025
8cc7154
Merge pull request #3 from RussTreadon-NOAA/feature/ss_191
DavidHuber-NOAA Jul 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ci/spack_gcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ spack:
specs:
- netcdf-c@4.9.2
- netcdf-fortran@4.6.1
- bufr@11.7.0
- bufr@12.1.0
- bacio@2.4.1
- w3emc@2.10.0
- sp@2.5.0
- ip@4.3.0
- sigio@2.3.2
- sfcio@1.4.1
- ip@5.1.0
- sigio@2.3.3
- sfcio@1.4.2
- nemsio@2.5.4
- wrf-io@1.2.0
- ncio@1.1.2
Expand Down
9 changes: 4 additions & 5 deletions ci/spack_intel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ spack:
specs:
- netcdf-c@4.9.2 ~blosc build_system=cmake
- netcdf-fortran@4.6.1
- bufr@11.7.0
- bufr@12.1.0
- bacio@2.4.1
- w3emc@2.10.0
- sp@2.5.0
- ip@4.3.0
- sigio@2.3.2
- sfcio@1.4.1
- ip@5.1.0
- sigio@2.3.3
- sfcio@1.4.2
- nemsio@2.5.4
- wrf-io@1.2.0
- ncio@1.1.2
Expand Down
17 changes: 12 additions & 5 deletions modulefiles/gsi_acorn.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
local bufr_ver=os.getenv("bufr_ver") or "12.1.0"
local bacio_ver=os.getenv("bacio_ver") or "2.4.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 ip_ver=os.getenv("ip_ver") or "5.1.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.4"
Expand All @@ -23,7 +22,6 @@ local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
local crtm_ver=os.getenv("crtm_ver") or "2.4.0.1"
local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1"

load(pathJoin("envvar", "1.0"))
load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
load(pathJoin("intel", intel_ver))
load(pathJoin("craype", craype_ver))
Expand All @@ -37,13 +35,22 @@ load(pathJoin("netcdf", netcdf_ver))
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("ip", ip_ver))
-- Temporarily define IP's paths here.
-- TODO when testing is complete, request an official installation in https://github.com/NOAA-EMC/WCOSS2-requests/issues/11
pushenv("ip_ROOT", pathJoin("/lfs/h2/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/intel-19.1.3.304/ip", ip_ver))
pushenv("IP_INC4", pathJoin("/lfs/h2/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/intel-19.1.3.304/ip", ip_ver, "include_4"))
pushenv("IP_INCd", pathJoin("/lfs/h2/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/intel-19.1.3.304/ip", ip_ver, "include_d"))
pushenv("IP_LIB4", pathJoin("/lfs/h2/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/intel-19.1.3.304/ip", ip_ver, "lib64/libip_4.a"))
pushenv("IP_LIBd", pathJoin("/lfs/h2/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/intel-19.1.3.304/ip", ip_ver, "lib64/libip_d.a"))
pushenv("ip_VERSION", 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("ncio", ncio_ver))
--load(pathJoin("crtm", crtm_ver))
load(pathJoin("ncdiag",ncdiag_ver))

-- Lastly, load CRTM from the EMC location
Expand Down
14 changes: 7 additions & 7 deletions modulefiles/gsi_common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ Load common modules to build GSI on all machines
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.1"

local bufr_ver=os.getenv("bufr_ver") or "11.7.0"
local bufr_ver=os.getenv("bufr_ver") or "12.1.0"
local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
local sp_ver=os.getenv("sp_ver") or "2.5.0"
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 ip_ver=os.getenv("ip_ver") or "5.1.0"
local sigio_ver=os.getenv("sigio_ver") or "2.3.3"
local sfcio_ver=os.getenv("sfcio_ver") or "1.4.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.1"
local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"

load(pathJoin("netcdf-c", netcdf_c_ver))
load(pathJoin("netcdf-fortran", netcdf_fortran_ver))

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("ncio", ncio_ver))
load(pathJoin("crtm", crtm_ver))
load(pathJoin("gsi-ncdiag",ncdiag_ver))
load(pathJoin("gsi-ncdiag", ncdiag_ver))
load(pathJoin("prod_util", prod_util_ver))
20 changes: 0 additions & 20 deletions modulefiles/gsi_discover.intel

This file was deleted.

28 changes: 0 additions & 28 deletions modulefiles/gsi_gaeac5.intel.lua

This file was deleted.

11 changes: 4 additions & 7 deletions modulefiles/gsi_gaeac6.intel.lua
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
help([[
]])

--prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-intel-2023.2.0/install/modulefiles/Core")

local stack_python_ver=os.getenv("stack_python_ver") or "3.11.6"
local stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.30"
local cmake_ver=os.getenv("cmake_ver") or "3.27.9"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
load(pathJoin("stack-python", stack_python_ver))
load(pathJoin("cmake", cmake_ver))

load("gsi_common")
load(pathJoin("prod_util", prod_util_ver))

pushenv("GSI_BINARY_SOURCE_DIR", "/gpfs/f6/bil-fire8/world-shared/GSI_data/fix/gsi/20241022")

Expand Down
25 changes: 0 additions & 25 deletions modulefiles/gsi_hera.gnu.lua

This file was deleted.

23 changes: 13 additions & 10 deletions modulefiles/gsi_hera.intel.lua
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
help([[
]])

prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")

local python_ver=os.getenv("python_ver") or "3.11.6"
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 "2.1.1"
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"
local mkl_ver=os.getenv("mkl_ver") or "2024.2.1"
local stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
local cmake_ver=os.getenv("cmake_ver") or "3.27.9"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("python", python_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
load(pathJoin("mkl", mkl_ver))
load(pathJoin("stack-python", stack_python_ver))
load(pathJoin("cmake", cmake_ver))

load("gsi_common")
load(pathJoin("prod_util", prod_util_ver))

unload("impi/2024.2.1")
load("impi/2022.1.2")

pushenv("CFLAGS", "-xHOST")
pushenv("FFLAGS", "-xHOST")
Expand Down
26 changes: 15 additions & 11 deletions modulefiles/gsi_hercules.intel.lua
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
help([[
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")

local stack_python_ver=os.getenv("stack_python_ver") or "3.11.6"
local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"
local intel_oneapi_mkl_ver=os.getenv("intel_oneapi_mkl_ver") or "2024.2.1"
local stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
local cmake_ver=os.getenv("cmake_ver") or "3.27.9"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("python", stack_python_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
load(pathJoin("intel-oneapi-mkl", intel_oneapi_mkl_ver))
load(pathJoin("stack-python", stack_python_ver))
load(pathJoin("cmake", cmake_ver))

load("gsi_common")
load(pathJoin("prod_util", prod_util_ver))
load("intel-oneapi-mkl/2022.2.1")

unload("intel-oneapi-mpi/2021.13.1")
load("intel-oneapi-mpi/2021.7.1")

load("tar/1.34")

pushenv("CFLAGS", "-xHOST")
pushenv("FFLAGS", "-xHOST")
Expand Down
25 changes: 0 additions & 25 deletions modulefiles/gsi_jet.intel.lua

This file was deleted.

21 changes: 10 additions & 11 deletions modulefiles/gsi_orion.intel.lua
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
help([[
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env-rocky9/install/modulefiles/Core")
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")

local stack_python_ver=os.getenv("stack_python_ver") or "3.11.6"
local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"
local intel_oneapi_mkl_ver=os.getenv("intel_oneapi_mkl_ver") or "2024.2.1"
local stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
local cmake_ver=os.getenv("cmake_ver") or "3.27.9"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("python", stack_python_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
load(pathJoin("intel-oneapi-mkl", intel_oneapi_mkl_ver))
load(pathJoin("stack-python", stack_python_ver))
load(pathJoin("cmake", cmake_ver))

load("gsi_common")
load(pathJoin("prod_util", prod_util_ver))
load("intel-oneapi-mkl/2022.2.1")

pushenv("CFLAGS", "-xHOST")
pushenv("FFLAGS", "-xHOST")
Expand Down
25 changes: 0 additions & 25 deletions modulefiles/gsi_s4.intel.lua

This file was deleted.

Loading