Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
6 changes: 4 additions & 2 deletions modulefiles/ursa.intel-run.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@ help([[
]])

-- Spack Stack installation specs
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")

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 grads_ver=os.getenv("grads_ver") or "2.2.3"
local tar_ver=os.getenv("tar_ver") or "1.34"

load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpiver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))

load(pathJoin("grads", grads_ver))
load(pathJoin("tar", tar_ver))

load("common-run")

Expand Down
5 changes: 3 additions & 2 deletions modulefiles/ursa.intel.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
help([[
]])


-- Spack Stack installation specs
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")

local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi=os.getenv("stack_intel_oneapi_mpi") or "2021.13"
local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"

load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))

load("common")

Expand Down
14 changes: 13 additions & 1 deletion parm/Mon_config
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export MY_MACHINE=$machine_id
# then I'll open an issue for the change to those machines.
#
if [[ $MY_MACHINE = "wcoss2" || $MY_MACHINE = "hera" || $MY_MACHINE = "orion" || \
$MY_MACHINE = "hercules" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then
$MY_MACHINE = "hercules" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" || \
$MY_MACHINE = "ursa" ]]; then
Comment thread
EdwardSafford-NOAA marked this conversation as resolved.
source $DIR_ROOT/ush/module-setup.sh
module use $DIR_ROOT/modulefiles
module load ${MACHINE_ID}.${COMPILER}-run
Expand Down Expand Up @@ -82,6 +83,17 @@ case $MY_MACHINE in
account="da-cpu"
;;

ursa)
export SUB=/apps/slurm/default/bin/sbatch

tankdir="/scratch3/NCEPDEV/da/$USER/save/nbns"
ptmp="/scratch3/NCEPDEV/stmp/$USER"
stmp="/scratch3/NCEPDEV/stmp/$USER"
queue=""
project=""
account="da-cpu"
;;

wcoss2)
export SUB="qsub"

Expand Down
18 changes: 16 additions & 2 deletions src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,16 @@ if [[ -e ${C_TANKDIR}/info/gdas_conmon_base.txt ]]; then
export conmon_base=${C_TANKDIR}/info/gdas_conmon_base.txt
fi

if [ ! -s $cnvstat ]; then
echo "unable to access $cnvstat"
fi

if [ ! -s $pgrbf00 ]; then
echo "unable to access $pgrbf00"
fi
if [ ! -s $pgrbf06 ]; then
echo "unable to access $pgrbf06"
fi

exit_value=0
if [ -s $cnvstat -a -s $pgrbf00 -a -s $pgrbf06 ]; then
Expand All @@ -205,7 +215,6 @@ if [ -s $cnvstat -a -s $pgrbf00 -a -s $pgrbf06 ]; then
#------------------------------------------------------------------
if [ -s $pgrbf06 ]; then

echo "Ok to proceed with DE"
logdir=${C_LOGDIR}
if [[ ! -d ${logdir} ]]; then
mkdir -p ${logdir}
Expand All @@ -221,14 +230,19 @@ if [ -s $cnvstat -a -s $pgrbf00 -a -s $pgrbf06 ]; then
$SUB -A $ACCOUNT --ntasks=1 --time=00:30:00 \
-p ${SERVICE_PARTITION} -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON

elif [[ $MY_MACHINE = "ursa" ]]; then
$SUB -A $ACCOUNT --ntasks=1 --time=01:30:00 \
-J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON

elif [[ $MY_MACHINE = "jet" ]]; then
$SUB -A $ACCOUNT -ntasks=1 --time=00:30:00 --mem=5000 \
-p ${SERVICE_PARTITION} -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON

elif [[ $MY_MACHINE = "wcoss2" ]]; then
$SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=45:00 -N ${jobname} \
$SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=2:15:00 -N ${jobname} \
-l select=1:mem=8gb ${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON
fi

Expand Down
Loading
Loading