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.

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

Update JGDAS_ENKF_SFC job with COMIN/COMOUT prefix instead of COM #3291

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion jobs/JGDAS_ENKF_ARCHIVE
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc" -c "base earc"
##############################################
# Set variables used in the script
##############################################
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_TOP
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_TOP:COM_TOP_TMPL
MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \
Expand Down
9 changes: 5 additions & 4 deletions jobs/JGDAS_ENKF_SFC
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ export APREFIX_ENS="${RUN}.t${cyc}z."
export GPREFIX="${GDUMP}.t${gcyc}z."
export GPREFIX_ENS="${GDUMP_ENS}.t${gcyc}z."

RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS \
COM_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL
RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_OBS:COM_OBS_TMPL \
COMOUT_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL

RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
COM_OBS_PREV:COM_OBS_TMPL \
COM_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL
COMIN_OBS_PREV:COM_OBS_TMPL \
COMIN_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL

###############################################################
# Run relevant script
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgdas_enkf_earc.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def main():

# Also import all COMIN* directory and template variables
for key in archive.task_config.keys():
if key.startswith("COM"):
if key.startswith("COMIN"):
archive_dict[key] = archive.task_config[key]

cwd = os.getcwd()
Expand Down
36 changes: 18 additions & 18 deletions scripts/exgdas_enkf_sfc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ LONB_CASE=$((res*4))

# Global cycle requires these files
export FNTSFA=${FNTSFA:-' '}
export FNACNA=${FNACNA:-${COM_OBS}/${OPREFIX}seaice.5min.blend.grb}
export FNSNOA=${FNSNOA:-${COM_OBS}/${OPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}}
[[ ! -f $FNSNOA ]] && export FNSNOA="${COM_OBS}/${OPREFIX}snogrb_t1534.3072.1536"
FNSNOG=${FNSNOG:-${COM_OBS_PREV}/${GPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}}
[[ ! -f $FNSNOG ]] && FNSNOG="${COM_OBS_PREV}/${GPREFIX}snogrb_t1534.3072.1536"
export FNACNA=${FNACNA:-${COMIN_OBS}/${OPREFIX}seaice.5min.blend.grb}
export FNSNOA=${FNSNOA:-${COMIN_OBS}/${OPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}}
[[ ! -f $FNSNOA ]] && export FNSNOA="${COMIN_OBS}/${OPREFIX}snogrb_t1534.3072.1536"
FNSNOG=${FNSNOG:-${COMIN_OBS_PREV}/${GPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}}
[[ ! -f $FNSNOG ]] && FNSNOG="${COMIN_OBS_PREV}/${GPREFIX}snogrb_t1534.3072.1536"

# Set CYCLVARS by checking grib date of current snogrb vs that of prev cycle
if [ ${RUN_GETGES:-"NO"} = "YES" ]; then
Expand All @@ -110,7 +110,7 @@ else
fi

if [ $DONST = "YES" ]; then
export NST_FILE=${NST_FILE:-${COM_ATMOS_ANALYSIS_DET}/${APREFIX}dtfanl.nc}
export NST_FILE=${NST_FILE:-${COMOUT_ATMOS_ANALYSIS_DET}/${APREFIX}dtfanl.nc}
else
export NST_FILE="NULL"
fi
Expand Down Expand Up @@ -138,13 +138,13 @@ if [ $DOIAU = "YES" ]; then
memchar="mem$cmem"

MEMDIR=${memchar} YMD=${PDY} HH=${cyc} declare_from_tmpl \
COM_ATMOS_RESTART_MEM:COM_ATMOS_RESTART_TMPL
COMOUT_ATMOS_RESTART_MEM:COM_ATMOS_RESTART_TMPL

MEMDIR=${gmemchar} RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl \
COMIN_ATMOS_RESTART_MEM_PREV:COM_ATMOS_RESTART_TMPL

