update two yaml files via query_cxx

test/CMakeLists.txt

@@ -160,7 +160,7 @@ if( iodaconv_bufr_ENABLED )
     testinput/bufr_splitting.yaml
     testinput/bufr_filter_split.yaml
     testinput/bufr_adpsfc.yaml
-    testinput/bufr_snow_adpsfc.yaml
+    testinput/bufr_ncep_snow_adpsfc.yaml
     testinput/bufr_read_2_dim_blocks.yaml
     testinput/bufr_ncep_1bamua.yaml
     testinput/bufr_ncep_1bmhs.yaml
@@ -170,7 +170,7 @@ if( iodaconv_bufr_ENABLED )
     testinput/bufr_read_wmo_radiosonde.yaml
     testinput/bufr_satwnd_old_format.yaml
     testinput/bufr_satwnd_new_format.yaml
-    testinput/bufr_sevcrs_v2.yaml
+    testinput/bufr_ncep_sevcsr.yaml
     testinput/bufr_mtiasi.yaml
     testinput/bufr_simple_groupby.yaml
     testinput/bufr_empty_fields.yaml
@@ -960,12 +960,12 @@ if(iodaconv_bufr_ENABLED)
                             gdas.t06z.adpsfc.tm00.nc ${IODA_CONV_COMP_TOL_ZERO}
                     DEPENDS bufr2ioda.x )
 
-  ecbuild_add_test( TARGET  test_iodaconv_bufr_snowadpsfc2ioda
+  ecbuild_add_test( TARGET  test_iodaconv_bufr_ncep_snowadpsfc2ioda
                     TYPE    SCRIPT
                     COMMAND bash
                     ARGS    ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh
                             netcdf
-                            "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_snow_adpsfc.yaml"
+                            "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_ncep_snow_adpsfc.yaml"
                             gdas.t06z.adpsfc_snow.tm00.nc ${IODA_CONV_COMP_TOL_ZERO}
                     DEPENDS bufr2ioda.x )
 
@@ -1055,6 +1055,22 @@ if(iodaconv_bufr_ENABLED)
                     adpupa_prepbufr.nc ${IODA_CONV_COMP_TOL_ZERO}
                     DEPENDS bufr2ioda.x )
 
+  ecbuild_add_test( TARGET  test_iodaconv_bufr_adpupa_groupby
+                    TYPE    SCRIPT
+                    COMMAND ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh
+                    ARGS    netcdf
+                    "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/adpupa_prepbufr_group_by.yaml"
+                    adpupa_prepbufr_group_by.nc ${IODA_CONV_COMP_TOL_ZERO}
+                    DEPENDS bufr2ioda.x )
+
+ ecbuild_add_test( TARGET  test_iodaconv_bufr_ncep_sevcsr
+                    TYPE    SCRIPT
+                    COMMAND ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh
+                    ARGS    netcdf
+                    "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_ncep_sevcsr.yaml"
+                    gdas.t00z.sevcsr.tm00.nc ${IODA_CONV_COMP_TOL_ZERO}
+                    DEPENDS bufr2ioda.x )
+
 #  ecbuild_add_test( TARGET  test_iodaconv_bufr_aircar
 #                    TYPE    SCRIPT
 #                    COMMAND ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh

test/testinput/bufr_sevcrs_v2.yaml → test/testinput/bufr_ncep_sevcsr.yaml

@@ -1,4 +1,4 @@
-# (C) Copyright 2021 UCAR1:wq
+# (C) Copyright 2021-2022 UCAR
 
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
@@ -30,9 +30,11 @@ observations:
             query: "*/SAZA"
           cloudAmount:
             query: "*/RPSEQ7/CLDMNT"
+            transforms:
+              - scale: 0.01
           brightnessTemperature:
             query: "*/RPSEQ7/TMBRST"
-          brightnessTemperatureStdDev:
+          brightnessTemperatureStandardDeviation:
             query: "*/RPSEQ7/SDTB"
 
     ioda:
@@ -45,19 +47,18 @@ observations:
             - "*/RPSEQ7"
 
       globals:
-        - name: "MetaData/platformCommonName"
+        - name: "platformCommonName"
           type: string
           value: "MSG-SEVIRI"
 
