Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update module files with Spack-stack 1.6.0 #102

Merged
merged 7 commits into from
May 22, 2024
Merged

Update module files with Spack-stack 1.6.0 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec8bd2f
update modules with spack-stack 1.6.0
chan-hoo May 20, 2024
69316f6
remove jedi module load from task module files
chan-hoo May 20, 2024
6816a80
update module files with stack-stack 1.6.0
chan-hoo May 21, 2024
0d4f20f
change path to jedi on orion
chan-hoo May 21, 2024
a1a4e26
fix ctest failure on Hera
chan-hoo May 21, 2024
e31644e
fix typo in sample yaml for hera
chan-hoo May 21, 2024
c87b5b7
change path to fix inputs on Hera
chan-hoo May 21, 2024
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
5 changes: 2 additions & 3 deletions modulefiles/build_hera_intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ loads modules necessary for building the land-DA workflow on Hera using Intel
whatis([===[Loads modules necessary for building the land-DA workflow on Hera]===])

prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down Expand Up @@ -42,5 +41,5 @@ setenv("CXX", "mpiicpc")
setenv("FC", "mpiifort")
setenv("CMAKE_Platform", "hera.intel")

setenv("EPICHOME", "/scratch2/NAGAPE/epic/UFS_Land-DA")
setenv("JEDI_INSTALL", pathJoin(os.getenv("EPICHOME"),"jedi_skylabv7.0"))
setenv("EPICHOME", "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev")
setenv("JEDI_INSTALL", "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/jedi_v7")
3 changes: 1 addition & 2 deletions modulefiles/build_orion_intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ loads modules necessary for building the land-DA workflow on Orion using Intel
whatis([===[Loads modules necessary for building the land-DA workflow on Orion]===])

prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down Expand Up @@ -42,4 +41,4 @@ setenv("FC", "mpiifort")
setenv("CMAKE_Platform", "orion.intel")

setenv("EPICHOME", "/work/noaa/epic/UFS_Land-DA")
setenv("JEDI_INSTALL", "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7")
setenv("JEDI_INSTALL", "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7_stack1.6")
1 change: 0 additions & 1 deletion modulefiles/tasks/hera/task.analysis.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/hera/task.forecast.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/hera/task.post_anal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/hera/task.pre_anal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/hera/task.prep_obs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/orion/task.analysis.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/orion/task.forecast.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/orion/task.post_anal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/orion/task.pre_anal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
1 change: 0 additions & 1 deletion modulefiles/tasks/orion/task.prep_obs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
Expand Down
7 changes: 6 additions & 1 deletion parm/land_analysis_hera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ workflow:
spec: 200001030000 200001040000 24:00:00 # for gswp3
# spec: 201912210000 201912220000 24:00:00 # for era5
entities:
MACHINE: "orion"
MACHINE: "hera"
SCHED: "slurm"
ACCOUNT: "epic"
EXP_NAME: "LETKF"
Expand Down Expand Up @@ -53,6 +53,7 @@ workflow:
task_prep_obs:
attrs:
cycledefs: cycled
maxtries: 2
envars:
OBSDIR: "&OBSDIR;"
OBSDIR_SUBDIR: "&OBSDIR_SUBDIR;"
Expand Down Expand Up @@ -80,6 +81,7 @@ workflow:
task_pre_anal:
attrs:
cycledefs: cycled
maxtries: 2
envars:
MACHINE: "&MACHINE;"
SCHED: "&SCHED;"
Expand Down Expand Up @@ -126,6 +128,7 @@ workflow:
task_analysis:
attrs:
cycledefs: cycled
maxtries: 2
envars:
OBS_TYPES: "&OBS_TYPES;"
MACHINE: "&MACHINE;"
Expand Down Expand Up @@ -162,6 +165,7 @@ workflow:
task_post_anal:
attrs:
cycledefs: cycled
maxtries: 2
envars:
MACHINE: "&MACHINE;"
SCHED: "&SCHED;"
Expand Down Expand Up @@ -195,6 +199,7 @@ workflow:
task_forecast:
attrs:
cycledefs: cycled
maxtries: 2
envars:
OBS_TYPES: "&OBS_TYPES;"
MACHINE: "&MACHINE;"
Expand Down
7 changes: 6 additions & 1 deletion parm/land_analysis_orion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workflow:
ACCOUNT: "epic"
EXP_NAME: "LETKF"
EXP_BASEDIR: "/work/noaa/epic/{USER}/landda_test"
JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7"
JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7_stack1.6"
WARMSTART_DIR: "/work/noaa/epic/UFS_Land-DA_Dev/DATA_RESTART"
FORCING: "gswp3" # "gswp3" or "era5"
RES: "96"
Expand Down Expand Up @@ -53,6 +53,7 @@ workflow:
task_prep_obs:
attrs:
cycledefs: cycled
maxtries: 2
envars:
OBSDIR: "&OBSDIR;"
OBSDIR_SUBDIR: "&OBSDIR_SUBDIR;"
Expand Down Expand Up @@ -80,6 +81,7 @@ workflow:
task_pre_anal:
attrs:
cycledefs: cycled
maxtries: 2
envars:
MACHINE: "&MACHINE;"
SCHED: "&SCHED;"
Expand Down Expand Up @@ -126,6 +128,7 @@ workflow:
task_analysis:
attrs:
cycledefs: cycled
maxtries: 2
envars:
OBS_TYPES: "&OBS_TYPES;"
MACHINE: "&MACHINE;"
Expand Down Expand Up @@ -162,6 +165,7 @@ workflow:
task_post_anal:
attrs:
cycledefs: cycled
maxtries: 2
envars:
MACHINE: "&MACHINE;"
SCHED: "&SCHED;"
Expand Down Expand Up @@ -195,6 +199,7 @@ workflow:
task_forecast:
attrs:
cycledefs: cycled
maxtries: 2
envars:
OBS_TYPES: "&OBS_TYPES;"
MACHINE: "&MACHINE;"
Expand Down
2 changes: 1 addition & 1 deletion sorc/app_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ fi

