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

updates to build and run some ctests on WCOSS2 #1122

Merged
merged 14 commits into from
May 28, 2024
Merged

updates to build and run some ctests on WCOSS2 #1122

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d171c72
add prod_util and para bufr/12.0.1 to wcoss2.intel modulefile (#1111)
RussTreadon-NOAA May 22, 2024
0bc3cb5
correct modulefile syntax for wcoss2.intel (#1111)
RussTreadon-NOAA May 22, 2024
023b9e9
remove prod_util from wcoss2 module (#1111)
RussTreadon-NOAA May 22, 2024
c2405bd
Merge branch 'NOAA-EMC:develop' into feature/wcoss2_gdasapp
RussTreadon-NOAA May 23, 2024
6ea0448
Merge branch 'NOAA-EMC:develop' into feature/wcoss2_gdasapp
RussTreadon-NOAA May 23, 2024
f02a64d
add modules to wcoss2.intel, add wcoss2 to some soca tests (#1111)
RussTreadon-NOAA May 23, 2024
880ae32
correct python norm error (#1111)
RussTreadon-NOAA May 23, 2024
a84aab6
Merge branch 'NOAA-EMC:develop' into feature/wcoss2_gdasapp
RussTreadon-NOAA May 23, 2024
439e8e9
Merge branch 'develop' into feature/wcoss2_gdasapp
RussTreadon-NOAA May 23, 2024
2f85c1f
Merge branch 'develop' into feature/wcoss2_gdasapp
RussTreadon-NOAA May 24, 2024
3aec0d6
Merge branch 'NOAA-EMC:develop' into feature/wcoss2_gdasapp
RussTreadon-NOAA May 28, 2024
a9c48c1
simplify wcoss2 logic in soca run_jjobs script (#1111)
RussTreadon-NOAA May 28, 2024
43ed3e7
initial commit of wcoss2 EVA module (#1111)
RussTreadon-NOAA May 28, 2024
d2f1b99
Merge branch 'develop' into feature/wcoss2_gdasapp
RussTreadon-NOAA May 28, 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
8 changes: 8 additions & 0 deletions modulefiles/GDAS/wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ load("eckit/1.24.4")
load("fckit/0.11.0")
load("atlas/0.35.0")
load("nccmp")
load("nco/5.0.6")
load("gsl/2.7")
load("prod_util/2.0.14")

-- Remove HPC_OPT and prepend_patht once prod bufr/12.0.1 is installed
setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
load("bufr/12.0.1")

-- hack for pybind11
setenv("pybind11_ROOT", "/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/lib/python3.8/site-packages/pybind11/share/cmake/pybind11")
Expand Down
4 changes: 4 additions & 0 deletions test/soca/gw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ IF (IS_DIRECTORY /scratch2/NCEPDEV/)
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
5 changes: 4 additions & 1 deletion ush/soca/run_jjobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import argparse
from datetime import datetime, timedelta

machines = {"container", "hera", "orion", "hercules"}
machines = {"container", "hera", "orion", "hercules", "wcoss2"}

# Assume the default conda environement is gdassapp
ENVS = {'JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY': 'eva'}
Expand Down Expand Up @@ -159,6 +159,9 @@ def _conda_envs(self, jjob):
elif self.machine == "hera":
if jjob in ENVS:
self.f.write(f"module load {ENVS[jjob].upper()}/{self.machine} \n")
elif self.machine == "wcoss2":
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved
if jjob in ENVS:
self.f.write(f"module load {ENVS[jjob].upper()}/{self.machine} \n")

def precom(self, com, tmpl):
cmd = f"RUN={self.RUN} YMD={self.gPDY} HH={self.gcyc} declare_from_tmpl -xr {com}:{tmpl}"
Expand Down
Loading