MEMDIR=${memchar} YMD=${PDY} HH=${cyc} declare_from_tmpl \
COM_ATMOS_ANALYSIS_MEM:COM_ATMOS_ANALYSIS_TMPL
COMOUT_ATMOS_ANALYSIS_MEM:COM_ATMOS_ANALYSIS_TMPL

MEMDIR=${memchar} YMD=${PDY} HH=${cyc} declare_from_tmpl \
COMIN_SNOW_ANALYSIS_MEM:COM_SNOW_ANALYSIS_TMPL
Expand All @@ -156,7 +156,7 @@ if [ $DOIAU = "YES" ]; then
sfcdata_dir="${COMIN_ATMOS_RESTART_MEM_PREV}"
fi

[[ ${TILE_NUM} -eq 1 ]] && mkdir -p "${COM_ATMOS_RESTART_MEM}"
[[ ${TILE_NUM} -eq 1 ]] && mkdir -p "${COMOUT_ATMOS_RESTART_MEM}"
${NCP} "${sfcdata_dir}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
"${DATA}/fnbgsi.${cmem}"
${NCP} "${DATA}/fnbgsi.${cmem}" "${DATA}/fnbgso.${cmem}"
Expand All @@ -165,7 +165,7 @@ if [ $DOIAU = "YES" ]; then

if [[ ${GSI_SOILANAL} = "YES" ]]; then
FHR=6
${NCP} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
${NCP} "${COMOUT_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
"${DATA}/lnd_incr.${cmem}"
fi
done # ensembles
Expand All @@ -184,18 +184,18 @@ if [ $DOIAU = "YES" ]; then
memchar="mem$cmem"

MEMDIR=${memchar} YMD=${PDY} HH=${cyc} declare_from_tmpl \
COM_ATMOS_RESTART_MEM:COM_ATMOS_RESTART_TMPL
COMOUT_ATMOS_RESTART_MEM:COM_ATMOS_RESTART_TMPL

MEMDIR=${memchar} YMD=${PDY} HH=${cyc} declare_from_tmpl \
COM_ATMOS_ANALYSIS_MEM:COM_ATMOS_ANALYSIS_TMPL
COMOUT_ATMOS_ANALYSIS_MEM:COM_ATMOS_ANALYSIS_TMPL

[[ ${TILE_NUM} -eq 1 ]] && mkdir -p "${COM_ATMOS_RESTART_MEM}"
cpfs "${DATA}/fnbgso.${cmem}" "${COM_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"
[[ ${TILE_NUM} -eq 1 ]] && mkdir -p "${COMOUT_ATMOS_RESTART_MEM}"
cpfs "${DATA}/fnbgso.${cmem}" "${COMOUT_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"


if [[ ${GSI_SOILANAL} = "YES" ]]; then
FHR=6
${NCP} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
${NCP} "${COMOUT_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
"${DATA}/lnd_incr.${cmem}"
fi
done # ensembles
Expand Down Expand Up @@ -254,11 +254,11 @@ if [ $DOSFCANL_ENKF = "YES" ]; then
memchar="mem${cmem}"

MEMDIR=${memchar} YMD=${PDY} HH=${cyc} declare_from_tmpl \
COM_ATMOS_RESTART_MEM:COM_ATMOS_RESTART_TMPL
COMOUT_ATMOS_RESTART_MEM:COM_ATMOS_RESTART_TMPL

[[ ! -d "${COM_ATMOS_RESTART_MEM}" ]] && mkdir -p "${COM_ATMOS_RESTART_MEM}"
[[ ! -d "${COMOUT_ATMOS_RESTART_MEM}" ]] && mkdir -p "${COMOUT_ATMOS_RESTART_MEM}"

cpfs "${DATA}/fnbgso.${cmem}" "${COM_ATMOS_RESTART_MEM}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"
cpfs "${DATA}/fnbgso.${cmem}" "${COMOUT_ATMOS_RESTART_MEM}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"

done

Expand Down