# Link land-DA input files to FIXlandda directory
if [ "${PLATFORM}" = "hera" ]; then
landda_fix_orig="/scratch2/NAGAPE/epic/UFS_Land-DA/inputs"
landda_fix_orig="/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/inputs"
elif [ "${PLATFORM}" = "orion" ]; then
landda_fix_orig="/work/noaa/epic/UFS_Land-DA/inputs"
fi
Expand Down
6 changes: 3 additions & 3 deletions sorc/test/run_ufs_datm_lnd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -e
set -ex
################################################
# pass arguments
project_binary_dir=$1
Expand Down Expand Up @@ -37,8 +37,8 @@ RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${TEST_NAME}_${RT_COMPILER}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20221101}

if [[ ! -d ${INPUTDATA_ROOT} ]] || [[ ! -d ${RTPWD} ]]; then
echo "Error: cannot find either folder for INPUTDATA_ROOT or RTPWD, please check!"
exit 1
echo "Error: cannot find either folder for INPUTDATA_ROOT or RTPWD, please check!"
exit 1
fi

# create test folder
Expand Down
19 changes: 9 additions & 10 deletions versions/build.ver_hera
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
#!/bin/bash

export modulepath_spack_stack="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core"
export modulepath_spack_stack_jedi="/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles"
export modulepath_spack_stack="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core"

export bacio_ver="2.4.1"
export cmake_ver="3.23.1"
export crtm_ver="2.4.0"
export crtm_ver="2.4.0.1"
export ecbuild_ver="3.7.2"
export esmf_ver="8.5.0"
export fms_ver="2023.02.01"
export esmf_ver="8.6.0"
export fms_ver="2023.04"
export gftl_shared_ver="1.6.1"
export g2_ver="3.4.5"
export g2tmpl_ver="1.10.2"
export hdf5_ver="1.14.0"
export ip_ver="4.3.0"
export jasper_ver="2.0.32"
export libpng_ver="1.6.37"
export mapl_ver="2.40.3-esmf-8.5.0"
export mapl_ver="2.40.3-esmf-8.6.0"
export netcdf_c_ver="4.9.2"
export netcdf_fortran_ver="4.6.0"
export netcdf_fortran_ver="4.6.1"
export parallelio_ver="2.5.10"
export prod_util_ver="1.2.2"
export sp_ver="2.3.3"
export prod_util_ver="2.1.1"
export sp_ver="2.5.0"
export stack_intel_oneapi_mpi_ver="2021.5.1"
export stack_intel_ver="2021.5.0"
export stack_python_ver="3.10.8"
export stack_python_ver="3.10.13"
export w3emc_ver="2.10.0"
export zlib_ver="1.2.13"

21 changes: 10 additions & 11 deletions versions/build.ver_orion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
#!/bin/bash

export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core"
export modulepath_spack_stack_jedi="/work/noaa/da/role-da/spack-stack/modulefiles"
export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core"

export bacio_ver="2.4.1"
export cmake_ver="3.22.1"
export crtm_ver="2.4.0"
export cmake_ver="3.23.1"
export crtm_ver="2.4.0.1"
export ecbuild_ver="3.7.2"
export esmf_ver="8.5.0"
export fms_ver="2023.02.01"
export esmf_ver="8.6.0"
export fms_ver="2023.04"
export gftl_shared_ver="1.6.1"
export g2_ver="3.4.5"
export g2tmpl_ver="1.10.2"
export hdf5_ver="1.14.0"
export ip_ver="4.3.0"
export jasper_ver="2.0.32"
export libpng_ver="1.6.37"
export mapl_ver="2.40.3-esmf-8.5.0"
export mapl_ver="2.40.3-esmf-8.6.0"
export netcdf_c_ver="4.9.2"
export netcdf_fortran_ver="4.6.0"
export netcdf_fortran_ver="4.6.1"
export parallelio_ver="2.5.10"
export prod_util_ver="1.2.2"
export sp_ver="2.3.3"
export prod_util_ver="2.1.1"
export sp_ver="2.5.0"
export stack_intel_oneapi_mpi_ver="2021.5.1"
export stack_intel_ver="2022.0.2"
export stack_python_ver="3.10.8"
export stack_python_ver="3.10.13"
export w3emc_ver="2.10.0"
export zlib_ver="1.2.13"

Loading