Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Saving work very much in progress.  Will need to retest from start.
  • Loading branch information
EdwardSafford-NOAA committed Feb 2, 2024
1 parent 835998a commit a355ed0
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 269 deletions.
13 changes: 12 additions & 1 deletion src/Radiance_Monitor/data_extract/ush/RadMon_CP_glb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,19 @@ if [[ -d ${DATA_LOCATION} ]]; then
-o ${logfile} --ntasks=1 --mem=5g ${job}

elif [[ $MY_MACHINE = "wcoss2" ]]; then
#---------------------------------------------------------------------
# The qsub manual says the -v option (used to export variables to the
# submitted job) can be done in two ways:
#
# Method 1: -v VAR1=value1,VAR2=value2,...
# Method 2: -v VAR1=value1 -v VAR2=value2 ....
#
# Method 1 is a comma separated list with NO spaces.
# Method 2 does _NOT_ work on wcoss2 for whatever reason.
#---------------------------------------------------------------------
$SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${R_LOGDIR}/CP.${PDY}.${CYC}.err \
-V -l select=1:mem=5000M -l walltime=20:00 -N ${jobname} ${job}
-v RADMON_SUFFIX=${RADMON_SUFFIX},RUN=${RUN},PDY=${PDY},CYC=${CYC},HOMEradmon=${HOMEradmon},RADSTAT_LOCATION=${RADSTAT_LOCATION},DATA_LOCATION=${DATA_LOCATION},TANKverf=${TANKverf},FIXgdas=${FIXgdas},DO_DATA_RPT=${DO_DATA_RPT},DE_EXEC=${DE_EXEC},DE_SCRIPTS=${DE_SCRIPTS},NCP="${NCP}",CLEAN_TANKVERF=${CLEAN_TANKVERF},RAD_AREA=${RAD_AREA} \
-l place=shared,select=1:ncpus=1:mem=5000M -l walltime=00:20:00 -N ${jobname} ${job}
fi
else
echo "Unable to locate DATA_LOCATION: ${DATA_LOCATION}"
Expand Down
264 changes: 0 additions & 264 deletions src/Radiance_Monitor/data_extract/ush/RadMon_DE_glb.sh

This file was deleted.

3 changes: 2 additions & 1 deletion src/Radiance_Monitor/data_extract/ush/RadMon_DE_rgn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@ if [[ $MY_MACHINE = "hera" ]]; then

elif [[ $MY_MACHINE = "wcoss2" ]]; then
$SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${R_LOGDIR}/DE.${PDY}.${cyc}.err \
-V -l select=1:mem=5000M -l walltime=20:00 -N ${jobname} ${job}
-v CYCLE_INTERVAL=${CYCLE_INTERVAL},NET=${NET},RAD_AREA=${RAD_AREA},DATA=${DATA},radstat=${radstat},NCP="${NCP}",$HOMEnam=${HOMEnam},HOMEradmon=${HOMEradmon},TANKverf=${TANKverf},PDY=${PDY},cyc=${cyc},NDATE=${NDATE},MY_RADMON=${MY_RADMON},GSI_MON_BIN=${GSI_MON_BIN} \
-l place=shared,select=1:ncpus=1:mem=5000M -l walltime=00:20:00 -N ${jobname} ${job}
fi


Expand Down
1 change: 1 addition & 0 deletions src/Radiance_Monitor/data_extract/ush/radmon_copy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#
#--------------------------------------------------------------------

PDATE=${PDY}${CYC}

echo ""
echo "--> radmon_copy.sh"
Expand Down
2 changes: 1 addition & 1 deletion src/Radiance_Monitor/image_gen/ush/RadMon_IG_glb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ if [[ $RUN_TRANSFER -eq 1 ]]; then

transfer_queue=dev_transfer
jobname=transfer_${RADMON_SUFFIX}
export WEBDIR=${WEBDIR}/${RADMON_SUFFIX}/pngs
export WEBDIR=${WEBDIR}/${RADMON_SUFFIX}

cmdfile="${PLOT_WORK_DIR}/transfer_cmd"
echo "${IG_SCRIPTS}/transfer.sh" >$cmdfile
Expand Down
10 changes: 10 additions & 0 deletions src/Radiance_Monitor/image_gen/ush/xfer_rrfs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

from=~/nbns/imgn/regional/rrfs/radmon/pngs
to=/home/people/emc/www/htdocs/gmb/gdas/radiance/esafford/regional/rrfs/pngs

echo rsync $from to $to

/usr/bin/rsync -ave ssh --exclude *.ctl* \
--exclude 'horiz' --delete-during $from \
[email protected]:$to
Original file line number Diff line number Diff line change
@@ -1 +1 @@
abi_g16 ahi_himawari9 amsua_metop-b amsua_metop-c amsua_n15 amsua_n18 amsua_n19 atms_npp atms_n20 avhrr_metop-b avhrr_metop-c avhrr_n18 avhrr_n19 cris-fsr_npp cris-fsr_n20 hirs4_n19 iasi_metop-b iasi_metop-c mhs_metop-b mhs_metop-c mhs_n19 ssmis_f17 ssmis_f18 atms_n21 cris-fsr_n21 viirs-m_npp viirs-m_j1 viirs-m_j2
abi_g16 ahi_himawari9 amsua_metop-b amsua_metop-c amsua_n15 amsua_n18 amsua_n19 atms_npp atms_n20 avhrr_metop-b avhrr_metop-c avhrr_n18 avhrr_n19 cris-fsr_npp cris-fsr_n20 iasi_metop-b iasi_metop-c mhs_metop-b mhs_metop-c mhs_n19 ssmis_f17 ssmis_f18 atms_n21 cris-fsr_n21 viirs-m_npp viirs-m_j1 viirs-m_j2
1 change: 1 addition & 0 deletions src/Radiance_Monitor/nwprod/nam_radmon/jobs/JNAM_VERFRAD
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobid=${jobid:-"${outid}.o${pid}"}
export RADMON_SUFFIX=${RADMON_SUFFIX:-$NET}
export DATAROOT=${DATAROOT:-/tmpnwprod2}
export DATA=${DATA:-${DATAROOT}/${jobid}}
export PDATE=${PDY}${cyc}

mkdir -p $DATA
cd $DATA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ diag_rpt=${6:-${diag_rpt:?}}
outfile=${7:-${outfile:?}}

# Directories
HOMEradmon=${HOMEradmon:-$(pwd)}
HOMEradmon=${HOMEradmon:-$(pwd)} #not used?

# Other variables
VERBOSE=${VERBOSE:-NO}
Expand Down

0 comments on commit a355ed0

Please sign in to comment.