From e636501609acb26db22279596ed578f6fa849068 Mon Sep 17 00:00:00 2001 From: "Donald.E.Lippi" Date: Wed, 25 Sep 2024 13:59:57 +0000 Subject: [PATCH] Changed aircft_133 to aircar_133 to be consistent with prepbufr file. Changed instances of aircraft to aircft or mesonet to msonet for consistency. Made other consistency changes. Nothing changes results. --- ...33.yaml => aircar_airTemperature_133.yaml} | 6 +++--- ....yaml => aircar_specificHumidity_133.yaml} | 12 ++++++------ ...{aircft_uv_233.yaml => aircar_uv_233.yaml} | 15 +++++++++------ .../aircft_airTemperature_130.yaml | 2 +- .../aircft_airTemperature_131.yaml | 2 +- .../aircft_airTemperature_134.yaml | 2 +- .../aircft_airTemperature_135.yaml | 2 +- .../aircft_specificHumidity_134.yaml | 8 ++++---- .../obtype_config/aircft_uv_230.yaml | 11 +++++++---- .../obtype_config/aircft_uv_231.yaml | 11 +++++++---- .../obtype_config/aircft_uv_234.yaml | 11 +++++++---- .../obtype_config/aircft_uv_235.yaml | 11 +++++++---- .../msonet_airTemperature_188.yaml | 2 +- .../msonet_specificHumidity_188.yaml | 8 ++++---- .../msonet_stationPressure_188.yaml | 8 ++++---- .../obtype_config/msonet_uv_288.yaml | 19 +++++++++++-------- 16 files changed, 74 insertions(+), 56 deletions(-) rename rrfs-test/validated_yamls/templates/obtype_config/{aircft_airTemperature_133.yaml => aircar_airTemperature_133.yaml} (97%) rename rrfs-test/validated_yamls/templates/obtype_config/{aircft_specificHumidity_133.yaml => aircar_specificHumidity_133.yaml} (94%) rename rrfs-test/validated_yamls/templates/obtype_config/{aircft_uv_233.yaml => aircar_uv_233.yaml} (94%) diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_133.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml similarity index 97% rename from rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_133.yaml rename to rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml index 71b50ea..097fa50 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_133.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircar obsdatain: engine: type: H5File @@ -7,7 +7,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_airTemperature_133.nc4 + obsfile: AIRCAR_hofxs_airTemperature_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -138,4 +138,4 @@ # - variable: QCflagsData/airTemperature - filter: GOMsaver - filename: ./data/geovals/aircft_geovals_rrfs.nc4 + filename: ./data/geovals/aircar_geovals_rrfs.nc4 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_133.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml similarity index 94% rename from rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_133.yaml rename to rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml index 82229e8..f494b84 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_133.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircar obsdatain: engine: type: H5File @@ -7,7 +7,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_specificHumidity_133.nc4 + obsfile: AIRCAR_hofxs_specificHumidity_133.nc4 allow overwrite: true io pool: max pool size: 1 @@ -145,9 +145,9 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/specificHumidity + # - variable: ObsValue/specificHumidity + # - variable: QCflagsData/specificHumidity - filter: GOMsaver - filename: ./data/geovals/aircft_geovals_rrfs.nc4 + filename: ./data/geovals/aircar_geovals_rrfs.nc4 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_233.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_uv_233.yaml similarity index 94% rename from rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_233.yaml rename to rrfs-test/validated_yamls/templates/obtype_config/aircar_uv_233.yaml index 4e3385c..248cbbb 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_uv_233.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_uv_233.yaml @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircar obsdatain: engine: type: H5File @@ -7,7 +7,7 @@ obsdataout: engine: type: H5File - obsfile: AIRCFT_hofxs_uv_233.nc4 + obsfile: AIRCAR_hofxs_uv_233.nc4 allow overwrite: true io pool: max pool size: 1 @@ -211,9 +211,12 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/windEastward + # - variable: ObsValue/windEastward + # - variable: ObsType/windNorthward + # - variable: ObsValue/windNorthward + # - variable: QCflagsData/windEastward + # - variable: QCflagsData/windNorthward - filter: GOMsaver - filename: ./data/geovals/aircft_geovals_rrfs.nc4 + filename: ./data/geovals/aircar_geovals_rrfs.nc4 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 addc148..3e0468e 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File 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 09bc744..28852c4 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File 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 41db368..a51f053 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File 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 dcc36e1..3f04cd0 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File 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 ab0ab9d..074fde4 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File @@ -145,9 +145,9 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/specificHumidity + # - variable: ObsValue/specificHumidity + # - variable: QCflagsData/specificHumidity - filter: GOMsaver filename: ./data/geovals/aircft_geovals_rrfs.nc4 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 0a05d26..7736a30 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File @@ -211,9 +211,12 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/windEastward + # - variable: ObsValue/windEastward + # - variable: ObsType/windNorthward + # - variable: ObsValue/windNorthward + # - variable: QCflagsData/windEastward + # - variable: QCflagsData/windNorthward - filter: GOMsaver filename: ./data/geovals/aircft_geovals_rrfs.nc4 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 514de36..060b29b 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File @@ -211,9 +211,12 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/windEastward + # - variable: ObsValue/windEastward + # - variable: ObsType/windNorthward + # - variable: ObsValue/windNorthward + # - variable: QCflagsData/windEastward + # - variable: QCflagsData/windNorthward - filter: GOMsaver filename: ./data/geovals/aircft_geovals_rrfs.nc4 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 94f0127..9f5c312 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File @@ -211,9 +211,12 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/windEastward + # - variable: ObsValue/windEastward + # - variable: ObsType/windNorthward + # - variable: ObsValue/windNorthward + # - variable: QCflagsData/windEastward + # - variable: QCflagsData/windNorthward - filter: GOMsaver filename: ./data/geovals/aircft_geovals_rrfs.nc4 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 ea07856..7bae281 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 @@ -1,5 +1,5 @@ - obs space: - name: aircraft + name: aircft obsdatain: engine: type: H5File @@ -211,9 +211,12 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/windEastward + # - variable: ObsValue/windEastward + # - variable: ObsType/windNorthward + # - variable: ObsValue/windNorthward + # - variable: QCflagsData/windEastward + # - variable: QCflagsData/windNorthward - filter: GOMsaver filename: ./data/geovals/aircft_geovals_rrfs.nc4 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 dedf89b..5edd6d3 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 @@ -1,5 +1,5 @@ - obs space: - name: mesonet + name: msonet obsdatain: engine: type: H5File 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 3e50517..ddf7f2b 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 @@ -1,5 +1,5 @@ - obs space: - name: mesonet + name: msonet obsdatain: engine: type: H5File @@ -129,9 +129,9 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/specificHumidity + # - variable: ObsValue/specificHumidity + # - variable: QCflagsData/specificHumidity - filter: GOMsaver filename: ./data/geovals/msonet_geovals_rrfs.nc4 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 6cefdc1..0cc14b0 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 @@ -1,5 +1,5 @@ - obs space: - name: mesonet + name: msonet obsdatain: engine: type: H5File @@ -126,9 +126,9 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/stationPressure + # - variable: ObsValue/stationPressure + # - variable: QCflagsData/stationPressure - filter: GOMsaver filename: ./data/geovals/msonet_geovals_rrfs.nc4 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_uv_288.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_uv_288.yaml index 9316c08..abafc90 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_uv_288.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_uv_288.yaml @@ -1,5 +1,5 @@ - obs space: - name: mesonet + name: msonet obsdatain: engine: type: H5File @@ -53,7 +53,7 @@ action: name: assign error error parameter: 3.0 # m/s - #defer to post: true + defer to post: true ## Ajusted error after initial assignment (qcmod.f90) #- filter: Perform Action @@ -89,7 +89,7 @@ variable: windEastward inflation factor: 0.0 #geovar_sfc_geomz: surface_geometric_height #FV3 - #geovar_sfc_geomz: surface_geopotential_height #MPAS + #geovar_sfc_geomz: surface_altitude #MPAS defer to post: true # ------------------ @@ -106,7 +106,7 @@ action: name: assign error error parameter: 3.0 # m/s - #defer to post: true + defer to post: true ## Ajusted error after initial assignment (qcmod.f90) #- filter: Perform Action @@ -142,7 +142,7 @@ variable: windNorthward inflation factor: 0.0 #geovar_sfc_geomz: surface_geometric_height #FV3 - #geovar_sfc_geomz: surface_geopotential_height #MPAS + #geovar_sfc_geomz: surface_altitude #MPAS defer to post: true - filter: Bounds Check @@ -199,9 +199,12 @@ # - variable: MetaData/latitude # - variable: MetaData/longitude # - variable: MetaData/pressure - # - variable: ObsType/airTemperature - # - variable: ObsValue/airTemperature - # - variable: QCflagsData/airTemperature + # - variable: ObsType/windEastward + # - variable: ObsValue/windEastward + # - variable: ObsType/windNorthward + # - variable: ObsValue/windNorthward + # - variable: QCflagsData/windEastward + # - variable: QCflagsData/windNorthward - filter: GOMsaver filename: ./data/geovals/msonet_geovals_rrfs.nc4