From 51091fc5f4a85f5cf1bf32d3cbeda3d444981d61 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Wed, 27 Nov 2024 19:39:07 -0700 Subject: [PATCH 1/3] remove no-longer-needed diagnostics.departures and rename jedi diagnostic files as jdiag* --- .../rrfs_fv3jedi_hyb_2022052619.yaml | 10 +-- .../rrfs_fv3jedi_letkf_2022052619.yaml | 6 +- .../rrfs_mpasjedi_2024052700_Ens3Dvar.yaml | 37 +++++------ ...fs_mpasjedi_2024052700_getkf_observer.yaml | 32 +++++----- ...rrfs_mpasjedi_2024052700_getkf_solver.yaml | 64 +++++++++---------- .../rrfs_mpasjedi_2024052700_Ens3Dvar.yaml | 7 +- .../rrfs_mpasjedi_2024052700_getkf.yaml | 2 +- ...fs_mpasjedi_2024052700_getkf_observer.yaml | 2 +- ...rrfs_mpasjedi_2024052700_getkf_solver.yaml | 4 +- .../rrfs_mpasjedi_2024052700_letkf.yaml | 2 +- .../ush/fv3jedi_gsi_increment_singleob.py | 2 +- rrfs-test/ush/fv3jedi_increment_singleob.py | 2 +- rrfs-test/ush/mpasjedi_increment_singleob.py | 2 +- .../basic_config/fv3jedi_hyb3denvar.yaml | 6 -- .../basic_config/mpasjedi_3dvar.yaml | 5 -- .../basic_config/mpasjedi_en3dvar.yaml | 5 -- .../aircar_airTemperature_133.yaml | 2 +- .../aircar_specificHumidity_133.yaml | 2 +- .../obtype_config/aircar_uv_233.yaml | 2 +- .../aircft_airTemperature_130.yaml | 2 +- .../aircft_airTemperature_131.yaml | 2 +- .../aircft_airTemperature_134.yaml | 2 +- .../aircft_airTemperature_135.yaml | 2 +- .../aircft_specificHumidity_134.yaml | 2 +- .../obtype_config/aircft_uv_230.yaml | 2 +- .../obtype_config/aircft_uv_231.yaml | 2 +- .../obtype_config/aircft_uv_234.yaml | 2 +- .../obtype_config/aircft_uv_235.yaml | 2 +- .../templates/obtype_config/amsua_n19.yaml | 2 +- .../msonet_airTemperature_188.yaml | 2 +- .../msonet_specificHumidity_188.yaml | 2 +- .../msonet_stationPressure_188.yaml | 2 +- .../obtype_config/msonet_winds_288.yaml | 2 +- 33 files changed, 95 insertions(+), 127 deletions(-) diff --git a/rrfs-test/testinput/rrfs_fv3jedi_hyb_2022052619.yaml b/rrfs-test/testinput/rrfs_fv3jedi_hyb_2022052619.yaml index d691a3e9..27c452ec 100644 --- a/rrfs-test/testinput/rrfs_fv3jedi_hyb_2022052619.yaml +++ b/rrfs-test/testinput/rrfs_fv3jedi_hyb_2022052619.yaml @@ -109,7 +109,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: rass_tsen_obs_2022052619_hofx.nc4 + obsfile: jdiag_rass_tsen_obs_2022052619.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: @@ -134,7 +134,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: rass_tsen_obs_2022052619_hofx.nc4 + obsfile: jdiag_rass_tsen_obs_2022052619.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: @@ -196,8 +196,6 @@ variational: ntiles: 1 fieldsets: - fieldset: DataFix/fix/dynamics_lam_cmaq.yaml - diagnostics: - departures: ombg - ninner: 5 gradient norm reduction: 1e-60 geometry: @@ -214,10 +212,6 @@ variational: ntiles: 1 fieldsets: - fieldset: DataFix/fix/dynamics_lam_cmaq.yaml -final: - diagnostics: - departures: oman - output: filetype: fms restart datapath: ./ diff --git a/rrfs-test/testinput/rrfs_fv3jedi_letkf_2022052619.yaml b/rrfs-test/testinput/rrfs_fv3jedi_letkf_2022052619.yaml index 39dda98c..918c40ef 100644 --- a/rrfs-test/testinput/rrfs_fv3jedi_letkf_2022052619.yaml +++ b/rrfs-test/testinput/rrfs_fv3jedi_letkf_2022052619.yaml @@ -50,7 +50,7 @@ observations: obsdataout: engine: type: H5File - obsfile: rass_tsen_obs_2022052619_hofx.nc4 + obsfile: jdiag_rass_tsen_obs_2022052619.nc4 simulated variables: [airTemperature] obs operator: name: VertInterp @@ -80,7 +80,7 @@ observations: obsdataout: engine: type: H5File - obsfile: sondes_tsen_obs_2022052619_hofx.nc4 + obsfile: jdiag_sondes_tsen_obs_2022052619.nc4 simulated variables: [airTemperature] obs operator: name: VertInterp @@ -112,7 +112,7 @@ observations: obsdataout: engine: type: H5File - obsfile: sondes_q_obs_2022052619_hofx.nc4 + obsfile: jdiag_sondes_q_obs_2022052619.nc4 simulated variables: [specificHumidity] obs operator: name: VertInterp diff --git a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml index a9a07419..0d387a2a 100644 --- a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml +++ b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml @@ -16,8 +16,6 @@ variational: deallocate non-da fields: true interpolation type: unstructured gradient norm reduction: 1e-3 - diagnostics: - departures: ombg ninner: 50 - geometry: nml_file: ./namelist.atmosphere @@ -26,9 +24,6 @@ variational: interpolation type: unstructured gradient norm reduction: 1e-3 ninner: 50 -final: - diagnostics: - departures: oman cost function: cost type: 3D-Var time window: @@ -84,7 +79,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_airTemperature_133.nc4 + obsfile: jdiag_AIRCAR_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -232,7 +227,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_uv_233.nc4 + obsfile: jdiag_AIRCAR_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 @@ -461,7 +456,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 + obsfile: jdiag_AIRCAR_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -621,7 +616,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_130.nc4 + obsfile: jdiag_AIRCFT_airTemperature_130.nc4 allow overwrite: true io pool: max pool size: 1 @@ -769,7 +764,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_131.nc4 + obsfile: jdiag_AIRCFT_airTemperature_131.nc4 allow overwrite: true io pool: max pool size: 1 @@ -917,7 +912,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_134.nc4 + obsfile: jdiag_AIRCFT_airTemperature_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1065,7 +1060,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_135.nc4 + obsfile: jdiag_AIRCFT_airTemperature_135.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1213,7 +1208,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_134.nc4 + obsfile: jdiag_AIRCFT_specificHumidity_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1373,7 +1368,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_230.nc4 + obsfile: jdiag_AIRCFT_uv_230.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1602,7 +1597,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_231.nc4 + obsfile: jdiag_AIRCFT_uv_231.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1831,7 +1826,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_234.nc4 + obsfile: jdiag_AIRCFT_uv_234.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2060,7 +2055,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_235.nc4 + obsfile: jdiag_AIRCFT_uv_235.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2289,7 +2284,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_airTemperature_188.nc4 + obsfile: jdiag_MSONET_airTemperature_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2432,7 +2427,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_specificHumidity_188.nc4 + obsfile: jdiag_MSONET_specificHumidity_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2576,7 +2571,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_stationPressure_188.nc4 + obsfile: jdiag_MSONET_stationPressure_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2717,7 +2712,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_uv_288.nc4 + obsfile: jdiag_MSONET_uv_288.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_observer.yaml b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_observer.yaml index 73c0b796..495a95fc 100644 --- a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_observer.yaml +++ b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_observer.yaml @@ -36,7 +36,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_airTemperature_133.nc4 + obsfile: jdiag_AIRCAR_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -184,7 +184,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_uv_233.nc4 + obsfile: jdiag_AIRCAR_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 @@ -413,7 +413,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 + obsfile: jdiag_AIRCAR_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -573,7 +573,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_130.nc4 + obsfile: jdiag_AIRCFT_airTemperature_130.nc4 allow overwrite: true io pool: max pool size: 1 @@ -721,7 +721,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_131.nc4 + obsfile: jdiag_AIRCFT_airTemperature_131.nc4 allow overwrite: true io pool: max pool size: 1 @@ -869,7 +869,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_134.nc4 + obsfile: jdiag_AIRCFT_airTemperature_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1017,7 +1017,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_135.nc4 + obsfile: jdiag_AIRCFT_airTemperature_135.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1165,7 +1165,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_134.nc4 + obsfile: jdiag_AIRCFT_specificHumidity_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1325,7 +1325,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_230.nc4 + obsfile: jdiag_AIRCFT_uv_230.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1554,7 +1554,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_231.nc4 + obsfile: jdiag_AIRCFT_uv_231.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1783,7 +1783,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_234.nc4 + obsfile: jdiag_AIRCFT_uv_234.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2012,7 +2012,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_235.nc4 + obsfile: jdiag_AIRCFT_uv_235.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2241,7 +2241,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_airTemperature_188.nc4 + obsfile: jdiag_MSONET_airTemperature_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2384,7 +2384,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_specificHumidity_188.nc4 + obsfile: jdiag_MSONET_specificHumidity_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2528,7 +2528,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_stationPressure_188.nc4 + obsfile: jdiag_MSONET_stationPressure_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2669,7 +2669,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_uv_288.nc4 + obsfile: jdiag_MSONET_uv_288.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_solver.yaml b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_solver.yaml index 77b22a3a..3119d631 100644 --- a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_solver.yaml +++ b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_solver.yaml @@ -32,11 +32,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCAR_hofxs_airTemperature_133.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCAR_airTemperature_133.nc4" obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_airTemperature_133.nc4 + obsfile: jdiag_AIRCAR_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -180,11 +180,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCAR_hofxs_uv_233.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCAR_uv_233.nc4" obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_uv_233.nc4 + obsfile: jdiag_AIRCAR_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 @@ -409,11 +409,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCAR_hofxs_specificHumidity_133.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCAR_specificHumidity_133.nc4" obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 + obsfile: jdiag_AIRCAR_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -569,11 +569,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_130.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_130.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_130.nc4 + obsfile: jdiag_AIRCFT_airTemperature_130.nc4 allow overwrite: true io pool: max pool size: 1 @@ -717,11 +717,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_131.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_131.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_131.nc4 + obsfile: jdiag_AIRCFT_airTemperature_131.nc4 allow overwrite: true io pool: max pool size: 1 @@ -865,11 +865,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_134.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_134.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_134.nc4 + obsfile: jdiag_AIRCFT_airTemperature_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1013,11 +1013,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_135.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_135.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_135.nc4 + obsfile: jdiag_AIRCFT_airTemperature_135.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1161,11 +1161,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_specificHumidity_134.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_specificHumidity_134.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_134.nc4 + obsfile: jdiag_AIRCFT_specificHumidity_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1321,11 +1321,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_230.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_230.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_230.nc4 + obsfile: jdiag_AIRCFT_uv_230.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1550,11 +1550,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_231.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_231.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_231.nc4 + obsfile: jdiag_AIRCFT_uv_231.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1779,11 +1779,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_234.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_234.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_234.nc4 + obsfile: jdiag_AIRCFT_uv_234.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2008,11 +2008,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_235.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_235.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_235.nc4 + obsfile: jdiag_AIRCFT_uv_235.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2237,11 +2237,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/MSONET_hofxs_airTemperature_188.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_MSONET_airTemperature_188.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_airTemperature_188.nc4 + obsfile: jdiag_MSONET_airTemperature_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2380,11 +2380,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/MSONET_hofxs_specificHumidity_188.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_MSONET_specificHumidity_188.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_specificHumidity_188.nc4 + obsfile: jdiag_MSONET_specificHumidity_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2524,11 +2524,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/MSONET_hofxs_stationPressure_188.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_MSONET_stationPressure_188.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_stationPressure_188.nc4 + obsfile: jdiag_MSONET_stationPressure_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2665,11 +2665,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/MSONET_hofxs_uv_288.nc4" + obsfile: "../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_MSONET_uv_288.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_uv_288.nc4 + obsfile: jdiag_MSONET_uv_288.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml index aed4b27c..368e82a2 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml @@ -16,8 +16,6 @@ variational: deallocate non-da fields: true interpolation type: unstructured gradient norm reduction: 1e-3 - diagnostics: - departures: ombg ninner: 50 - geometry: nml_file: ./namelist.atmosphere @@ -26,9 +24,6 @@ variational: interpolation type: unstructured gradient norm reduction: 1e-3 ninner: 50 -final: - diagnostics: - departures: oman cost function: cost type: 3D-Var time window: @@ -80,7 +75,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: ./adpupa_hofx.nc4 + obsfile: ./jdiag.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml index a952871d..f2f90f4b 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml @@ -36,7 +36,7 @@ observations: obsdataout: engine: type: H5File - obsfile: ./adpupa_hofx.nc4 + obsfile: ./jdiag_adupa.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml index 8c7937e8..a0a3b56b 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml @@ -35,7 +35,7 @@ observations: obsdataout: engine: type: H5File - obsfile: ./adpupa_hofx.nc4 + obsfile: ./jdiag_adupa.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml index 4fe428ad..b531f977 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml @@ -32,11 +32,11 @@ observations: obsdatain: engine: type: H5File - obsfile: ../rundir-rrfs_mpasjedi_2024052700_getkf_observer/adpupa_hofx.nc4 + obsfile: ../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_adupa.nc4 obsdataout: engine: type: H5File - obsfile: ./adpupa_hofx_solver.nc4 + obsfile: ./jdiag_adupa_solver.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml index 935cfcc7..c49ebc98 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml @@ -36,7 +36,7 @@ observations: obsdataout: engine: type: H5File - obsfile: ./adpupa_hofx.nc4 + obsfile: ./jdiag_adupa.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/ush/fv3jedi_gsi_increment_singleob.py b/rrfs-test/ush/fv3jedi_gsi_increment_singleob.py index 7bdd7f00..6156f7b1 100755 --- a/rrfs-test/ush/fv3jedi_gsi_increment_singleob.py +++ b/rrfs-test/ush/fv3jedi_gsi_increment_singleob.py @@ -54,7 +54,7 @@ janalysis = f"{datapath}/hybens3dvar-fv3_lam-C775.fv_core.res.nc" jbackgrnd = f"{datapath}/Data/bkg/fv3_dynvars.nc" jgrid = f"{datapath}/Data/bkg/fv3_grid_spec.nc" -#jdiag = f"{datapath}/{singleob_type}_hofxs_{variable}_2022052619.nc4" +#jdiag = f"{datapath}/jdiag_{singleob_type}_{variable}_2022052619.nc4" jdiag = f"{datapath}/{jdiag}" #GSI data diff --git a/rrfs-test/ush/fv3jedi_increment_singleob.py b/rrfs-test/ush/fv3jedi_increment_singleob.py index f90277fc..62715ba7 100755 --- a/rrfs-test/ush/fv3jedi_increment_singleob.py +++ b/rrfs-test/ush/fv3jedi_increment_singleob.py @@ -42,7 +42,7 @@ janalysis = f"{datapath}/hybens3dvar-fv3_lam-C775.fv_core.res.nc" #Ens3dvar-fv3_lam-C775.fv_core.res.nc" jbackgrnd = f"{datapath}/Data/bkg/fv3_dynvars.nc" jgrid = f"{datapath}/Data/bkg/fv3_grid_spec.nc" -jdiag = f"{datapath}/{singleob_type}_hofxs_2022052619.nc4" +jdiag = f"{datapath}/jdiag_{singleob_type}_2022052619.nc4" ################################################################################### # Set cartopy shapefile path diff --git a/rrfs-test/ush/mpasjedi_increment_singleob.py b/rrfs-test/ush/mpasjedi_increment_singleob.py index 43aa31e7..a1e236d3 100755 --- a/rrfs-test/ush/mpasjedi_increment_singleob.py +++ b/rrfs-test/ush/mpasjedi_increment_singleob.py @@ -32,7 +32,7 @@ # JEDI data datapath = "./" jstatic = "./data/invariant.nc" # to load the MPAS lat/lon -jdiag = "adpupa_hofx.nc4" # obs diag file +jdiag = "jdiag_adpupa.nc4" # obs diag file # FOR HYBRID (or ENVAR) janalysis = "./ana.2024-05-27_00.00.00.nc" # analysis file diff --git a/rrfs-test/validated_yamls/templates/basic_config/fv3jedi_hyb3denvar.yaml b/rrfs-test/validated_yamls/templates/basic_config/fv3jedi_hyb3denvar.yaml index b86bbf6f..6552b870 100644 --- a/rrfs-test/validated_yamls/templates/basic_config/fv3jedi_hyb3denvar.yaml +++ b/rrfs-test/validated_yamls/templates/basic_config/fv3jedi_hyb3denvar.yaml @@ -123,8 +123,6 @@ variational: ntiles: 1 fieldsets: - fieldset: DataFix/fix/dynamics_lam_cmaq.yaml - diagnostics: - departures: ombg - ninner: 50 gradient norm reduction: 1e-60 geometry: @@ -141,10 +139,6 @@ variational: ntiles: 1 fieldsets: - fieldset: DataFix/fix/dynamics_lam_cmaq.yaml -final: - diagnostics: - departures: oman - output: filetype: fms restart datapath: ./ diff --git a/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_3dvar.yaml b/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_3dvar.yaml index b4db04d4..857a092f 100644 --- a/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_3dvar.yaml +++ b/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_3dvar.yaml @@ -16,8 +16,6 @@ variational: deallocate non-da fields: true interpolation type: unstructured gradient norm reduction: 1e-3 - diagnostics: - departures: ombg ninner: 50 - geometry: nml_file: ./namelist.atmosphere @@ -26,9 +24,6 @@ variational: interpolation type: unstructured gradient norm reduction: 1e-3 ninner: 50 -final: - diagnostics: - departures: oman cost function: cost type: 3D-Var time window: diff --git a/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_en3dvar.yaml b/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_en3dvar.yaml index 4abfafad..619339f6 100644 --- a/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_en3dvar.yaml +++ b/rrfs-test/validated_yamls/templates/basic_config/mpasjedi_en3dvar.yaml @@ -16,8 +16,6 @@ variational: deallocate non-da fields: true interpolation type: unstructured gradient norm reduction: 1e-3 - diagnostics: - departures: ombg ninner: 50 - geometry: nml_file: ./namelist.atmosphere @@ -26,9 +24,6 @@ variational: interpolation type: unstructured gradient norm reduction: 1e-3 ninner: 50 -final: - diagnostics: - departures: oman cost function: cost type: 3D-Var time window: diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml index 29f05b00..fc04909a 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_airTemperature_133.nc4 + obsfile: jdiag_AIRCAR_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml index 9dbb526e..d9a78393 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 + obsfile: jdiag_AIRCAR_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircar_uv_233.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_uv_233.yaml index 5abb77d9..9d7b4f8b 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircar_uv_233.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_uv_233.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_uv_233.nc4 + obsfile: jdiag_AIRCAR_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml index 06cb4b23..89659472 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_130.nc4 + obsfile: jdiag_AIRCFT_airTemperature_130.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml index 6f4afcd9..6aa4f706 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_131.nc4 + obsfile: jdiag_AIRCFT_airTemperature_131.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml index e3198281..36e4ac04 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_134.nc4 + obsfile: jdiag_AIRCFT_airTemperature_134.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml index 46c32133..9601503a 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_135.nc4 + obsfile: jdiag_AIRCFT_airTemperature_135.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml index 8342bd74..f9f43cdb 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_134.nc4 + obsfile: jdiag_AIRCFT_specificHumidity_134.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_230.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_230.yaml index 275ee450..b7830d27 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_230.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_230.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_230.nc4 + obsfile: jdiag_AIRCFT_uv_230.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_231.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_231.yaml index bedd4465..c444a39d 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_231.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_231.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_231.nc4 + obsfile: jdiag_AIRCFT_uv_231.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_234.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_234.yaml index a7a922c9..5fdcc365 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_234.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_234.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_234.nc4 + obsfile: jdiag_AIRCFT_uv_234.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_235.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_235.yaml index d7e3f0cb..26cfd609 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_235.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_235.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_235.nc4 + obsfile: jdiag_AIRCFT_uv_235.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml b/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml index 9a4ee087..62d6669b 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml @@ -9,7 +9,7 @@ obsdataout: engine: type: H5File - obsfile: amsua_n19_hofx.2024052700.nc4 + obsfile: jdiag_amsua_n19.2024052700.nc4 simulated variables: [brightnessTemperature] observed variables: [brightnessTemperature] channels: &amsua_n19_channels 1-15 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml index 8da18c91..8217d4be 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: hofx_msonet_airTemperature_188.nc4 + obsfile: jdiag_msonet_airTemperature_188.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml index ca0fbfd1..81130570 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: hofx_msonet_specificHumidity_188.nc4 + obsfile: jdiag_msonet_specificHumidity_188.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml index 73a5d706..81476fa0 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: hofx_msonet_stationPressure_188.nc4 + obsfile: jdiag_msonet_stationPressure_188.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml index 844e0afd..fc85e66f 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml @@ -10,7 +10,7 @@ obsdataout: engine: type: H5File - obsfile: hofx_msonet_winds_288.nc4 + obsfile: jdiag_msonet_winds_288.nc4 allow overwrite: true io pool: max pool size: 1 From f2e0957dc0c540088c5eda38cbd9b4bbfee20144 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Wed, 27 Nov 2024 23:47:12 -0700 Subject: [PATCH 2/3] fix typos --- .../testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml | 2 +- rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml | 2 +- .../rrfs_mpasjedi_2024052700_getkf_observer.yaml | 2 +- .../testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml | 4 ++-- rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml index 368e82a2..3d173293 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml @@ -75,7 +75,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: ./jdiag.nc4 + obsfile: ./jdiag_adpupa.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml index f2f90f4b..e45a99f5 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml @@ -36,7 +36,7 @@ observations: obsdataout: engine: type: H5File - obsfile: ./jdiag_adupa.nc4 + obsfile: ./jdiag_adpupa.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml index a0a3b56b..89f5f99f 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml @@ -35,7 +35,7 @@ observations: obsdataout: engine: type: H5File - obsfile: ./jdiag_adupa.nc4 + obsfile: ./jdiag_adpupa.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml index b531f977..5008b946 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml @@ -32,11 +32,11 @@ observations: obsdatain: engine: type: H5File - obsfile: ../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_adupa.nc4 + obsfile: ../rundir-rrfs_mpasjedi_2024052700_getkf_observer/jdiag_adpupa.nc4 obsdataout: engine: type: H5File - obsfile: ./jdiag_adupa_solver.nc4 + obsfile: ./jdiag_adpupa_solver.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: diff --git a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml index c49ebc98..314784e0 100644 --- a/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml +++ b/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml @@ -36,7 +36,7 @@ observations: obsdataout: engine: type: H5File - obsfile: ./jdiag_adupa.nc4 + obsfile: ./jdiag_adpupa.nc4 simulated variables: [airTemperature] observed variables: [airTemperature] obs operator: From 01294fcb839d0e6c83b5159b0341b02512229cb4 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Tue, 3 Dec 2024 08:42:37 -0700 Subject: [PATCH 3/3] update the newly-added fv3jedi yaml files to be consistent --- .../rrfs_fv3jedi_2024052700_Ens3Dvar.yaml | 37 +++++------ ...rfs_fv3jedi_2024052700_getkf_observer.yaml | 32 +++++----- .../rrfs_fv3jedi_2024052700_getkf_solver.yaml | 64 +++++++++---------- 3 files changed, 64 insertions(+), 69 deletions(-) diff --git a/rrfs-test/testinput/rrfs_fv3jedi_2024052700_Ens3Dvar.yaml b/rrfs-test/testinput/rrfs_fv3jedi_2024052700_Ens3Dvar.yaml index 1b8982ca..7400f92d 100644 --- a/rrfs-test/testinput/rrfs_fv3jedi_2024052700_Ens3Dvar.yaml +++ b/rrfs-test/testinput/rrfs_fv3jedi_2024052700_Ens3Dvar.yaml @@ -72,7 +72,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_airTemperature_133.nc4 + obsfile: jdiag_AIRCAR_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -220,7 +220,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_uv_233.nc4 + obsfile: jdiag_AIRCAR_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 @@ -449,7 +449,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 + obsfile: jdiag_AIRCAR_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -609,7 +609,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_130.nc4 + obsfile: jdiag_AIRCFT_airTemperature_130.nc4 allow overwrite: true io pool: max pool size: 1 @@ -757,7 +757,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_131.nc4 + obsfile: jdiag_AIRCFT_airTemperature_131.nc4 allow overwrite: true io pool: max pool size: 1 @@ -905,7 +905,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_134.nc4 + obsfile: jdiag_AIRCFT_airTemperature_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1053,7 +1053,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_135.nc4 + obsfile: jdiag_AIRCFT_airTemperature_135.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1201,7 +1201,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_134.nc4 + obsfile: jdiag_AIRCFT_specificHumidity_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1361,7 +1361,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_230.nc4 + obsfile: jdiag_AIRCFT_uv_230.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1590,7 +1590,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_231.nc4 + obsfile: jdiag_AIRCFT_uv_231.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1819,7 +1819,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_234.nc4 + obsfile: jdiag_AIRCFT_uv_234.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2048,7 +2048,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_235.nc4 + obsfile: jdiag_AIRCFT_uv_235.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2277,7 +2277,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_airTemperature_188.nc4 + obsfile: jdiag_MSONET_airTemperature_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2420,7 +2420,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_specificHumidity_188.nc4 + obsfile: jdiag_MSONET_specificHumidity_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2564,7 +2564,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_stationPressure_188.nc4 + obsfile: jdiag_MSONET_stationPressure_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2705,7 +2705,7 @@ cost function: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_uv_288.nc4 + obsfile: jdiag_MSONET_uv_288.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2932,8 +2932,6 @@ variational: ntiles: 1 fieldsets: - fieldset: DataFix/fix/dynamics_lam_cmaq.yaml - diagnostics: - departures: ombg - ninner: 5 gradient norm reduction: 1e-60 geometry: @@ -2950,9 +2948,6 @@ variational: ntiles: 1 fieldsets: - fieldset: DataFix/fix/dynamics_lam_cmaq.yaml -final: - diagnostics: - departures: oman output: filetype: fms restart diff --git a/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_observer.yaml b/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_observer.yaml index e36f8f90..b0d0e8cf 100644 --- a/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_observer.yaml +++ b/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_observer.yaml @@ -50,7 +50,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_airTemperature_133.nc4 + obsfile: jdiag_AIRCAR_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -198,7 +198,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_uv_233.nc4 + obsfile: jdiag_AIRCAR_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 @@ -427,7 +427,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 + obsfile: jdiag_AIRCAR_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -587,7 +587,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_130.nc4 + obsfile: jdiag_AIRCFT_airTemperature_130.nc4 allow overwrite: true io pool: max pool size: 1 @@ -735,7 +735,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_131.nc4 + obsfile: jdiag_AIRCFT_airTemperature_131.nc4 allow overwrite: true io pool: max pool size: 1 @@ -883,7 +883,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_134.nc4 + obsfile: jdiag_AIRCFT_airTemperature_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1031,7 +1031,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_135.nc4 + obsfile: jdiag_AIRCFT_airTemperature_135.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1179,7 +1179,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_134.nc4 + obsfile: jdiag_AIRCFT_specificHumidity_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1339,7 +1339,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_230.nc4 + obsfile: jdiag_AIRCFT_uv_230.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1568,7 +1568,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_231.nc4 + obsfile: jdiag_AIRCFT_uv_231.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1797,7 +1797,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_234.nc4 + obsfile: jdiag_AIRCFT_uv_234.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2026,7 +2026,7 @@ observations: obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_235.nc4 + obsfile: jdiag_AIRCFT_uv_235.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2255,7 +2255,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_airTemperature_188.nc4 + obsfile: jdiag_MSONET_airTemperature_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2398,7 +2398,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_specificHumidity_188.nc4 + obsfile: jdiag_MSONET_specificHumidity_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2542,7 +2542,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_stationPressure_188.nc4 + obsfile: jdiag_MSONET_stationPressure_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2683,7 +2683,7 @@ observations: obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_uv_288.nc4 + obsfile: jdiag_MSONET_uv_288.nc4 allow overwrite: true io pool: max pool size: 1 diff --git a/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_solver.yaml b/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_solver.yaml index ed70b4d9..fcb690e7 100644 --- a/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_solver.yaml +++ b/rrfs-test/testinput/rrfs_fv3jedi_2024052700_getkf_solver.yaml @@ -46,11 +46,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCAR_hofxs_airTemperature_133.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCAR_airTemperature_133.nc4" obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_airTemperature_133.nc4 + obsfile: jdiag_AIRCAR_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -194,11 +194,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCAR_hofxs_uv_233.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCAR_uv_233.nc4" obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_uv_233.nc4 + obsfile: jdiag_AIRCAR_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 @@ -423,11 +423,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCAR_hofxs_specificHumidity_133.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCAR_specificHumidity_133.nc4" obsdataout: engine: type: H5File - obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 + obsfile: jdiag_AIRCAR_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -583,11 +583,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_130.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_130.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_130.nc4 + obsfile: jdiag_AIRCFT_airTemperature_130.nc4 allow overwrite: true io pool: max pool size: 1 @@ -731,11 +731,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_131.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_131.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_131.nc4 + obsfile: jdiag_AIRCFT_airTemperature_131.nc4 allow overwrite: true io pool: max pool size: 1 @@ -879,11 +879,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_134.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_134.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_134.nc4 + obsfile: jdiag_AIRCFT_airTemperature_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1027,11 +1027,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_airTemperature_135.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_airTemperature_135.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_135.nc4 + obsfile: jdiag_AIRCFT_airTemperature_135.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1175,11 +1175,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_specificHumidity_134.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_specificHumidity_134.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_134.nc4 + obsfile: jdiag_AIRCFT_specificHumidity_134.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1335,11 +1335,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_230.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_230.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_230.nc4 + obsfile: jdiag_AIRCFT_uv_230.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1564,11 +1564,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_231.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_231.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_231.nc4 + obsfile: jdiag_AIRCFT_uv_231.nc4 allow overwrite: true io pool: max pool size: 1 @@ -1793,11 +1793,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_234.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_234.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_234.nc4 + obsfile: jdiag_AIRCFT_uv_234.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2022,11 +2022,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/AIRCFT_hofxs_uv_235.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_AIRCFT_uv_235.nc4" obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_235.nc4 + obsfile: jdiag_AIRCFT_uv_235.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2251,11 +2251,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/MSONET_hofxs_airTemperature_188.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_MSONET_airTemperature_188.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_airTemperature_188.nc4 + obsfile: jdiag_MSONET_airTemperature_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2394,11 +2394,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/MSONET_hofxs_specificHumidity_188.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_MSONET_specificHumidity_188.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_specificHumidity_188.nc4 + obsfile: jdiag_MSONET_specificHumidity_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2538,11 +2538,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/MSONET_hofxs_stationPressure_188.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_MSONET_stationPressure_188.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_stationPressure_188.nc4 + obsfile: jdiag_MSONET_stationPressure_188.nc4 allow overwrite: true io pool: max pool size: 1 @@ -2679,11 +2679,11 @@ observations: obsdatain: engine: type: H5File - obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/MSONET_hofxs_uv_288.nc4" + obsfile: "../rundir-rrfs_fv3jedi_2024052700_getkf_observer/jdiag_MSONET_uv_288.nc4" obsdataout: engine: type: H5File - obsfile: MSONET_hofxs_uv_288.nc4 + obsfile: jdiag_MSONET_uv_288.nc4 allow overwrite: true io pool: max pool size: 1