-        - name: "MetaData/platformLongDescription"
+        - name: "platformLongDescription"
           type: string
           value: "MTYP 021-043 PROC. MSG SEVIRI CLEAR SKY RADIANCES (CSR)"
 
       variables:
         - name: "MetaData/satelliteIdentifier"
           source: variables/satelliteIdentifier
           longName: "Satellite identifier"
-          units: ""
 
         - name: "MetaData/latitude"
           source: variables/latitude
@@ -91,9 +92,9 @@ observations:
         - name: "ObsValue/cloudAmount"
           coordinates: "longitude latitude Channel"
           source: variables/cloudAmount
-          longName: "Amount of cloud coverage"
-          units: "%"
-          range: [0, 100]
+          longName: "Cloud amount in segment"
+          units: "1"
+          range: [0, 1]
           chunks: [1000, 15]
 
         - name: "ObsValue/brightnessTemperature"
@@ -104,9 +105,9 @@ observations:
           range: [150, 350]
           chunks: [1000, 15]
 
-        - name: "ObsValue/brightnessTemperatureStdDev"
+        - name: "ObsValue/brightnessTemperatureStandardDeviation"
           coordinates: "longitude latitude Channel"
-          source: variables/brightnessTemperatureStdDev
+          source: variables/brightnessTemperatureStandardDeviation
           longName: "Brightness temperature standard deviation"
           units: "K"
           chunks: [1000, 15]

test/testinput/bufr_snow_adpsfc.yaml → test/testinput/bufr_ncep_snow_adpsfc.yaml

@@ -1,4 +1,4 @@
-# (C) Copyright 2021 NOAA/NWS/NCEP/EMC
+# (C) Copyright 2021-2022 NOAA/NWS/NCEP/EMC
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
@@ -13,11 +13,11 @@ observations:
         variables:
           timestamp:
             datetime:
-              year: "[NC000007/YEAR[1],*/YEAR]"
-              month: "[NC000007/MNTH[1],*/MNTH]"
-              day: "[NC000007/DAYS[1], */DAYS]"
-              hour: "[NC000007/HOUR[1], */HOUR]"
-              minute: "[NC000007/MINU[1], */MINU]"
+              year: "*/YEAR[1]"
+              month: "*/MNTH[1]"
+              day: "*/DAYS[1]"
+              hour: "*/HOUR[1]"
+              minute: "*/MINU[1]"
 
           longitude:
             query: "[*/CLON, */CLONH]"
@@ -26,7 +26,7 @@ observations:
             query:  "[*/CLAT, */CLATH]"
 
           stationPressure:
-            query: "[*/PRES]"
+            query: "*/PRES"
 
           stationElevation:
             query: "[*/SELV, */HSMSL]"
@@ -49,56 +49,54 @@ observations:
       obsdataout: "./testrun/gdas.t06z.adpsfc_snow.tm00.nc"
 
       variables:
-        - name: "dateTime@MetaData"
+        - name: "MetaData/dateTime"
           source: variables/timestamp
           longName: "dateTime"
           units: "seconds since 1970-01-01T00:00:00Z"
 
-        - name: "stationIdentification@MetaData"
+        - name: "MetaData/stationIdentification"
           source: variables/stationIdentification
-          dimensions: ["nlocs"]
           longName: "Report Number"
-          units: "string"
 
-        - name: "latitude@MetaData"
+        - name: "MetaData/latitude"
           source: variables/latitude
           longName: "Latitude"
           units: "degrees_north"
           range: [-90, 90]
 
-        - name: "longitude@MetaData"
+        - name: "MetaData/longitude"
           source: variables/longitude
           longName: "Longitude"
           units: "degrees_east"
           range: [-180, 180]
 
-        - name: "stationElevation@MetaData"
+        - name: "MetaData/stationElevation"
           coordinates: "longitude latitude"
           source: variables/stationElevation
           longName: "Height of Station"
           units: "m"
 
-        - name: "stationPressure@ObsValue"
+        - name: "ObsValue/stationPressure"
           coordinates: "longitude latitude"
           source: variables/stationPressure
           longName: "Station Pressure"
           units: "Pa"
           range: [90000, 105000]
 
