From de7ac3a07c668cf9b1917a228b916bca42a3633b Mon Sep 17 00:00:00 2001 From: "Anton.Fernando" Date: Thu, 24 Oct 2024 15:29:19 -0400 Subject: [PATCH 1/8] modified JGLOBAL_ATMOS_ANALYSIS --- jobs/JGLOBAL_ATMOS_ANALYSIS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS index 5776aa6d13..87d0eaa7e1 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS @@ -38,11 +38,11 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COM_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COM_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL + COMOUT_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL mkdir -m 775 -p "${COM_ATMOS_ANALYSIS}" -export ATMGES="${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" +export ATMGES="${COMOUT_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" if [ ! -f ${ATMGES} ]; then echo "FATAL ERROR: FILE MISSING: ATMGES = ${ATMGES}" exit 1 From 577145d2079af9adc43457ba87eec82f2147b38c Mon Sep 17 00:00:00 2001 From: "Anton.Fernando" Date: Thu, 24 Oct 2024 15:32:27 -0400 Subject: [PATCH 2/8] modify JGLOBAL_ATM_ANALYSIS_INITIALIZE --- jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE index 5b26483922..da6bf68a48 100755 --- a/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE +++ b/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE @@ -28,7 +28,7 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COM_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL + COMOUT_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL mkdir -m 775 -p "${COM_ATMOS_ANALYSIS}" From dab0064d80247ba80b1ea97d1f17e19eec1a5523 Mon Sep 17 00:00:00 2001 From: "Anton.Fernando" Date: Thu, 24 Oct 2024 15:34:39 -0400 Subject: [PATCH 3/8] modifed scripts\exglobal_atmos_analysis.sh --- scripts/exglobal_atmos_analysis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh index 932adf8e10..707ed821c9 100755 --- a/scripts/exglobal_atmos_analysis.sh +++ b/scripts/exglobal_atmos_analysis.sh @@ -242,8 +242,8 @@ JCAP=${JCAP:--9999} # there is no jcap in these files # Get header information from Ensemble Guess files if [ ${DOHYBVAR} = "YES" ]; then - SFCGES_ENSMEAN=${SFCGES_ENSMEAN:-${COM_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}sfcf006.ensmean.nc} - export ATMGES_ENSMEAN=${ATMGES_ENSMEAN:-${COM_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}atmf006.ensmean.nc} + SFCGES_ENSMEAN=${SFCGES_ENSMEAN:-${COMOUT_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}sfcf006.ensmean.nc} + export ATMGES_ENSMEAN=${ATMGES_ENSMEAN:-${COMOUT_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}atmf006.ensmean.nc} LONB_ENKF=${LONB_ENKF:-$(${NCLEN} ${ATMGES_ENSMEAN} grid_xt)} # get LONB_ENKF LATB_ENKF=${LATB_ENKF:-$(${NCLEN} ${ATMGES_ENSMEAN} grid_yt)} # get LATB_ENFK LEVS_ENKF=${LEVS_ENKF:-$(${NCLEN} ${ATMGES_ENSMEAN} pfull)} # get LATB_ENFK From e61b8c896812cc23a6ed44aefb05dcb466f4bc26 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 5 Nov 2024 11:32:02 -0500 Subject: [PATCH 4/8] modified JGLOBAL_ATMENS_ANALYSIS_FINALIZE variable --- jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE | 4 ++-- ush/python/pygfs/task/atmens_analysis.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE b/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE index 549e087694..b289a0ef71 100755 --- a/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE +++ b/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE @@ -16,9 +16,9 @@ GDUMP_ENS="enkf${GDUMP}" ############################################## # Generate COM variable from template MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COM_ATMOS_ANALYSIS_ENS:COM_ATMOS_ANALYSIS_TMPL + COMOUT_ATMOS_ANALYSIS_ENS:COM_ATMOS_ANALYSIS_TMPL -mkdir -m 755 -p "${COM_ATMOS_ANALYSIS_ENS}" +mkdir -m 755 -p "${COMOUT_ATMOS_ANALYSIS_ENS}" ############################################################### # Run relevant script diff --git a/ush/python/pygfs/task/atmens_analysis.py b/ush/python/pygfs/task/atmens_analysis.py index 4b2f8ebbf4..f7a155a433 100644 --- a/ush/python/pygfs/task/atmens_analysis.py +++ b/ush/python/pygfs/task/atmens_analysis.py @@ -219,7 +219,7 @@ def finalize(self) -> None: # ---- tar up diags # path of output tar statfile - atmensstat = os.path.join(self.task_config.COM_ATMOS_ANALYSIS_ENS, f"{self.task_config.APREFIX}atmensstat") + atmensstat = os.path.join(self.task_config.COMOUT_ATMOS_ANALYSIS_ENS, f"{self.task_config.APREFIX}atmensstat") # get list of diag files to put in tarball diags = glob.glob(os.path.join(self.task_config.DATA, 'diags', 'diag*nc')) @@ -244,10 +244,10 @@ def finalize(self) -> None: # copy full YAML from executable to ROTDIR for src in yamls: - logger.info(f"Copying {src} to {self.task_config.COM_ATMOS_ANALYSIS_ENS}") + logger.info(f"Copying {src} to {self.task_config.COMOUT_ATMOS_ANALYSIS_ENS}") yaml_base = os.path.splitext(os.path.basename(src))[0] dest_yaml_name = f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.{yaml_base}.yaml" - dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS_ENS, dest_yaml_name) + dest = os.path.join(self.task_config.COMOUT_ATMOS_ANALYSIS_ENS, dest_yaml_name) logger.debug(f"Copying {src} to {dest}") yaml_copy = { 'copy': [[src, dest]] From 1d0c4adf5c3d507c3de8718ad901734d30833753 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 5 Nov 2024 12:36:21 -0500 Subject: [PATCH 5/8] discard changes COM_ATMOS_HISTORY_ENS_PREV --- jobs/JGLOBAL_ATMOS_ANALYSIS | 4 ++-- scripts/exglobal_atmos_analysis.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS index 87d0eaa7e1..5776aa6d13 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS @@ -38,11 +38,11 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COM_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL + COM_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL mkdir -m 775 -p "${COM_ATMOS_ANALYSIS}" -export ATMGES="${COMOUT_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" +export ATMGES="${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" if [ ! -f ${ATMGES} ]; then echo "FATAL ERROR: FILE MISSING: ATMGES = ${ATMGES}" exit 1 diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh index 707ed821c9..932adf8e10 100755 --- a/scripts/exglobal_atmos_analysis.sh +++ b/scripts/exglobal_atmos_analysis.sh @@ -242,8 +242,8 @@ JCAP=${JCAP:--9999} # there is no jcap in these files # Get header information from Ensemble Guess files if [ ${DOHYBVAR} = "YES" ]; then - SFCGES_ENSMEAN=${SFCGES_ENSMEAN:-${COMOUT_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}sfcf006.ensmean.nc} - export ATMGES_ENSMEAN=${ATMGES_ENSMEAN:-${COMOUT_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}atmf006.ensmean.nc} + SFCGES_ENSMEAN=${SFCGES_ENSMEAN:-${COM_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}sfcf006.ensmean.nc} + export ATMGES_ENSMEAN=${ATMGES_ENSMEAN:-${COM_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}atmf006.ensmean.nc} LONB_ENKF=${LONB_ENKF:-$(${NCLEN} ${ATMGES_ENSMEAN} grid_xt)} # get LONB_ENKF LATB_ENKF=${LATB_ENKF:-$(${NCLEN} ${ATMGES_ENSMEAN} grid_yt)} # get LATB_ENFK LEVS_ENKF=${LEVS_ENKF:-$(${NCLEN} ${ATMGES_ENSMEAN} pfull)} # get LATB_ENFK From 3ca6a0494b8ef71300b3f1055eafd9cb09fb1163 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 5 Nov 2024 12:39:54 -0500 Subject: [PATCH 6/8] modify jobs\JGLOBAL_ATM_ANALYSIS_INITIALIZE --- jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE index da6bf68a48..5b26483922 100755 --- a/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE +++ b/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE @@ -28,7 +28,7 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL + COM_ATMOS_HISTORY_ENS_PREV:COM_ATMOS_HISTORY_TMPL mkdir -m 775 -p "${COM_ATMOS_ANALYSIS}" From ddafea71d1d970d9fd25316be97ba48b27620279 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 5 Nov 2024 12:41:43 -0500 Subject: [PATCH 7/8] modified jobs\JGDAS_ENKF_SELECT_OBS --- jobs/JGDAS_ENKF_SELECT_OBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS index 3cfe48bb2b..d666bee00a 100755 --- a/jobs/JGDAS_ENKF_SELECT_OBS +++ b/jobs/JGDAS_ENKF_SELECT_OBS @@ -34,7 +34,7 @@ export GSUFFIX=".ensmean.nc" # Generate COM variables from templates RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS MEMDIR='ensstat' YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS -declare -rx COM_ATMOS_ANALYSIS_ENS="${COM_ATMOS_ANALYSIS}" +declare -rx COMOUT_ATMOS_ANALYSIS_ENS="${COM_ATMOS_ANALYSIS}" RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -r COM_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL From 2fb13a4d1d7eae9d716b8c2349a1ee69093844d3 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 5 Nov 2024 15:04:06 -0500 Subject: [PATCH 8/8] modified jobs\JGDAS_ENKF_SELECT_OBS --- jobs/JGDAS_ENKF_SELECT_OBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS index d666bee00a..3cfe48bb2b 100755 --- a/jobs/JGDAS_ENKF_SELECT_OBS +++ b/jobs/JGDAS_ENKF_SELECT_OBS @@ -34,7 +34,7 @@ export GSUFFIX=".ensmean.nc" # Generate COM variables from templates RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS MEMDIR='ensstat' YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS -declare -rx COMOUT_ATMOS_ANALYSIS_ENS="${COM_ATMOS_ANALYSIS}" +declare -rx COM_ATMOS_ANALYSIS_ENS="${COM_ATMOS_ANALYSIS}" RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -r COM_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL