From 91969c36f212790f3eb7cc2c5939837359407563 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Mon, 12 Aug 2024 09:53:35 -0500 Subject: [PATCH 01/17] changing COM_ into COMIN --- jobs/JGLOBAL_ATMOS_UPP | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index 1aa62cdbb3..f38179e01d 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -12,8 +12,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp" ############################################## # Construct COM variables from templates -YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS COM_ATMOS_HISTORY COM_ATMOS_MASTER -if [[ ! -d ${COM_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COM_ATMOS_MASTER}"; fi +YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_ATMOS_ANALYSIS COMIN_ATMOS_HISTORY COMIN_ATMOS_MASTER +if [[ ! -d ${COMIN_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COMIN_ATMOS_MASTER}"; fi ############################################################### From f93185c6adc81ceef22e7c20cf379a7694fa4c3f Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Mon, 12 Aug 2024 09:56:01 -0500 Subject: [PATCH 02/17] changing COM_ into COMIN_ --- scripts/exglobal_atmos_upp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/exglobal_atmos_upp.py b/scripts/exglobal_atmos_upp.py index 6cdbc1bc51..4e4ee7d2f3 100755 --- a/scripts/exglobal_atmos_upp.py +++ b/scripts/exglobal_atmos_upp.py @@ -19,7 +19,7 @@ def main(): # Pull out all the configuration keys needed to run the rest of UPP steps keys = ['HOMEgfs', 'DATA', 'current_cycle', 'RUN', 'NET', - 'COM_ATMOS_ANALYSIS', 'COM_ATMOS_HISTORY', 'COM_ATMOS_MASTER', + 'COMIN_ATMOS_ANALYSIS', 'COMIN_ATMOS_HISTORY', 'COMIN_ATMOS_MASTER', 'upp_run', 'APRUN_UPP', 'forecast_hour', 'valid_datetime', From e4446c6372f0498d5668df0d93eace5ca396797d Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Thu, 15 Aug 2024 15:57:57 -0500 Subject: [PATCH 03/17] change COMIN_ATMOS_MASTER into COMOUT_ATMOS_MASTER --- jobs/JGLOBAL_ATMOS_UPP | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index f38179e01d..35e6daad46 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -12,8 +12,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp" ############################################## # Construct COM variables from templates -YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_ATMOS_ANALYSIS COMIN_ATMOS_HISTORY COMIN_ATMOS_MASTER -if [[ ! -d ${COMIN_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COMIN_ATMOS_MASTER}"; fi +YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_ATMOS_ANALYSIS COMIN_ATMOS_HISTORY COMOUT_ATMOS_MASTER +if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COMOUT_ATMOS_MASTER}"; fi ############################################################### From d842dd8bd1414c0b2fbb12fcc4a1712f332823e6 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Thu, 15 Aug 2024 16:04:30 -0500 Subject: [PATCH 04/17] change COMIN_ATMOS_MASTER into COMOUT_ATMOS_MASTER --- scripts/exglobal_atmos_upp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/exglobal_atmos_upp.py b/scripts/exglobal_atmos_upp.py index 4e4ee7d2f3..f87f06d2c9 100755 --- a/scripts/exglobal_atmos_upp.py +++ b/scripts/exglobal_atmos_upp.py @@ -19,7 +19,7 @@ def main(): # Pull out all the configuration keys needed to run the rest of UPP steps keys = ['HOMEgfs', 'DATA', 'current_cycle', 'RUN', 'NET', - 'COMIN_ATMOS_ANALYSIS', 'COMIN_ATMOS_HISTORY', 'COMIN_ATMOS_MASTER', + 'COMIN_ATMOS_ANALYSIS', 'COMIN_ATMOS_HISTORY', 'COMOUT_ATMOS_MASTER', 'upp_run', 'APRUN_UPP', 'forecast_hour', 'valid_datetime', From f29684044042adde631f7c55ba88e4b977dbf22f Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Thu, 15 Aug 2024 16:24:18 -0500 Subject: [PATCH 05/17] changing COM/ into COMIN/ or COMOUT/ --- ush/python/pygfs/task/upp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ush/python/pygfs/task/upp.py b/ush/python/pygfs/task/upp.py index 7e42e07c64..009223db50 100644 --- a/ush/python/pygfs/task/upp.py +++ b/ush/python/pygfs/task/upp.py @@ -249,7 +249,7 @@ def _call_executable(exec_cmd: Executable) -> None: @logit(logger) def finalize(upp_run: Dict, upp_yaml: Dict) -> None: """Perform closing actions of the task. - Copy data back from the DATA/ directory to COM/ + Copy data back from the DATA/ directory to COMIN/ or COMOUT/ Parameters ---------- @@ -259,6 +259,6 @@ def finalize(upp_run: Dict, upp_yaml: Dict) -> None: Fully resolved upp.yaml dictionary """ - # Copy "upp_run" specific generated data to COM/ directory - logger.info(f"Copy '{upp_run}' processed data to COM/ directory") + # Copy "upp_run" specific generated data to COMIN/ or COMOUT/ directory + logger.info(f"Copy '{upp_run}' processed data to COMIN/ or COMOUT/ directory") FileHandler(upp_yaml[upp_run].data_out).sync() From ba61fad3bb0d6482f2481a56b4b3f9e66709c2e7 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Thu, 15 Aug 2024 16:38:22 -0500 Subject: [PATCH 06/17] update COM_ into COMIN_ or COMOUT_ --- parm/post/upp.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/parm/post/upp.yaml b/parm/post/upp.yaml index a39e2be877..711bfa5d42 100644 --- a/parm/post/upp.yaml +++ b/parm/post/upp.yaml @@ -19,12 +19,12 @@ analysis: data_in: copy: - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-ANL.txt", "{{ DATA }}/postxconfig-NT.txt"] - - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmanl.nc", "{{ DATA }}/{{ atmos_filename }}"] - - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcanl.nc", "{{ DATA }}/{{ flux_filename }}"] + - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmanl.nc", "{{ DATA }}/{{ atmos_filename }}"] + - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcanl.nc", "{{ DATA }}/{{ flux_filename }}"] data_out: copy: - - ["{{ DATA }}/GFSPRS.GrbF00", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2anl"] - - ["{{ DATA }}/GFSPRS.GrbF00.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2ianl"] + - ["{{ DATA }}/GFSPRS.GrbF00", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2anl"] + - ["{{ DATA }}/GFSPRS.GrbF00.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2ianl"] forecast: config: @@ -36,14 +36,14 @@ forecast: {% else %} - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-TWO.txt", "{{ DATA }}/postxconfig-NT.txt"] {% endif %} - - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"] - - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] + - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"] + - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] data_out: copy: - - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2f{{ '%03d' % forecast_hour }}"] - - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2"] - - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2if{{ '%03d' % forecast_hour }}"] - - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2.idx"] + - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2f{{ '%03d' % forecast_hour }}"] + - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2"] + - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2if{{ '%03d' % forecast_hour }}"] + - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2.idx"] goes: config: @@ -82,9 +82,9 @@ goes: - ["{{ 'CRTM_FIX' | getenv }}/AerosolCoeff.bin", "{{ DATA }}/"] - ["{{ 'CRTM_FIX' | getenv }}/CloudCoeff.bin", "{{ DATA }}/"] - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-GOES.txt", "{{ DATA }}/postxconfig-NT.txt"] - - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"] - - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] + - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"] + - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] data_out: copy: - - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2f{{ '%03d' % forecast_hour }}"] - - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2if{{ '%03d' % forecast_hour }}"] + - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2f{{ '%03d' % forecast_hour }}"] + - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2if{{ '%03d' % forecast_hour }}"] From 668cfbd1eeaba921f3365403f2b64532eb54eeb8 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Wed, 28 Aug 2024 14:48:23 +0000 Subject: [PATCH 07/17] change COM to COMIN or COMOUT with explicitly specifying the template --- jobs/JGLOBAL_ATMOS_UPP | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index 35e6daad46..16fd5a056c 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -12,7 +12,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp" ############################################## # Construct COM variables from templates -YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_ATMOS_ANALYSIS COMIN_ATMOS_HISTORY COMOUT_ATMOS_MASTER +YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY \ + COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COMOUT_ATMOS_MASTER}"; fi From 4b08226b151876907b0e7ac5a2c22f0f8e6e6548 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Wed, 28 Aug 2024 14:58:37 +0000 Subject: [PATCH 08/17] gdas.cd and ufs_model.fd have been updated --- sorc/gdas.cd | 2 +- sorc/ufs_model.fd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 0431b26650..f3fa26d4d6 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 0431b26650c5e5d4eb741304a05c841d3fda0ddc +Subproject commit f3fa26d4d6693fcf451184d5ecabb86c1b4190ca diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index ee4f19a0a6..c12760125c 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit ee4f19a0a630fc2245a313bfe20302b5a6b555aa +Subproject commit c12760125ce7c5a85e8ced92d7f37c9ad6a59afe From 06ed6749ba66fc2735de79889ad7ca580c07a67e Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Wed, 28 Aug 2024 19:08:20 +0000 Subject: [PATCH 09/17] remove COMIN, only keep COMOUT --- ush/python/pygfs/task/upp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ush/python/pygfs/task/upp.py b/ush/python/pygfs/task/upp.py index 009223db50..51c8ee32ae 100644 --- a/ush/python/pygfs/task/upp.py +++ b/ush/python/pygfs/task/upp.py @@ -249,7 +249,7 @@ def _call_executable(exec_cmd: Executable) -> None: @logit(logger) def finalize(upp_run: Dict, upp_yaml: Dict) -> None: """Perform closing actions of the task. - Copy data back from the DATA/ directory to COMIN/ or COMOUT/ + Copy data back from the DATA/ directory to COMOUT/ Parameters ---------- @@ -259,6 +259,6 @@ def finalize(upp_run: Dict, upp_yaml: Dict) -> None: Fully resolved upp.yaml dictionary """ - # Copy "upp_run" specific generated data to COMIN/ or COMOUT/ directory - logger.info(f"Copy '{upp_run}' processed data to COMIN/ or COMOUT/ directory") + # Copy "upp_run" specific generated data to COMOUT/ directory + logger.info(f"Copy '{upp_run}' processed data to COMOUT/ directory") FileHandler(upp_yaml[upp_run].data_out).sync() From 70d6e15fb42edd784fa6b0e99b25eb107a21886b Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Thu, 29 Aug 2024 13:59:22 -0500 Subject: [PATCH 10/17] modified indent space --- jobs/JGLOBAL_ATMOS_UPP | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index 16fd5a056c..2099335082 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -13,9 +13,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp" # Construct COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY \ - COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY \ + COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COMOUT_ATMOS_MASTER}"; fi From 09871b2476baa85dc417511f744a05264beef35d Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Thu, 29 Aug 2024 14:03:50 -0500 Subject: [PATCH 11/17] update gdas.cd wxflow --- sorc/gdas.cd | 2 +- sorc/wxflow | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index f3fa26d4d6..52f41a298b 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit f3fa26d4d6693fcf451184d5ecabb86c1b4190ca +Subproject commit 52f41a298b4c6b7bbf6f203b6579516819fbbf36 diff --git a/sorc/wxflow b/sorc/wxflow index e1ef697430..d314e06510 160000 --- a/sorc/wxflow +++ b/sorc/wxflow @@ -1 +1 @@ -Subproject commit e1ef697430c09d2b1a0560f21f11c7a32ed5f3e2 +Subproject commit d314e065101041a4d45e5a11ec19cd2dc5f38c67 From 5c74d5c8937abe784e1bea4fb725de72b7820c45 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Tue, 10 Sep 2024 09:59:37 -0500 Subject: [PATCH 12/17] recover the add gdas.cd ufs_model.fd --- sorc/gdas.cd | 2 +- sorc/ufs_model.fd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 52f41a298b..faa95efb18 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 52f41a298b4c6b7bbf6f203b6579516819fbbf36 +Subproject commit faa95efb18f0f52acab2cf09b17f78406f9b48b1 diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index c12760125c..fcc9f8461d 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit c12760125ce7c5a85e8ced92d7f37c9ad6a59afe +Subproject commit fcc9f8461db5eafbfd1f080da61ea79156ca0145 From 99536e12d3755305d5ad25c748277eb0f147e3f9 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Tue, 10 Sep 2024 11:38:41 -0500 Subject: [PATCH 13/17] recover wxflow --- sorc/wxflow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/wxflow b/sorc/wxflow index d314e06510..e1ef697430 160000 --- a/sorc/wxflow +++ b/sorc/wxflow @@ -1 +1 @@ -Subproject commit d314e065101041a4d45e5a11ec19cd2dc5f38c67 +Subproject commit e1ef697430c09d2b1a0560f21f11c7a32ed5f3e2 From f2c099f4c0fa3b07342e0a7e1944e211cd36c328 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Wed, 11 Sep 2024 14:46:37 -0500 Subject: [PATCH 14/17] removed -m 755 --- jobs/JGLOBAL_ATMOS_UPP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index 2099335082..6cb83df756 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -16,7 +16,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY \ COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER -if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COMOUT_ATMOS_MASTER}"; fi +if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -p "${COMOUT_ATMOS_MASTER}"; fi ############################################################### From c4592907d1533f71ed160db904a476a7e582817d Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Wed, 11 Sep 2024 16:36:11 -0500 Subject: [PATCH 15/17] resolve conflicts of upp.yaml --- parm/post/upp.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/parm/post/upp.yaml b/parm/post/upp.yaml index cead3b0fcc..b96d5ffdeb 100644 --- a/parm/post/upp.yaml +++ b/parm/post/upp.yaml @@ -18,15 +18,9 @@ analysis: rdaod: True data_in: copy: -<<<<<<< HEAD - - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-ANL.txt", "{{ DATA }}/postxconfig-NT.txt"] + - ["{{ PARMgfs }}/post/gfs/postxconfig-NT-gfs-anl.txt", "{{ DATA }}/postxconfig-NT.txt"] - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmanl.nc", "{{ DATA }}/{{ atmos_filename }}"] - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcanl.nc", "{{ DATA }}/{{ flux_filename }}"] -======= - - ["{{ PARMgfs }}/post/gfs/postxconfig-NT-gfs-anl.txt", "{{ DATA }}/postxconfig-NT.txt"] - - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmanl.nc", "{{ DATA }}/{{ atmos_filename }}"] - - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcanl.nc", "{{ DATA }}/{{ flux_filename }}"] ->>>>>>> 0953c0f38efb5fbe425520dc40b24dcfdd33a98f data_out: copy: - ["{{ DATA }}/GFSPRS.GrbF00", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2anl"] @@ -87,7 +81,7 @@ goes: {% endfor %} - ["{{ 'CRTM_FIX' | getenv }}/AerosolCoeff.bin", "{{ DATA }}/"] - ["{{ 'CRTM_FIX' | getenv }}/CloudCoeff.bin", "{{ DATA }}/"] - - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-GOES.txt", "{{ DATA }}/postxconfig-NT.txt"] + - ["{{ PARMgfs }}/post/gfs/postxconfig-NT-gfs-goes.txt", "{{ DATA }}/postxconfig-NT.txt"] - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"] - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] data_out: From de934ee87c9171bd6b4115c71d37f22061de9d13 Mon Sep 17 00:00:00 2001 From: Mingshi Chen Date: Fri, 13 Sep 2024 13:25:27 -0500 Subject: [PATCH 16/17] adding _TMPL on suffix of COM_ATMOS_HISTORY and COM_ATMOS_MASTER --- jobs/JGLOBAL_ATMOS_UPP | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index 6cb83df756..0e70e97025 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -14,8 +14,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp" # Construct COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY \ - COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER + COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ + COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -p "${COMOUT_ATMOS_MASTER}"; fi From 90f67abe0d50de569a9e72a00620dfba9a96701f Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Sat, 14 Sep 2024 10:39:14 -0400 Subject: [PATCH 17/17] Update parm/post/upp.yaml --- parm/post/upp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/post/upp.yaml b/parm/post/upp.yaml index b96d5ffdeb..dd9aed3358 100644 --- a/parm/post/upp.yaml +++ b/parm/post/upp.yaml @@ -86,5 +86,5 @@ goes: - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] data_out: copy: - - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2f{{ '%03d' % forecast_hour }}"] - - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2if{{ '%03d' % forecast_hour }}"] + - ["{{ DATA }}/GFSGOES.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2f{{ '%03d' % forecast_hour }}"] + - ["{{ DATA }}/GFSGOES.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2if{{ '%03d' % forecast_hour }}"]