-        - name: "airTemperature@ObsValue"
+        - name: "ObsValue/airTemperature"
           source: variables/airTemperature
           longName: "Temperature of Air"
           units: "K"
           range: [230, 315]
 
-        - name: "dewpointTemperature@ObsValue"
+        - name: "ObsValue/dewpointTemperature"
           coordinates: "longitude latitude"
           source: variables/dewpointTemperature
           longName: "Dewpoint Temperature"
           units: "K"
           range: [200, 315]
 
-        - name: "totalSnowDepth@ObsValue"
+        - name: "ObsValue/totalSnowDepth"
           coordinates: "longitude latitude"
           source: variables/totalSnowDepth
           longName: "Total Snow Depth"

test/testinput/bufr_read_2_dim_blocks.yaml

@@ -9,7 +9,15 @@ observations:
       obsdatain: "./testinput/bufr_read_2_dim_blocks.bufr"
 
       exports:
+
         variables:
+
+          latitude:
+            query: "*/CLAT"
+
+          longitude:
+            query: "*/CLON"
+
           originatingGeneratingCenter:
             query: "*/OGCE"
 
@@ -42,55 +50,60 @@ observations:
       obsdataout: "./testrun/bufr_read_2_dim_blocks.nc"
 
       dimensions:
-        - name: "ncols_conf"
+        - name: "Confidence"
           paths:
             - "*/QCPRMS"
 
       variables:
-        - name: "originatingGeneratingCenter@MetaData"
+        - name: "MetaData/latitude"
+          source: variables/latitude
+          longName: "Latitude (Coarse Accuracy)"
+          units: "degree_north"
+
+        - name: "MetaData/longitude"
+          source: variables/longitude
+          longName: "Longitude (Coarse Accuracy)"
+          units: "degree_east"
+
+        - name: "MetaData/dataProviderOrigin"
           source: variables/originatingGeneratingCenter
           longName: "Originating Generating Center"
-          units: "id"
 
-        - name: "pressure@GeneratingApplication"
+        - name: "MetaData/pressureGeneratingApplication"
           source: variables/pressure
-          longName: "air pressure"
-          units: "id"
+          longName: "Generating Application for Pressure"
 
-        - name: "windDirection@GeneratingApplication"
+        - name: "MetaData/windDirectionGeneratingApplication"
           source: variables/windDirection
-          longName: "wind direction"
-          units: "id"
+          longName: "Generating Application for Wind Direction"
 
-        - name: "windSpeed@GeneratingApplication"
+        - name: "MetaData/windSpeedGeneratingApplication"
           source: variables/windSpeed
-          longName: "wind speed"
-          units: "id"
+          longName: "Generating Application for Wind Speed"
 
-        - name: "coldClusterTemperature@GeneratingApplication"
+        - name: "MetaData/coldClusterTemperatureGeneratingApplication"
           source: variables/coldClusterTemperature
-          longName: "cold cluster temperature"
-          units: "id"
+          longName: "Generating Application for Cold Cluster Temperature"
 
-        - name: "pressure@PercentConfidence"
+        - name: "MetaData/pressurePercentConfidence"
           coordinates: "longitude latitude"
           source: variables/percentConfidencePressure
           longName: "Percent Confidence of Pressure"
           units: "percent"
 
-        - name: "windDirection@PercentConfidence"
+        - name: "MetaData/windDirectionPercentConfidence"
           coordinates: "longitude latitude"
           source: variables/percentConfidenceWindDirection
           longName: "Percent Confidence of Wind Direction"
           units: "percent"
 
-        - name: "windSpeed@PercentConfidence"
+        - name: "MetaData/windSpeedPercentConfidence"
           coordinates: "longitude latitude"
           source: variables/percentConfidenceWindSpeed
           longName: "Percent Confidence of Wind Speed"
           units: "percent"
 
-        - name: "coldClusterTemperature@PercentConfidence"
+        - name: "MetaData/coldClusterTemperaturePercentConfidence"
           coordinates: "longitude latitude"
           source: variables/percentConfidenceColdClusterTemperature
           longName: "Percent Confidence of Clod Cluster Temperature"