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

Update jobid definition for all J-jobs #535

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Update jobid definition for all J-jobs #535

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
980ebb2
Update jobid definition for all J-jobs
Oct 18, 2024
05e555e
Merge branch 'main' into feature/jobid
MatthewPyle-NOAA Oct 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
4 changes: 2 additions & 2 deletions jobs/JRRFS_ANALYSIS_ENKF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export CYCLE_TYPE=${CYCLE_TYPE:-prod}
if [ "${CYCLE_TYPE}" = "spinup" ]; then
export jobid=${RUN}_enkfupdt_${OB_TYPE}_spinup_${envir}_${cyc}
export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}_spinup)}
else
export jobid=${RUN}_enkfupdt_${OB_TYPE}_${envir}_${cyc}
export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc})}
fi

Expand Down
19 changes: 8 additions & 11 deletions jobs/JRRFS_ANALYSIS_GSI
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")

Expand All @@ -77,19 +79,14 @@ fi
if [[ ! -v OB_TYPE ]]; then
OB_TYPE="conv"
fi
if [ "${GSI_TYPE}" = "OBSERVER" ]; then
if [ "${MEM_TYPE}" = "MEAN" ]; then
export jobid=${RUN}_observer_${workname}_ensmean_${envir}_${cyc}
observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/ensmean/observer_${workname}"
else

if [ "${MEM_TYPE}" = "MEAN" ]; then
observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/ensmean/observer_${workname}"
else
# GSI_TYPE = OBSERVER is only for EnKF (ensemble forecasts do not have ANALYSIS tasks)
export jobid=${RUN}_observer_${workname}_${mem_num}_${envir}_${cyc}
observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/observer_${workname}"
fi
mkdir -p ${observer_nwges_dir}
else # For control member, GSI_TYPE is always ANALYSIS
export jobid=${RUN}_analysis_${OB_TYPE}_${workname}_${envir}_${cyc}
observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/observer_${workname}"
fi
mkdir -p ${observer_nwges_dir}

export DATA=${DATAROOT}/${jobid}
rm -fr ${DATA}
Expand Down
9 changes: 2 additions & 7 deletions jobs/JRRFS_ANALYSIS_GSIDIAG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,11 @@ the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export CYCLE_TYPE=${CYCLE_TYPE:-prod}

if [ "${CYCLE_TYPE}" = "spinup" ]; then
workname="gsi_spinup"
else
workname="gsi"
fi

export jobid=${RUN}_analysis_conv_dbz_${workname}_${envir}_${cyc}
export DATA="${DATAROOT}/${jobid}"
if [ ! -d "${DATA}" ]; then
echo "WARNING: ${DATA} does not exist"
Expand Down
17 changes: 2 additions & 15 deletions jobs/JRRFS_ANALYSIS_NONVARCLD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,11 @@ analysis with RRFS for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")

if [ "${CYCLE_TYPE}" = "spinup" ]; then
export workname="nonvar_cldanl_spinup"
else
export workname="nonvar_cldanl"
fi
if [ ${MEM_TYPE} = "MEAN" ]; then
export jobid=${RUN}_${workname}_ensmean_${envir}_${cyc}
else
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
export jobid=${RUN}_${workname}_${mem_num}_${envir}_${cyc}
else
export jobid=${RUN}_${workname}_${envir}_${cyc}
fi
fi

export DATA=${DATAROOT}/${jobid}
rm -fr ${DATA}
mkdir -p ${DATA}
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_BLEND_ICS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ on the RRFS initial conditions.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
4 changes: 2 additions & 2 deletions jobs/JRRFS_BUFRSND
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ on the output files corresponding to a specified forecast hour.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export fhr=01
export tmmark=tm00
Expand All @@ -72,11 +74,9 @@ CYCLE_TYPE=${CYCLE_TYPE:-prod}
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
export INPUT_DATA="${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}"
export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast"
export jobid=${RUN}_bufrsnd_${mem_num}_${envir}_${cyc}
else
export INPUT_DATA="${DATAROOT}/${RUN}_forecast_${envir}_${cyc}"
export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast"
export jobid=${RUN}_bufrsnd_${envir}_${cyc}
fi

mkdir -p "${NWGES_DIR}/RESTART"
Expand Down
7 changes: 2 additions & 5 deletions jobs/JRRFS_CALC_ENSMEAN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,12 @@ RRFS for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

#export mem_num=m$(echo "${ENSMEM_INDX}")

export CYCLE_TYPE=${CYCLE_TYPE:-prod}
if [ "${CYCLE_TYPE}" = "spinup" ]; then
export jobid=${RUN}_calc_ensmean_spinup_${envir}_${cyc}
else
export jobid=${RUN}_calc_ensmean_${envir}_${cyc}
fi

export DATA=${DATAROOT}/${jobid}
rm -fr ${DATA}
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_FORECAST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_MAKE_GRID
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ This is the J-job script for the task that generates grid files.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export DATA=${DATAROOT}/${jobid}
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_MAKE_ICS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ extrn_mdl_fns_on_disk_str="( "$( printf "\"%s\" " "${fns_on_disk[@]}" )")"

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_MAKE_LBCS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ extrn_mdl_fns_on_disk_str2="( "$( printf "\"%s\" " "${fns_on_disk2[@]}" )")"

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_MAKE_OROG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ This is the J-job script for the task that generates orography files.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export DATA=${DATAROOT}/${jobid}
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_MAKE_SFC_CLIMO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ climatology.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export DATA=${DATAROOT}/${jobid}
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_POST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ on the output files corresponding to a specified forecast hour.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_PRDGEN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ files corresponding to a specified forecast hour.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_PREP_CYC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ This is the J-job script for the prep_cyc tasks for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
14 changes: 2 additions & 12 deletions jobs/JRRFS_PROCESS_BUFR
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,8 @@ the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}

