diff --git a/parm/snow/obs/config/adpsfc_snow.yaml.j2 b/parm/snow/obs/config/adpsfc_snow.yaml.j2 index 628d81aef..026f01fae 100644 --- a/parm/snow/obs/config/adpsfc_snow.yaml.j2 +++ b/parm/snow/obs/config/adpsfc_snow.yaml.j2 @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: '{{ DATA }}/obs/{{ OPREFIX_OUT }}adpsfc_snow.nc4' + obsfile: '{{ DATA }}/obs/{{ OPREFIX }}adpsfc_snow.nc4' obsdataout: engine: type: H5File diff --git a/parm/snow/obs/config/ims_snow.yaml.j2 b/parm/snow/obs/config/ims_snow.yaml.j2 index c7225d6e5..6fa427be7 100644 --- a/parm/snow/obs/config/ims_snow.yaml.j2 +++ b/parm/snow/obs/config/ims_snow.yaml.j2 @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: '{{ DATA }}/obs/{{ OPREFIX_OUT }}ims_snow.{{ CASE }}.nc4' + obsfile: '{{ DATA }}/obs/{{ OPREFIX }}ims_snow.nc4' obsdataout: engine: type: H5File diff --git a/parm/snow/obs/config/snocvr_snow.yaml.j2 b/parm/snow/obs/config/snocvr_snow.yaml.j2 index dd3daf1a4..c6b872a48 100644 --- a/parm/snow/obs/config/snocvr_snow.yaml.j2 +++ b/parm/snow/obs/config/snocvr_snow.yaml.j2 @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: '{{ DATA }}/obs/{{ OPREFIX_OUT }}snocvr_snow.nc4' + obsfile: '{{ DATA }}/obs/{{ OPREFIX }}snocvr_snow.nc4' obsdataout: engine: type: H5File diff --git a/parm/snow/prep/prep_gts.yaml.j2 b/parm/snow/prep/prep_gts.yaml.j2 index 297652534..a5e4915a3 100644 --- a/parm/snow/prep/prep_gts.yaml.j2 +++ b/parm/snow/prep/prep_gts.yaml.j2 @@ -2,17 +2,9 @@ gtsbufr: mkdir: - '{{ DATA }}/obs' copy: - - ['{{ COMIN_OBS }}/{{ OPREFIX_IN }}adpsfc.tm00.bufr_d', '{{ DATA }}/obs/'] + - ['{{ COM_OBS }}/{{ OPREFIX }}adpsfc.tm00.bufr_d', '{{ DATA }}/obs/'] gtsioda: - gfs: - copy: - - ['{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4'] - gdas: - copy: - - ['{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4'] - enkfgdas: - copy: - - ['{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4'] - - ['{{ COMIN_OBS }}/{{ OPREFIX_IN }}snocvr_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}snocvr_snow.nc4'] + copy: + - ['{{ DATA }}/{{ OPREFIX }}adpsfc_snow.nc4', '{{ COM_OBS }}/{{ OPREFIX }}adpsfc_snow.nc4'] bufr2ioda: adpsfc: '{{ HOMEgfs }}/sorc/gdas.cd/test/testinput/bufr_adpsfc_snow.yaml' diff --git a/parm/snow/prep/prep_ims.yaml.j2 b/parm/snow/prep/prep_ims.yaml.j2 index 4c5497e5d..2757f6f06 100644 --- a/parm/snow/prep/prep_ims.yaml.j2 +++ b/parm/snow/prep/prep_ims.yaml.j2 @@ -2,9 +2,9 @@ calcfims: mkdir: - '{{ DATA }}/obs' copy: - - ['{{ COMIN_OBS }}/{{ OPREFIX_IN }}ims{{ current_cycle | to_julian }}_4km_v1.3.nc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.nc'] + - ['{{ COM_OBS }}/{{ OPREFIX }}ims{{ current_cycle | to_julian }}_4km_v1.3.nc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.nc'] - ['{{ FIXgfs }}/gdas/obs/ims/IMS_4km_to_{{ CASE }}.mx{{ OCNRES }}.nc', '{{ DATA }}/obs/IMS4km_to_FV3_mapping.{{ CASE }}_oro_data.nc'] ims2ioda: copy: - - ['{{ DATA }}/ims_snow_{{ current_cycle | to_YMDH }}.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}ims_snow.{{ CASE }}.nc4'] + - ['{{ DATA }}/ims_snow_{{ current_cycle | to_YMDH }}.nc4', '{{ COM_OBS }}/{{ OPREFIX }}ims_snow.nc4'] diff --git a/test/testinput/bufr_adpsfc_snow.yaml b/test/testinput/bufr_adpsfc_snow.yaml index da622f339..32a1950fa 100644 --- a/test/testinput/bufr_adpsfc_snow.yaml +++ b/test/testinput/bufr_adpsfc_snow.yaml @@ -5,7 +5,7 @@ observations: - obs space: name: bufr - obsdatain: '{{ DATA }}/obs/{{ OPREFIX_IN }}adpsfc.tm00.bufr_d' + obsdatain: '{{ DATA }}/obs/{{ OPREFIX }}adpsfc.tm00.bufr_d' exports: variables: @@ -39,7 +39,7 @@ observations: ioda: backend: netcdf - obsdataout: '{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4' + obsdataout: '{{ DATA }}/{{ OPREFIX }}adpsfc_snow.nc4' variables: