From c939f4607cbf7b558e4732363e854e3080ff3409 Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Mon, 31 Mar 2025 10:09:20 -0400 Subject: [PATCH 1/5] changes to archiving --- jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE | 1 + parm/archive/gdas.yaml.j2 | 27 +++++++++++++++++++++ parm/archive/gdas_restarta.yaml.j2 | 14 ----------- parm/gdas/aero_finalize_variational.yaml.j2 | 2 +- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE index dafb290c375..0c3ff880d35 100755 --- a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE +++ b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE @@ -16,6 +16,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlfinal" -c "base aeroanl aeroan # Generate COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMOUT_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \ + COMOUT_CONF:COM_CONF_TMPL \ COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL ############################################################### diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2 index 1cba9f8a658..505c34d8caa 100644 --- a/parm/archive/gdas.yaml.j2 +++ b/parm/archive/gdas.yaml.j2 @@ -30,6 +30,15 @@ gdas: - "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalecen.log" {% endif %} {% endif %} + {% if DO_AERO_ANL %} + - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlgenb.log" + - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlinit.log" + - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlvar.log" + - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlfinal.log" + {% endif %} + {% if DO_JEDISNOWDA %} + - "logs/{{ cycle_YMDH }}/{{ RUN }}_snowanl.log" + {% endif %} # Analysis GRIB2 (sub-sampled) data - "{{ COMIN_ATMOS_GRIB_0p25 | relpath(ROTDIR) }}/{{ head }}pgrb2.0p25.anl" @@ -70,6 +79,10 @@ gdas: {% endif %} {% if DO_AERO_ANL %} - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aerostat.tgz" + - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}aerovar.yaml" + {% for itile in range(1,7) %} + - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.fv_tracer.res.tile{{ itile }}.nc" + {% endfor %} {% endif %} {% if DO_PREP_OBS_AERO %} - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aeroobs" @@ -79,6 +92,20 @@ gdas: - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat.tgz" {% endif %} + # Snow surface data + {% if DO_JEDISNOWDA %} + {% for itile in range(1,7) %} + # Snow analysis is 3dvar + - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc" + - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc" + {% endfor %} + {% endif %} + + # Snow configuration yaml + {% if DO_JEDISNOWDA %} + - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml" + {% endif %} + # Ozone verification {% if DO_VERFOZN %} - "{{ COMIN_ATMOS_OZNMON | relpath(ROTDIR) }}/time/bad_cnt.{{ cycle_YMDH }}" diff --git a/parm/archive/gdas_restarta.yaml.j2 b/parm/archive/gdas_restarta.yaml.j2 index 46eea018c61..252aa748959 100644 --- a/parm/archive/gdas_restarta.yaml.j2 +++ b/parm/archive/gdas_restarta.yaml.j2 @@ -42,20 +42,6 @@ gdas_restarta: - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}rad_varbc_params.tar" {% endif %} - # Snow surface data - {% if DO_JEDISNOWDA %} - {% for itile in range(1,7) %} - # Snow analysis is 3dvar - - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc" - - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc" - {% endfor %} - {% endif %} - - # Snow configuration yaml - {% if DO_JEDISNOWDA %} - - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml" - {% endif %} - # Input BUFR files - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}nsstbufr" - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}prepbufr" diff --git a/parm/gdas/aero_finalize_variational.yaml.j2 b/parm/gdas/aero_finalize_variational.yaml.j2 index 67deb413017..8a185257085 100644 --- a/parm/gdas/aero_finalize_variational.yaml.j2 +++ b/parm/gdas/aero_finalize_variational.yaml.j2 @@ -12,7 +12,7 @@ mkdir: - "{{ COMOUT_ATMOS_RESTART }}" copy: ## copy variational YAML to ROTDIR -- ["{{ DATA }}/aeroanlvar.yaml", "{{ COMOUT_CHEM_ANALYSIS }}/{{ APREFIX }}aerovar.yaml"] +- ["{{ DATA }}/aeroanlvar.yaml", "{{ COMOUT_CONF }}/{{ APREFIX }}aerovar.yaml"] ## copy increments {% for tile in range(1,ntiles+1) %} - ["{{ DATA }}/anl/aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc", "{{ COMOUT_CHEM_ANALYSIS }}/aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc"] From d57151b508524bc62c8cb85a5d9d568ce2f09927 Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Tue, 1 Apr 2025 20:11:29 +0000 Subject: [PATCH 2/5] Update parm/archive/gdas.yaml.j2 Cleaner timestamp Co-authored-by: Rahul Mahajan --- parm/archive/gdas.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2 index 505c34d8caa..793dc1e4d09 100644 --- a/parm/archive/gdas.yaml.j2 +++ b/parm/archive/gdas.yaml.j2 @@ -81,7 +81,7 @@ gdas: - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aerostat.tgz" - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}aerovar.yaml" {% for itile in range(1,7) %} - - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.fv_tracer.res.tile{{ itile }}.nc" + - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ current_cycle | strftime('%Y%m%d.%H0000') }}.fv_tracer.res.tile{{ itile }}.nc" {% endfor %} {% endif %} {% if DO_PREP_OBS_AERO %} From f2fafceb470587c6d5b8badf745ad478b829d291 Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Tue, 1 Apr 2025 20:27:47 +0000 Subject: [PATCH 3/5] Revert suggestion --- parm/archive/gdas.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2 index 793dc1e4d09..505c34d8caa 100644 --- a/parm/archive/gdas.yaml.j2 +++ b/parm/archive/gdas.yaml.j2 @@ -81,7 +81,7 @@ gdas: - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aerostat.tgz" - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}aerovar.yaml" {% for itile in range(1,7) %} - - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ current_cycle | strftime('%Y%m%d.%H0000') }}.fv_tracer.res.tile{{ itile }}.nc" + - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.fv_tracer.res.tile{{ itile }}.nc" {% endfor %} {% endif %} {% if DO_PREP_OBS_AERO %} From a59f20d7a97fe618c62e205dcce47204c9f99c39 Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Wed, 2 Apr 2025 08:46:23 -0400 Subject: [PATCH 4/5] condense snow files in template --- parm/archive/gdas.yaml.j2 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2 index 505c34d8caa..cd0cea469d6 100644 --- a/parm/archive/gdas.yaml.j2 +++ b/parm/archive/gdas.yaml.j2 @@ -88,23 +88,16 @@ gdas: - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aeroobs" - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aerorawobs" {% endif %} - {% if DO_JEDISNOWDA %} - - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat.tgz" - {% endif %} - # Snow surface data - {% if DO_JEDISNOWDA %} - {% for itile in range(1,7) %} - # Snow analysis is 3dvar + # Snow analysis data + {% if DO_JEDISNOWDA %} + {% for itile in range(1,7) %} - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc" - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc" - {% endfor %} - {% endif %} - - # Snow configuration yaml - {% if DO_JEDISNOWDA %} + {% endfor %} + - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat.tgz" - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml" - {% endif %} + {% endif %} # Ozone verification {% if DO_VERFOZN %} From c5b1c56de0a0e58d50816a8266eb8a31c55035f3 Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Fri, 4 Apr 2025 08:38:42 -0400 Subject: [PATCH 5/5] Update parm/archive/gdas.yaml.j2 Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com> --- parm/archive/gdas.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2 index cd0cea469d6..3ae20cb096f 100644 --- a/parm/archive/gdas.yaml.j2 +++ b/parm/archive/gdas.yaml.j2 @@ -31,7 +31,7 @@ gdas: {% endif %} {% endif %} {% if DO_AERO_ANL %} - - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlgenb.log" + - "logs/{{ cycle_YMDH }}/gdas_aeroanlgenb.log" - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlinit.log" - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlvar.log" - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlfinal.log"