From 92523d3b5e6375d4de9cd026c11c643db6291755 Mon Sep 17 00:00:00 2001 From: DavidHuber-NOAA Date: Wed, 29 Oct 2025 16:46:13 +0000 Subject: [PATCH 1/7] Update to EE2 standards for snow file names --- parm/analcalc/analcalc_config.yaml.j2 | 2 +- parm/anlstat/anlstat_base_config.yaml.j2 | 10 ++++----- parm/jcb-gdas | 2 +- parm/snow/snow_det_config.yaml.j2 | 24 +++++++++------------- parm/snow/snow_ens_config.yaml.j2 | 26 ++++++++++-------------- 5 files changed, 28 insertions(+), 36 deletions(-) diff --git a/parm/analcalc/analcalc_config.yaml.j2 b/parm/analcalc/analcalc_config.yaml.j2 index 2cf19aed1..ec03e064d 100644 --- a/parm/analcalc/analcalc_config.yaml.j2 +++ b/parm/analcalc/analcalc_config.yaml.j2 @@ -40,7 +40,7 @@ data_in: - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ itile+1 }}.nc', '{{ DATA }}'] {% endif %} {% if DO_JEDISNOWDA %} - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile{{ itile+1 }}.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ itile+1 }}.nc', '{{ DATA }}'] {% endif %} {% endfor %} diff --git a/parm/anlstat/anlstat_base_config.yaml.j2 b/parm/anlstat/anlstat_base_config.yaml.j2 index b446c45ba..997a70243 100644 --- a/parm/anlstat/anlstat_base_config.yaml.j2 +++ b/parm/anlstat/anlstat_base_config.yaml.j2 @@ -27,17 +27,17 @@ atmos: snow: stat_file_path: '{{ COMIN_SNOW_ANALYSIS }}' - stat_file_name: 'snowstat.tgz' + stat_file_name: 'snow_analysis.ioda_hofx_stats.tgz' obs spaces: - name: ims_snow input file: "diag_ims_snow_{{ current_cycle | to_YMDH }}.nc" - output file: "ims_snow_{{ current_cycle | to_YMDH }}_output_snow.nc" + output file: "{{ current_cycle | to_YMDH }}.ioda_hofx_stats.ims_snow.nc" - name: sfcsno input file: "diag_sfcsno_{{ current_cycle | to_YMDH }}.nc" - output file: "sfcsno_{{ current_cycle | to_YMDH }}_output_snow.nc" + output file: "{{ current_cycle | to_YMDH }}.ioda_hofx_stats.sfcsno.nc" - name: snocvr input file: "diag_snocvr_{{ current_cycle | to_YMDH }}.nc" - output file: "snocvr_{{ current_cycle | to_YMDH }}_output_snow.nc" + output file: "{{ current_cycle | to_YMDH }}.ioda_hofx_stats.snocvr.nc" - name: madis_snow input file: "diag_madis_snow_{{ current_cycle | to_YMDH }}.nc" - output file: "madis_snow_{{ current_cycle | to_YMDH }}_output_snow.nc" + output file: "{{ current_cycle | to_YMDH }}.ioda_hofx_stats.madis_snow.nc" diff --git a/parm/jcb-gdas b/parm/jcb-gdas index 18699d6ef..7c2a3a2be 160000 --- a/parm/jcb-gdas +++ b/parm/jcb-gdas @@ -1 +1 @@ -Subproject commit 18699d6ef425244468abf3c15a4a1ca112f8471e +Subproject commit 7c2a3a2bece6084c2a30a93da7805a4b49353192 diff --git a/parm/snow/snow_det_config.yaml.j2 b/parm/snow/snow_det_config.yaml.j2 index cbe61e88d..9a6e316c5 100644 --- a/parm/snow/snow_det_config.yaml.j2 +++ b/parm/snow/snow_det_config.yaml.j2 @@ -3,7 +3,7 @@ jedi_config: rundir: '{{ DATA }}' exe_src: '{{ EXECgfs }}/gdas.x' mpi_cmd: '{{ APRUN_SNOWANL }}' - jedi_args: ['fv3jedi', 'variational'] + jedi_args: ['fv3jedi', 'variational'] jcb_base_yaml: '{{ PARMgfs }}/gdas/snow/jcb-base.yaml.j2' jcb_algo_yaml: '{{ PARMgfs }}/gdas/snow/jcb-prototype_2dvar.yaml.j2' scf_to_ioda: @@ -59,14 +59,12 @@ data_out: {% if DO_IMS_SCF %} - ['{{ DATA }}/scf_to_ioda.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}scf_to_ioda.yaml'] {% endif %} - + # Increments - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile1.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile2.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile3.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile4.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile5.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile6.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] +{% for tile in range(1, ntiles+1) %} + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile{{ tile }}.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ tile }}.nc'] +{$ endfor %} {% if DOIAU %} {% set bkgtimes = [ current_cycle, WINDOW_BEGIN ] %} @@ -75,10 +73,8 @@ data_out: {% endif %} {% for bkgtime in bkgtimes %} # Analysis - - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile1.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile2.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile3.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile4.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile5.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile6.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] + {% for tile in range(1, ntiles+1) %} + - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile{{ tile }}.nc', + '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile{{ tile }}.nc'] + {$ endfor %} {% endfor %} diff --git a/parm/snow/snow_ens_config.yaml.j2 b/parm/snow/snow_ens_config.yaml.j2 index 0553cc49a..3249e56fd 100644 --- a/parm/snow/snow_ens_config.yaml.j2 +++ b/parm/snow/snow_ens_config.yaml.j2 @@ -3,14 +3,14 @@ jedi_config: rundir: '{{ DATA }}' exe_src: '{{ EXECgfs }}/gdas.x' mpi_cmd: '{{ APRUN_ESNOWANL }}' - jedi_args: ['fv3jedi', 'ensmean'] + jedi_args: ['fv3jedi', 'ensmean'] jcb_base_yaml: '{{ PARMgfs }}/gdas/snow/jcb-base.yaml.j2' - jcb_algo: 'fv3jedi_snow_ensmean' + jcb_algo: 'fv3jedi_snow_ensmean' snowanlvar: rundir: '{{ DATA }}' exe_src: '{{ EXECgfs }}/gdas.x' mpi_cmd: '{{ APRUN_ESNOWANL }}' - jedi_args: ['fv3jedi', 'variational'] + jedi_args: ['fv3jedi', 'variational'] jcb_base_yaml: '{{ PARMgfs }}/gdas/snow/jcb-base.yaml.j2' jcb_algo_yaml: '{{ PARMgfs }}/gdas/snow/jcb-prototype_2dvar.yaml.j2' scf_to_ioda: @@ -136,12 +136,10 @@ data_out: {% endif %} # Increments - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile1.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile2.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile3.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile4.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile5.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile6.nc', '{{ COMOUT_SNOW_ANALYSIS }}'] +{% for tile in range(1, ntiles+1) %} + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile{{ tile }}.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ tile }}.nc'] +{$ endfor %} {% if DOIAU %} {% set bkgtimes = [ current_cycle, WINDOW_BEGIN ] %} @@ -157,11 +155,9 @@ data_out: '${HH}': current_cycle | strftime('%H'), '${MEMDIR}': memchar }) %} # Analysis - - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile1.nc', '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/'] - - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile2.nc', '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/'] - - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile3.nc', '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/'] - - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile4.nc', '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/'] - - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile5.nc', '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/'] - - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile6.nc', '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/'] + {% for tile in range(1, ntiles+1) %} + - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile{{ tile }}.nc', + '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile{{ tile }}.nc'] + {$ endfor %} {% endfor %} {% endfor %} From b08e9f0b5199f52494cfd7cae07b0bbcf1d11f07 Mon Sep 17 00:00:00 2001 From: DavidHuber-NOAA Date: Wed, 29 Oct 2025 20:08:26 +0000 Subject: [PATCH 2/7] Explicitly name tiles --- parm/analcalc/analcalc_config.yaml.j2 | 23 +++++++--- parm/snow/snow_det_config.yaml.j2 | 32 ++++++++++---- parm/snow/snow_ens_config.yaml.j2 | 64 ++++++++++++++++++++------- 3 files changed, 90 insertions(+), 29 deletions(-) diff --git a/parm/analcalc/analcalc_config.yaml.j2 b/parm/analcalc/analcalc_config.yaml.j2 index ec03e064d..e68ca98dc 100644 --- a/parm/analcalc/analcalc_config.yaml.j2 +++ b/parm/analcalc/analcalc_config.yaml.j2 @@ -34,15 +34,28 @@ data_in: - ['{{ COMIN_ATMOS_HISTORY_PREV }}/{{ GPREFIX }}cubed_sphere_grid_atmf006.nc', '{{ DATA }}'] - ['{{ COMIN_ATMOS_HISTORY_PREV }}/{{ GPREFIX }}cubed_sphere_grid_sfcf006.nc', '{{ DATA }}'] -{% for itile in range(6) %} - - ['{{ COMIN_ATMOS_ANALYSIS }}/{{ APREFIX }}cubed_sphere_grid_atminc.tile{{ itile+1 }}.nc', '{{ DATA }}'] + - ['{{ COMIN_ATMOS_ANALYSIS }}/{{ APREFIX }}cubed_sphere_grid_atminc.tile1.nc', '{{ DATA }}'] + - ['{{ COMIN_ATMOS_ANALYSIS }}/{{ APREFIX }}cubed_sphere_grid_atminc.tile2.nc', '{{ DATA }}'] + - ['{{ COMIN_ATMOS_ANALYSIS }}/{{ APREFIX }}cubed_sphere_grid_atminc.tile3.nc', '{{ DATA }}'] + - ['{{ COMIN_ATMOS_ANALYSIS }}/{{ APREFIX }}cubed_sphere_grid_atminc.tile4.nc', '{{ DATA }}'] + - ['{{ COMIN_ATMOS_ANALYSIS }}/{{ APREFIX }}cubed_sphere_grid_atminc.tile5.nc', '{{ DATA }}'] + - ['{{ COMIN_ATMOS_ANALYSIS }}/{{ APREFIX }}cubed_sphere_grid_atminc.tile6.nc', '{{ DATA }}'] {% if DO_AERO_ANL %} - - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ itile+1 }}.nc', '{{ DATA }}'] + - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile1.nc', '{{ DATA }}'] + - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile2.nc', '{{ DATA }}'] + - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile3.nc', '{{ DATA }}'] + - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile4.nc', '{{ DATA }}'] + - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile5.nc', '{{ DATA }}'] + - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile6.nc', '{{ DATA }}'] {% endif %} {% if DO_JEDISNOWDA %} - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ itile+1 }}.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile1.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile2.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile3.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile4.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile5.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile6.nc', '{{ DATA }}'] {% endif %} -{% endfor %} {% filter indent(width=4) %} {% include PARMgfs ~ '/gdas/' ~ '/atm/' ~ 'atm_stage_jedi_fix.yaml.j2' %} diff --git a/parm/snow/snow_det_config.yaml.j2 b/parm/snow/snow_det_config.yaml.j2 index 9a6e316c5..66f9e8d92 100644 --- a/parm/snow/snow_det_config.yaml.j2 +++ b/parm/snow/snow_det_config.yaml.j2 @@ -61,10 +61,18 @@ data_out: {% endif %} # Increments -{% for tile in range(1, ntiles+1) %} - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile{{ tile }}.nc', - '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ tile }}.nc'] -{$ endfor %} + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile1.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile1.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile2.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile2.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile3.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile3.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile4.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile4.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile5.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile5.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile6.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile6.nc'] {% if DOIAU %} {% set bkgtimes = [ current_cycle, WINDOW_BEGIN ] %} @@ -73,8 +81,16 @@ data_out: {% endif %} {% for bkgtime in bkgtimes %} # Analysis - {% for tile in range(1, ntiles+1) %} - - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile{{ tile }}.nc', - '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile{{ tile }}.nc'] - {$ endfor %} + - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile1.nc', + '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile1.nc'] + - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile2.nc', + '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile2.nc'] + - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile3.nc', + '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile3.nc'] + - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile4.nc', + '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile4.nc'] + - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile5.nc', + '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile5.nc'] + - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile6.nc', + '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile6.nc'] {% endfor %} diff --git a/parm/snow/snow_ens_config.yaml.j2 b/parm/snow/snow_ens_config.yaml.j2 index 3249e56fd..942058693 100644 --- a/parm/snow/snow_ens_config.yaml.j2 +++ b/parm/snow/snow_ens_config.yaml.j2 @@ -53,17 +53,33 @@ data_in: # copy coupler file - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.coupler.res', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] # we need to copy them to two places, one serves as the basis for the analysis - {% for tile in range(1, ntiles+1) %} - - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile{{ tile }}.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] - - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile{{ tile }}.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] - {% endfor %} + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile1.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile2.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile3.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile4.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile5.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile6.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile1.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile2.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile3.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile4.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile5.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ current_cycle | to_fv3time }}.sfc_data.tile6.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] {% if DOIAU %} # if using IAU, also need backgrounds copied at the beginning of the window # we need to copy them to two places, one serves as the basis for the analysis - {% for tile in range(1, ntiles+1) %} - - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile{{ tile }}.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] - - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile{{ tile }}.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] - {% endfor %} + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile1.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile2.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile3.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile4.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile5.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile6.nc', '{{ DATA }}/bkg/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile1.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile2.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile3.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile4.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile5.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] + - ['{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ WINDOW_BEGIN | to_fv3time }}.sfc_data.tile6.nc', '{{ DATA }}/anl/mem{{ '%03d' % mem }}/'] {% endif %} {% endfor %} @@ -136,10 +152,18 @@ data_out: {% endif %} # Increments -{% for tile in range(1, ntiles+1) %} - - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile{{ tile }}.nc', - '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ tile }}.nc'] -{$ endfor %} + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile1.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile1.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile2.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile2.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile3.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile3.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile4.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile4.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile5.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile5.nc'] + - ['{{ DATA }}/anl/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile6.nc', + '{{ COMOUT_SNOW_ANALYSIS }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile6.nc'] {% if DOIAU %} {% set bkgtimes = [ current_cycle, WINDOW_BEGIN ] %} @@ -155,9 +179,17 @@ data_out: '${HH}': current_cycle | strftime('%H'), '${MEMDIR}': memchar }) %} # Analysis - {% for tile in range(1, ntiles+1) %} - - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile{{ tile }}.nc', - '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile{{ tile }}.nc'] - {$ endfor %} + - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile1.nc', + '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile1.nc'] + - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile2.nc', + '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile2.nc'] + - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile3.nc', + '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile3.nc'] + - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile4.nc', + '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile4.nc'] + - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile5.nc', + '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile5.nc'] + - ['{{ DATA }}/anl/{{ memchar }}/{{ bkgtime | to_fv3time }}.sfc_data.tile6.nc', + '{{ COM_SNOW_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile6.nc'] {% endfor %} {% endfor %} From 529457d8222aa05eb8821568ba8763a234a13352 Mon Sep 17 00:00:00 2001 From: DavidHuber-NOAA Date: Wed, 29 Oct 2025 21:19:07 +0000 Subject: [PATCH 3/7] Fix analcalc output targets --- parm/analcalc/analcalc_config.yaml.j2 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/parm/analcalc/analcalc_config.yaml.j2 b/parm/analcalc/analcalc_config.yaml.j2 index e68ca98dc..10f082ed1 100644 --- a/parm/analcalc/analcalc_config.yaml.j2 +++ b/parm/analcalc/analcalc_config.yaml.j2 @@ -49,12 +49,18 @@ data_in: - ['{{ COMIN_AERO_ANALYSIS }}/{{ APREFIX }}aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile6.nc', '{{ DATA }}'] {% endif %} {% if DO_JEDISNOWDA %} - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile1.nc', '{{ DATA }}'] - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile2.nc', '{{ DATA }}'] - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile3.nc', '{{ DATA }}'] - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile4.nc', '{{ DATA }}'] - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile5.nc', '{{ DATA }}'] - - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile6.nc', '{{ DATA }}'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile1.nc', + '{{ DATA }}/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile1.nc'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile2.nc', + '{{ DATA }}/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile2.nc'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile3.nc', + '{{ DATA }}/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile3.nc'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile4.nc', + '{{ DATA }}/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile4.nc'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile5.nc', + '{{ DATA }}/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile5.nc'] + - ['{{ COMIN_SNOW_ANALYSIS }}/{{ APREFIX }}{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile6.nc', + '{{ DATA }}/snowinc.{{ current_cycle | to_fv3time }}.sfc_data.tile6.nc'] {% endif %} {% filter indent(width=4) %} From e3b3034512c40ddd20e6971f9bf7010da2aa9fb7 Mon Sep 17 00:00:00 2001 From: DavidHuber-NOAA Date: Wed, 29 Oct 2025 21:19:32 +0000 Subject: [PATCH 4/7] Fix snow_analysis output targets --- parm/snow/snow_det_config.yaml.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/parm/snow/snow_det_config.yaml.j2 b/parm/snow/snow_det_config.yaml.j2 index 66f9e8d92..c902722ba 100644 --- a/parm/snow/snow_det_config.yaml.j2 +++ b/parm/snow/snow_det_config.yaml.j2 @@ -82,15 +82,15 @@ data_out: {% for bkgtime in bkgtimes %} # Analysis - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile1.nc', - '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile1.nc'] + '{{ COMOUT_SNOW_ANALYSIS }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile1.nc'] - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile2.nc', - '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile2.nc'] + '{{ COMOUT_SNOW_ANALYSIS }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile2.nc'] - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile3.nc', - '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile3.nc'] + '{{ COMOUT_SNOW_ANALYSIS }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile3.nc'] - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile4.nc', - '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile4.nc'] + '{{ COMOUT_SNOW_ANALYSIS }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile4.nc'] - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile5.nc', - '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile5.nc'] + '{{ COMOUT_SNOW_ANALYSIS }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile5.nc'] - ['{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.sfc_data.tile6.nc', - '{{ COM_SNOW_ANALYSIS_TMPL }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile6.nc'] + '{{ COMOUT_SNOW_ANALYSIS }}/{{ bkgtime | to_fv3time }}.snow_analysis.sfc_data.tile6.nc'] {% endfor %} From 1425745ea0a13c616a32e38e6e3e7698687d13e5 Mon Sep 17 00:00:00 2001 From: DavidHuber-NOAA Date: Thu, 30 Oct 2025 13:16:39 +0000 Subject: [PATCH 5/7] Correct filename and extension --- parm/anlstat/anlstat_base_config.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/anlstat/anlstat_base_config.yaml.j2 b/parm/anlstat/anlstat_base_config.yaml.j2 index 997a70243..d82c307f9 100644 --- a/parm/anlstat/anlstat_base_config.yaml.j2 +++ b/parm/anlstat/anlstat_base_config.yaml.j2 @@ -27,7 +27,7 @@ atmos: snow: stat_file_path: '{{ COMIN_SNOW_ANALYSIS }}' - stat_file_name: 'snow_analysis.ioda_hofx_stats.tgz' + stat_file_name: 'snow_analysis.ioda_hofx.tar' obs spaces: - name: ims_snow input file: "diag_ims_snow_{{ current_cycle | to_YMDH }}.nc" From 7ccc8804471db9615bb9b28f906cb150c79e2189 Mon Sep 17 00:00:00 2001 From: DavidHuber-NOAA Date: Fri, 31 Oct 2025 16:51:27 +0000 Subject: [PATCH 6/7] Update jcb-gdas hash to head of develop --- parm/jcb-gdas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/jcb-gdas b/parm/jcb-gdas index 7c2a3a2be..246a49f59 160000 --- a/parm/jcb-gdas +++ b/parm/jcb-gdas @@ -1 +1 @@ -Subproject commit 7c2a3a2bece6084c2a30a93da7805a4b49353192 +Subproject commit 246a49f59689c189bee7b126fe421cb19d193539 From 6883a4ff637e24c2cb517b6c47518e0a8f5b0ae7 Mon Sep 17 00:00:00 2001 From: DavidHuber-NOAA Date: Fri, 31 Oct 2025 17:49:42 +0000 Subject: [PATCH 7/7] Rename stats extensions from tgz to tar.gz --- parm/anlstat/anlstat_base_config.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/anlstat/anlstat_base_config.yaml.j2 b/parm/anlstat/anlstat_base_config.yaml.j2 index e01cc63a4..d946374b8 100644 --- a/parm/anlstat/anlstat_base_config.yaml.j2 +++ b/parm/anlstat/anlstat_base_config.yaml.j2 @@ -11,7 +11,7 @@ aero: atmos_gsi: stat_file_path: '{{ DATA }}/atmos_gsi_ioda' - stat_file_name: 'atmos_gsi_ioda_diags.tgz' + stat_file_name: 'atmos_gsi_ioda_diags.tar.gz' obs spaces: - name: gsi_sfc_ps input file: "sfc_ps_gsi_{{ current_cycle | to_YMDH }}.nc4"