if [ "${CYCLE_TYPE}" = "spinup" ]; then
export jobid=${RUN}_process_bufr_spinup_${envir}_${cyc}
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
export jobid=${RUN}_process_bufr_spinup_enkf_${envir}_${cyc}
fi
else
export jobid=${RUN}_process_bufr_${envir}_${cyc}
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
export jobid=${RUN}_process_bufr_enkf_${envir}_${cyc}
fi
fi
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export DATA=${DATAROOT}/${jobid}
mkdir -p ${DATA}
Expand Down
16 changes: 2 additions & 14 deletions jobs/JRRFS_PROCESS_LIGHTNING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,8 @@ preprocess with RRFS for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}

if [ ${CYCLE_TYPE} == "spinup" ]; then
if [ ${DO_ENSEMBLE} = TRUE ]; then
export jobid=${RUN}_process_lightning_enkf_spinup_${envir}_${cyc}
else
export jobid=${RUN}_process_lightning_spinup_${envir}_${cyc}
fi
else
if [ ${DO_ENSEMBLE} = TRUE ]; then
export jobid=${RUN}_process_lightning_enkf_${envir}_${cyc}
else
export jobid=${RUN}_process_lightning_${envir}_${cyc}
fi
fi
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export DATA=${DATAROOT}/${jobid}
mkdir -p ${DATA}
Expand Down
14 changes: 2 additions & 12 deletions jobs/JRRFS_PROCESS_RADAR
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,8 @@ preprocessing with RRFS for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}

if [ "${CYCLE_TYPE}" = "spinup" ]; then
export jobid=${RUN}_process_radar_spinup_${envir}_${cyc}
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
export jobid=${RUN}_process_radar_spinup_enkf_${envir}_${cyc}
fi
else
export jobid=${RUN}_process_radar_${envir}_${cyc}
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
export jobid=${RUN}_process_radar_enkf_${envir}_${cyc}
fi
fi
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export DATA=${DATAROOT}/${jobid}
mkdir -p ${DATA}
Expand Down
8 changes: 2 additions & 6 deletions jobs/JRRFS_PROCESS_SMOKE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,8 @@ for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}

if [ "${CYCLE_TYPE}" = "spinup" ]; then
export jobid=${RUN}_process_smoke_spinup_${envir}_${cyc}
else
export jobid=${RUN}_process_smoke_${envir}_${cyc}
fi
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export DATA=${DATAROOT}/${jobid}
mkdir -p ${DATA}
Expand Down
8 changes: 2 additions & 6 deletions jobs/JRRFS_RECENTER
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,11 @@ with RRFS for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

#export mem_num=m$(echo "${ENSMEM_INDX}")

export CYCLE_TYPE=${CYCLE_TYPE:-prod}
if [ "${CYCLE_TYPE}" = "spinup" ]; then
export jobid=${RUN}_recenter_spinup_${envir}_${cyc}
else
export jobid=${RUN}_recenter_${envir}_${cyc}
fi

export DATA=${DATAROOT}/${jobid}
rm -fr ${DATA}
Expand Down
8 changes: 5 additions & 3 deletions jobs/JRRFS_SAVE_DA_OUTPUT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ This is the J-job script for the task that saves DA analysis files to nwges.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")

Expand All @@ -66,15 +68,15 @@ export mem_num=m$(echo "${ENSMEM_INDX}")
export CYCLE_TYPE=${CYCLE_TYPE:-prod}
if [ "${CYCLE_TYPE}" = "prod" ]; then
if [ ${DO_ENSEMBLE} = "TRUE" ]; then
export DATA="${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}"
export DATA="${DATAROOT}/${jobid}"
export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast"
else
export DATA="${DATAROOT}/${RUN}_forecast_${envir}_${cyc}"
export DATA="${DATAROOT}/${jobid}"
export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast"
fi
fi
if [ ${CYCLE_TYPE} == "enfcst" ]; then
export DATA="${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}"
export DATA="${DATAROOT}/${jobid}"
export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_enfcst"
fi

Expand Down
1 change: 1 addition & 0 deletions jobs/JRRFS_SAVE_RESTART
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ This is the J-job script for the task that saves restart files to nwges.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
Expand Down
21 changes: 2 additions & 19 deletions jobs/JRRFS_UPDATE_LBC_SOIL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,12 @@ analysis with RRFS for the specified cycle.

export pid=${pid:-$$}
export RUN=${RUN:-rrfs}
#export jobid=${jobid:-${taskid}}
export jobid=${taskid}

export mem_num=m$(echo "${ENSMEM_INDX}")
export CYCLE_TYPE=${CYCLE_TYPE:-prod}

if [ "${CYCLE_TYPE}" = "spinup" ]; then
workname="gsi_spinup"
else
workname="gsi"
fi

if [[ ! -v OB_TYPE ]]; then
OB_TYPE="conv"
fi
if [ "${GSI_TYPE}" = "OBSERVER" ]; then
if [ "${MEM_TYPE}" = "MEAN" ]; then
export jobid=${RUN}_observer_${workname}_ensmean_${envir}_${cyc}
else
export jobid=${RUN}_observer_${workname}_${mem_num}_${envir}_${cyc}
fi
else
export jobid=${RUN}_analysis_${OB_TYPE}_${workname}_${envir}_${cyc}
fi

export DATA=${DATAROOT}/${jobid}

if [[ ! -d ${DATA} ]]; then
Expand Down
Loading
Loading