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

Jump to bottom

Orion Rocky 9 updates #1180

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Orion Rocky 9 updates #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
214a155
updates to build and run on Orion Rocky 9 (#1159)
RussTreadon-NOAA Jun 18, 2024
f96bb39
Merge branch 'develop' into feature/orion_rocky9
RussTreadon-NOAA Jun 18, 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
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ case ${BUILD_TARGET} in
;;
esac

CMAKE_OPTS+=" -DCLONE_JCSDADATA=$CLONE_JCSDADATA"
CMAKE_OPTS+=" -DCLONE_JCSDADATA=$CLONE_JCSDADATA -DMACHINE=$BUILD_TARGET"

BUILD_DIR=${BUILD_DIR:-$dir_root/build}
if [[ $CLEAN_BUILD == 'YES' ]]; then
Expand Down
19 changes: 10 additions & 9 deletions modulefiles/GDAS/orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,30 @@ local pkgName = myModuleName()
local pkgVersion = myModuleVersion()
local pkgNameVer = myModuleFullName()

prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core')
prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core')
prepend_path("MODULEPATH", '/work2/noaa/da/python/opt/modulefiles/stack')

-- below two lines get us access to the spack-stack modules
load("stack-intel/2022.0.2")
load("stack-intel-oneapi-mpi/2021.5.1")
load("stack-intel/2021.9.0")
load("stack-intel-oneapi-mpi/2021.9.0")
--load("stack-python/3.10.8")
-- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed
load("cmake/3.23.1")
load("curl/8.4.0")
load("zlib/1.2.13")
load("git/2.28.0")
load("pkg-config/0.27.1")
load("git/2.31.1")
--load("pkg-config/0.27.1")
load("hdf5/1.14.0")
load("parallel-netcdf/1.12.2")
load("netcdf-c/4.9.2")
load("nccmp/1.9.0.1")
load("netcdf-fortran/4.6.1")
load("nco/5.0.6")
load("parallelio/2.5.10")
load("wget/1.21.3")
load("wget/1.21.1")
load("boost/1.83.0")
load("bufr/12.0.1")
load("git-lfs/2.12.0")
load("git-lfs/3.1.2")
load("ecbuild/3.7.2")
load("openjpeg/2.3.1")
load("eccodes/2.32.0")
Expand All @@ -43,7 +44,7 @@ load("atlas/0.35.1")
load("sp/2.5.0")
load("gsl-lite/0.37.0")
load("libjpeg/2.1.0")
load("krb5/1.15.1")
load("krb5/1.20.1")
load("libtirpc/1.3.3")
load("hdf/4.2.15")
load("jedi-cmake/1.4.0")
Expand All @@ -59,7 +60,7 @@ load("py-pybind11/2.11.0")
--load("crtm/v2.4_jedi")
load("contrib/0.1")
load("noaatools/3.1")
load("rocoto/1.3.3")
load("rocoto/1.3.5")

load("hpc/1.2.0")
unload("python/3.10.13")
Expand Down
21 changes: 5 additions & 16 deletions test/soca/gw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,14 @@ add_test(NAME test_gdasapp_soca_prep
ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/ush:${PROJECT_SOURCE_DIR}/../../ush/python/wxflow/src:$ENV{PYTHONPATH}")

# Identify machine
set(MACHINE "container")
IF (IS_DIRECTORY /work2)
IF (IS_DIRECTORY /apps/other)
set(MACHINE "hercules")
set(PARTITION "hercules")
ELSE()
set(MACHINE "orion")
set(PARTITION "orion")
ENDIF()
ENDIF()
IF (IS_DIRECTORY /scratch2/NCEPDEV/)
set(MACHINE "hera")
if (MACHINE STREQUAL "hercules")
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved
set(PARTITION "hercules")
ELSEIF (MACHINE STREQUAL "orion")
set(PARTITION "orion")
ELSEIF (MACHINE STREQUAL "hera")
set(PARTITION "hera")
ENDIF()

IF (IS_DIRECTORY /lfs/h2/)
set(MACHINE "wcoss2")
ENDIF()

# Clean-up
add_test(NAME test_gdasapp_soca_run_clean
COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_BINARY_DIR}/test/soca/gw/testrun/testjjobs)
Expand Down
Loading