Skip to content

Commit

Permalink
Merge branch 'ss160' of github.com:DavidHuber-NOAA/global-workflow in…
Browse files Browse the repository at this point in the history 
…to ss160
  • Loading branch information
@DavidHuber-NOAA
DavidHuber-NOAA committed Jan 24, 2024
2 parents 4c46354 + e400068 commit 5ef8eb2
Show file tree
Hide file tree
Showing 21 changed files with 19 additions and 11 deletions.
2 changes: 1 addition & 1 deletion modulefiles/module_gwci.hercules.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
Load environment to run GFS workflow ci scripts on Hercules
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

load(pathJoin("stack-intel", os.getenv("2021.9.0")))
load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.9.0")))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module_gwci.orion.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
Load environment to run GFS workflow ci scripts on Orion
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

load(pathJoin("stack-intel", os.getenv("2022.0.2")))
load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module_gwsetup.hercules.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Load environment to run GFS workflow ci scripts on Hercules
load(pathJoin("contrib","0.1"))
load(pathJoin("rocoto","1.3.5"))

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
local python_ver=os.getenv("python_ver") or "3.11.6"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module_gwsetup.orion.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load(pathJoin("contrib","0.1"))
load(pathJoin("rocoto","1.3.3"))
load(pathJoin("git","2.28.0"))

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
local python_ver=os.getenv("python_ver") or "3.11.6"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module_gwsetup.s4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Load environment to run GFS workflow setup scripts on S4
load(pathJoin("rocoto","1.3.5"))
load(pathJoin("git","2.30.0"))

prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
local python_ver=os.getenv("python_ver") or "3.11.6"
Expand Down
2 changes: 1 addition & 1 deletion sorc/gfs_utils.fd
Submodule gfs_utils.fd updated 3 files
+1 −1 modulefiles/gfsutils_hercules.lua
+1 −1 modulefiles/gfsutils_orion.lua
+1 −1 modulefiles/gfsutils_s4.lua
2 changes: 1 addition & 1 deletion sorc/gsi_enkf.fd
Submodule gsi_enkf.fd updated 3 files
+1 −1 modulefiles/gsi_hercules.lua
+1 −1 modulefiles/gsi_orion.lua
+1 −1 modulefiles/gsi_s4.lua
2 changes: 1 addition & 1 deletion sorc/gsi_monitor.fd
Submodule gsi_monitor.fd updated 4 files
+1 −1 modulefiles/orion-run.lua
+1 −1 modulefiles/orion.lua
+1 −1 modulefiles/s4-run.lua
+1 −1 modulefiles/s4.lua
2 changes: 1 addition & 1 deletion sorc/gsi_utils.fd
Submodule gsi_utils.fd updated 3 files
+1 −1 modulefiles/gsiutils_hercules.lua
+1 −1 modulefiles/gsiutils_orion.lua
+1 −1 modulefiles/gsiutils_s4.lua
1 change: 1 addition & 0 deletions versions/build.hera.ver
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev
source "${HOMEgfs:-}/versions/build.spack.ver"
1 change: 1 addition & 0 deletions versions/build.hercules.ver
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export stack_intel_ver=2021.9.0
export stack_impi_ver=2021.9.0
export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/build.spack.ver"
1 change: 1 addition & 0 deletions versions/build.jet.ver
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev
source "${HOMEgfs:-}/versions/build.spack.ver"
1 change: 1 addition & 0 deletions versions/build.orion.ver
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/build.spack.ver"
1 change: 1 addition & 0 deletions versions/build.s4.ver
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.0
export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/build.spack.ver"
1 change: 0 additions & 1 deletion versions/build.spack.ver
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export spack_stack_ver=1.6.0
export spack_env=gsi-addon-dev

export cmake_ver=3.23.1

Expand Down
1 change: 1 addition & 0 deletions versions/run.hera.ver
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev

export hpss_ver=hpss
export ncl_ver=6.6.2
Expand Down
1 change: 1 addition & 0 deletions versions/run.hercules.ver
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export stack_intel_ver=2021.9.0
export stack_impi_ver=2021.9.0
export intel_mkl_ver=2023.1.0
export spack_env=gsi-addon-env

export ncl_ver=6.6.2
export perl_ver=5.36.0
Expand Down
1 change: 1 addition & 0 deletions versions/run.jet.ver
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev

export hpss_ver=
export ncl_ver=6.6.2
Expand Down
1 change: 1 addition & 0 deletions versions/run.orion.ver
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export stack_intel_ver=2022.0.2
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-env

export ncl_ver=6.6.2
export gempak_ver=7.5.1
Expand Down
1 change: 1 addition & 0 deletions versions/run.s4.ver
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.0
export spack_env=gsi-addon-env

export ncl_ver=6.4.0-precompiled

Expand Down
1 change: 0 additions & 1 deletion versions/run.spack.ver
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export spack_stack_ver=1.6.0
export spack_env=gsi-addon-dev
export python_ver=3.11.6

export jasper_ver=2.0.32
Expand Down

0 comments on commit 5ef8eb2

Please sign in to comment.