From 3e14516197416e8e3ebc1b8c928daf18783813ef Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 9 Mar 2022 20:21:35 -0600 Subject: [PATCH 01/29] allow units attribute to a variable to be optional --- src/bufr/IodaEncoder/IodaEncoder.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bufr/IodaEncoder/IodaEncoder.cpp b/src/bufr/IodaEncoder/IodaEncoder.cpp index 78f1f584f..ebaeee511 100644 --- a/src/bufr/IodaEncoder/IodaEncoder.cpp +++ b/src/bufr/IodaEncoder/IodaEncoder.cpp @@ -155,7 +155,10 @@ namespace Ingester var.atts.add("long_name", { varDesc.longName }, {1}); - var.atts.add("units", { varDesc.units }, {1}); + if (varDesc.units) + { + var.atts.add("units", { varDesc.units }, {1}); + } if (varDesc.coordinates) { From aa3a8c30ff7633633b93e97752679cc13c1e6b19 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 9 Mar 2022 20:46:16 -0600 Subject: [PATCH 02/29] allow units attribute to a variable to be optional --- src/bufr/IodaEncoder/IodaDescription.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/bufr/IodaEncoder/IodaDescription.cpp b/src/bufr/IodaEncoder/IodaDescription.cpp index 1c788c773..240c28930 100644 --- a/src/bufr/IodaEncoder/IodaDescription.cpp +++ b/src/bufr/IodaEncoder/IodaDescription.cpp @@ -115,7 +115,15 @@ namespace Ingester variable.source = varConf.getString(ConfKeys::Variable::Source); variable.dimensions = varConf.getStringVector(ConfKeys::Variable::Dimensions); variable.longName = varConf.getString(ConfKeys::Variable::LongName); - variable.units = varConf.getString(ConfKeys::Variable::Units); + + if (varConf.has(ConfKeys::Variable::Units)) + { + variable.units = varConf.getString(ConfKeys::Variable::Units); + } + else + { + variable.units = nullptr; + } if (varConf.has(ConfKeys::Variable::Coords)) { From a700602715cfb0af8fcba3b2b6ad83959d5d0b34 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 9 Mar 2022 21:29:10 -0600 Subject: [PATCH 03/29] skip units if set to none or empty quotes --- src/bufr/IodaEncoder/IodaDescription.cpp | 10 +--------- src/bufr/IodaEncoder/IodaEncoder.cpp | 3 ++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/bufr/IodaEncoder/IodaDescription.cpp b/src/bufr/IodaEncoder/IodaDescription.cpp index 240c28930..1c788c773 100644 --- a/src/bufr/IodaEncoder/IodaDescription.cpp +++ b/src/bufr/IodaEncoder/IodaDescription.cpp @@ -115,15 +115,7 @@ namespace Ingester variable.source = varConf.getString(ConfKeys::Variable::Source); variable.dimensions = varConf.getStringVector(ConfKeys::Variable::Dimensions); variable.longName = varConf.getString(ConfKeys::Variable::LongName); - - if (varConf.has(ConfKeys::Variable::Units)) - { - variable.units = varConf.getString(ConfKeys::Variable::Units); - } - else - { - variable.units = nullptr; - } + variable.units = varConf.getString(ConfKeys::Variable::Units); if (varConf.has(ConfKeys::Variable::Coords)) { diff --git a/src/bufr/IodaEncoder/IodaEncoder.cpp b/src/bufr/IodaEncoder/IodaEncoder.cpp index ebaeee511..d341fcc92 100644 --- a/src/bufr/IodaEncoder/IodaEncoder.cpp +++ b/src/bufr/IodaEncoder/IodaEncoder.cpp @@ -155,7 +155,8 @@ namespace Ingester var.atts.add("long_name", { varDesc.longName }, {1}); - if (varDesc.units) + + if (!(varDesc.units == "none" || varDesc.units == "")) { var.atts.add("units", { varDesc.units }, {1}); } From 0ff4aaf956cc7cacb7f7424e3f5ff0feb5f3796f Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Thu, 10 Mar 2022 09:11:29 -0600 Subject: [PATCH 04/29] updates to aircar, airep, amdar to match naming conventions --- test/testinput/aircar_BUFR2ioda.yaml | 64 ++++++++++----------- test/testinput/airep_wmoBUFR2ioda.yaml | 50 ++++++++--------- test/testinput/amdar_wmoBUFR2ioda.yaml | 78 +++++++++++++------------- 3 files changed, 96 insertions(+), 96 deletions(-) diff --git a/test/testinput/aircar_BUFR2ioda.yaml b/test/testinput/aircar_BUFR2ioda.yaml index 71d37d752..645f06a58 100644 --- a/test/testinput/aircar_BUFR2ioda.yaml +++ b/test/testinput/aircar_BUFR2ioda.yaml @@ -34,19 +34,19 @@ observations: mnemonic: CLON height: mnemonic: IALT - aircraftFlightNum: + aircraftIdentifier: mnemonic: ACID aircraftRegistrationNum: mnemonic: ACRN aircraftFlightPhase: mnemonic: DPOF - aircraftTrueAirspeed: + aircraftVelocity: mnemonic: TASP aircraftHeading: mnemonic: ACTH aircraftRollAngle: mnemonic: ROLQ - temperatureAir: + airTemperature: mnemonic: TMDB waterVaporMixingRatio: mnemonic: MIXR @@ -60,94 +60,94 @@ observations: obsdataout: "./testrun/gdas.aircar.t00z.20210801.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - name: "MetaData/height" source: variables/height - dimensions: [ "nlocs" ] - longName: "Pressure altitude" + dimensions: [ "Location" ] + longName: "Height" units: "m" - name: "MetaData/aircraftRegistrationNum" source: variables/aircraftRegistrationNum - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft registration number or other ID" units: "none" - - name: "MetaData/aircraftFlightNum" - source: variables/aircraftFlightNum - dimensions: [ "nlocs" ] + - name: "MetaData/aircraftIdentifier" + source: variables/aircraftIdentifier + dimensions: [ "Location" ] longName: "Aircraft flight number" units: "none" - name: "MetaData/aircraftFlightPhase" source: variables/aircraftFlightPhase - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft flight phase (ascending/descending/level)" units: "none" - name: "MetaData/aircraftTrueAirspeed" - source: variables/aircraftTrueAirspeed - dimensions: [ "nlocs" ] - longName: "Aircraft true airspeed" + source: variables/aircraftVelocity + dimensions: [ "Location" ] + longName: "Aircraft velocity" units: "m s-1" - name: "MetaData/aircraftHeading" source: variables/aircraftHeading - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft heading" - units: "deg" + units: "degree" - name: "MetaData/aircraftRollAngle" source: variables/aircraftRollAngle - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft roll angle quality" - units: "none" + units: "degree" - - name: "ObsValue/air_temperature" + - name: "ObsValue/airTemperature" coordinates: "longitude latitude" - source: variables/temperatureAir - dimensions: [ "nlocs" ] + source: variables/airTemperature + dimensions: [ "Location" ] longName: "Air Temperature" units: "K" - - name: "ObsValue/specific_humidity" + - name: "ObsValue/waterVaporMixingRatio" coordinates: "longitude latitude" source: variables/waterVaporMixingRatio - dimensions: [ "nlocs" ] - longName: "specific humidity" + dimensions: [ "Location" ] + longName: "Water Vapor Mixing Ratio" units: "kg kg-1" - - name: "ObsValue/wind_direction" + - name: "ObsValue/windDirection" coordinates: "longitude latitude" source: variables/windDirection - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Wind Direction" - units: "degrees" + units: "degree" - - name: "ObsValue/wind_speed" + - name: "ObsValue/windSpeed" coordinates: "longitude latitude" source: variables/windSpeed - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Wind Speed" units: "m s-1" diff --git a/test/testinput/airep_wmoBUFR2ioda.yaml b/test/testinput/airep_wmoBUFR2ioda.yaml index 3a7b989c0..6f211d3b0 100644 --- a/test/testinput/airep_wmoBUFR2ioda.yaml +++ b/test/testinput/airep_wmoBUFR2ioda.yaml @@ -28,13 +28,13 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - altitude: + height: mnemonic: HMSL - aircraftFlightNum: + aircraftIdentifier: mnemonic: ACID aircraftFlightPhase: mnemonic: POAF - temperatureAir: + airTemperature: mnemonic: TMDBST windDirection: mnemonic: WDIR @@ -46,63 +46,63 @@ observations: obsdataout: "./testrun/airep_multi.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - - name: "MetaData/altitude" - source: variables/altitude - dimensions: [ "nlocs" ] - longName: "Altitude" + - name: "MetaData/height" + source: variables/height + dimensions: [ "Location" ] + longName: "Height" units: "m" - - name: "MetaData/aircraftFlightNum" - source: variables/aircraftFlightNum - dimensions: [ "nlocs" ] - longName: "Aircraft flight number" + - name: "MetaData/aircraftIdentifier" + source: variables/aircraftIdentifier + dimensions: [ "Location" ] + longName: "Aircraft identifier" units: "" - name: "MetaData/aircraftFlightPhase" source: variables/aircraftFlightPhase - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft flight phase (ascending/descending/level)" units: "" - - name: "ObsValue/temperatureAir" + - name: "ObsValue/airTemperature" + source: variables/airTemperature coordinates: "longitude latitude" - source: variables/temperatureAir - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Air Temperature" units: "K" - name: "ObsValue/windDirection" - coordinates: "longitude latitude" source: variables/windDirection - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Direction" - units: "degrees true" + units: "degree" - name: "ObsValue/windSpeed" - coordinates: "longitude latitude" source: variables/windSpeed - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Speed" - units: "m/s" + units: "m s-1" diff --git a/test/testinput/amdar_wmoBUFR2ioda.yaml b/test/testinput/amdar_wmoBUFR2ioda.yaml index 5d958a07e..245ff773a 100644 --- a/test/testinput/amdar_wmoBUFR2ioda.yaml +++ b/test/testinput/amdar_wmoBUFR2ioda.yaml @@ -33,9 +33,9 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - pressureAltitude: + height: mnemonic: FLVLST - aircraftRegistrationNum: + aircraftIdentifier: mnemonic: ACRN aircraftFlightNum: mnemonic: ACID @@ -45,13 +45,13 @@ observations: mnemonic: OSQN aircraftFlightPhase: mnemonic: DPOF - aircraftTrueAirspeed: + aircraftVelocity: mnemonic: TASP aircraftHeading: mnemonic: ACTH aircraftRollAngle: mnemonic: ROLQ - temperatureAir: + airTemperature: mnemonic: TMDB waterVaporMixingRatio: mnemonic: MIXR @@ -65,106 +65,106 @@ observations: obsdataout: "./testrun/amdar_wmo_multi.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - name: "MetaData/height" - source: variables/pressureAltitude - dimensions: [ "nlocs" ] - longName: "Pressure altitude" + source: variables/height + dimensions: [ "Location" ] + longName: "Height" units: "m" - - name: "MetaData/aircraftRegistrationNum" - source: variables/aircraftRegistrationNum - dimensions: [ "nlocs" ] - longName: "Aircraft registration number or other ID" + - name: "MetaData/aircraftIdentifier" + source: variables/aircraftIdentifier + dimensions: [ "Location" ] + longName: "Aircraft Identifier" units: "none" - name: "MetaData/aircraftFlightNum" source: variables/aircraftFlightNum - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft flight number" units: "none" - name: "MetaData/aircraftTailNum" source: variables/aircraftTailNum - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft tail number" units: "none" - name: "MetaData/observationSequenceNum" source: variables/observationSequenceNum - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Observation sequence number" units: "none" - name: "MetaData/aircraftFlightPhase" source: variables/aircraftFlightPhase - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft flight phase (ascending/descending/level)" units: "none" - - name: "MetaData/aircraftTrueAirspeed" - source: variables/aircraftTrueAirspeed - dimensions: [ "nlocs" ] - longName: "Aircraft true airspeed" + - name: "MetaData/aircraftVelocity" + source: variables/aircraftVelocity + dimensions: [ "Location" ] + longName: "Aircraft velocity" units: "m s-1" - name: "MetaData/aircraftHeading" source: variables/aircraftHeading - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Aircraft heading" units: "deg" - name: "MetaData/aircraftRollAngle" source: variables/aircraftRollAngle - dimensions: [ "nlocs" ] - longName: "Aircraft roll angle quality" + dimensions: [ "Location" ] + longName: "Aircraft roll angle" units: "none" - - name: "ObsValue/air_temperature" + - name: "ObsValue/airTemperature" + source: variables/airTemperature coordinates: "longitude latitude" - source: variables/temperatureAir - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Air Temperature" units: "K" - - name: "ObsValue/specific_humidity" - coordinates: "longitude latitude" + - name: "ObsValue/waterVaporMixingRatio" source: variables/waterVaporMixingRatio - dimensions: [ "nlocs" ] - longName: "specific humidity" + coordinates: "longitude latitude" + dimensions: [ "Location" ] + longName: "Water Vapor Mixing Ratio" units: "kg kg-1" - - name: "ObsValue/wind_direction" - coordinates: "longitude latitude" + - name: "ObsValue/windDirection" source: variables/windDirection - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Direction" units: "degrees" - - name: "ObsValue/wind_speed" - coordinates: "longitude latitude" + - name: "ObsValue/windSpeed" source: variables/windSpeed - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Speed" units: "m s-1" From 7cc9e85753a8c1bf594673b654d9030a846a3377 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Thu, 10 Mar 2022 09:43:20 -0600 Subject: [PATCH 05/29] abbeviate degree for windDirection --- test/testinput/airep_wmoBUFR2ioda.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testinput/airep_wmoBUFR2ioda.yaml b/test/testinput/airep_wmoBUFR2ioda.yaml index 6f211d3b0..de92503ac 100644 --- a/test/testinput/airep_wmoBUFR2ioda.yaml +++ b/test/testinput/airep_wmoBUFR2ioda.yaml @@ -98,7 +98,7 @@ observations: coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Wind Direction" - units: "degree" + units: "deg" - name: "ObsValue/windSpeed" source: variables/windSpeed From 441a81b00971b9e33cd854f8dee2656d98007d90 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Thu, 10 Mar 2022 10:18:01 -0600 Subject: [PATCH 06/29] fix up windDirection and couple other items --- test/testinput/aircar_BUFR2ioda.yaml | 4 ++-- test/testinput/amdar_wmoBUFR2ioda.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/testinput/aircar_BUFR2ioda.yaml b/test/testinput/aircar_BUFR2ioda.yaml index 645f06a58..5273f5808 100644 --- a/test/testinput/aircar_BUFR2ioda.yaml +++ b/test/testinput/aircar_BUFR2ioda.yaml @@ -106,7 +106,7 @@ observations: longName: "Aircraft flight phase (ascending/descending/level)" units: "none" - - name: "MetaData/aircraftTrueAirspeed" + - name: "MetaData/aircraftVelocity" source: variables/aircraftVelocity dimensions: [ "Location" ] longName: "Aircraft velocity" @@ -143,7 +143,7 @@ observations: source: variables/windDirection dimensions: [ "Location" ] longName: "Wind Direction" - units: "degree" + units: "deg" - name: "ObsValue/windSpeed" coordinates: "longitude latitude" diff --git a/test/testinput/amdar_wmoBUFR2ioda.yaml b/test/testinput/amdar_wmoBUFR2ioda.yaml index 245ff773a..cd6e69ba2 100644 --- a/test/testinput/amdar_wmoBUFR2ioda.yaml +++ b/test/testinput/amdar_wmoBUFR2ioda.yaml @@ -160,7 +160,7 @@ observations: coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Wind Direction" - units: "degrees" + units: "deg" - name: "ObsValue/windSpeed" source: variables/windSpeed From e6b53eb1fc814d6b8631718d39acdbc04bf8a4f1 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Thu, 10 Mar 2022 13:53:53 -0600 Subject: [PATCH 07/29] many yaml files changed for JEDI naming conventions --- test/testinput/aircar_BUFR2ioda.yaml | 14 +-- test/testinput/airep_wmoBUFR2ioda.yaml | 2 +- test/testinput/amdar_wmoBUFR2ioda.yaml | 4 +- test/testinput/buoy_wmoBUFR2ioda.yaml | 78 ++++++------ test/testinput/gnssro_wmoBUFR2ioda.yaml | 117 ++++++++---------- test/testinput/rass_wmoBUFR2ioda.yaml | 49 ++++---- .../testinput/satwind_EUMet_wmoBUFR2ioda.yaml | 66 +++++----- .../satwind_Himawari_wmoBUFR2ioda.yaml | 66 +++++----- .../testinput/satwind_Insat_wmoBUFR2ioda.yaml | 84 ++++++------- test/testinput/ship_wmoBUFR2ioda.yaml | 81 ++++++------ test/testinput/synop_wmoBUFR2ioda.yaml | 66 +++++----- test/testinput/vadwinds_wmoBUFR2ioda.yaml | 44 +++---- 12 files changed, 325 insertions(+), 346 deletions(-) diff --git a/test/testinput/aircar_BUFR2ioda.yaml b/test/testinput/aircar_BUFR2ioda.yaml index 5273f5808..69d6cebfe 100644 --- a/test/testinput/aircar_BUFR2ioda.yaml +++ b/test/testinput/aircar_BUFR2ioda.yaml @@ -116,38 +116,38 @@ observations: source: variables/aircraftHeading dimensions: [ "Location" ] longName: "Aircraft heading" - units: "degree" + units: "degrees" - name: "MetaData/aircraftRollAngle" source: variables/aircraftRollAngle dimensions: [ "Location" ] longName: "Aircraft roll angle quality" - units: "degree" + units: "degrees" - name: "ObsValue/airTemperature" - coordinates: "longitude latitude" source: variables/airTemperature + coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Air Temperature" units: "K" - name: "ObsValue/waterVaporMixingRatio" - coordinates: "longitude latitude" source: variables/waterVaporMixingRatio + coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Water Vapor Mixing Ratio" units: "kg kg-1" - name: "ObsValue/windDirection" - coordinates: "longitude latitude" source: variables/windDirection + coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Wind Direction" - units: "deg" + units: "degrees" - name: "ObsValue/windSpeed" - coordinates: "longitude latitude" source: variables/windSpeed + coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Wind Speed" units: "m s-1" diff --git a/test/testinput/airep_wmoBUFR2ioda.yaml b/test/testinput/airep_wmoBUFR2ioda.yaml index de92503ac..659c21483 100644 --- a/test/testinput/airep_wmoBUFR2ioda.yaml +++ b/test/testinput/airep_wmoBUFR2ioda.yaml @@ -98,7 +98,7 @@ observations: coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Wind Direction" - units: "deg" + units: "degrees" - name: "ObsValue/windSpeed" source: variables/windSpeed diff --git a/test/testinput/amdar_wmoBUFR2ioda.yaml b/test/testinput/amdar_wmoBUFR2ioda.yaml index cd6e69ba2..8669c6b4b 100644 --- a/test/testinput/amdar_wmoBUFR2ioda.yaml +++ b/test/testinput/amdar_wmoBUFR2ioda.yaml @@ -133,7 +133,7 @@ observations: source: variables/aircraftHeading dimensions: [ "Location" ] longName: "Aircraft heading" - units: "deg" + units: "degrees" - name: "MetaData/aircraftRollAngle" source: variables/aircraftRollAngle @@ -160,7 +160,7 @@ observations: coordinates: "longitude latitude" dimensions: [ "Location" ] longName: "Wind Direction" - units: "deg" + units: "degrees" - name: "ObsValue/windSpeed" source: variables/windSpeed diff --git a/test/testinput/buoy_wmoBUFR2ioda.yaml b/test/testinput/buoy_wmoBUFR2ioda.yaml index 3fc9fc9e4..d7a9e7dc8 100644 --- a/test/testinput/buoy_wmoBUFR2ioda.yaml +++ b/test/testinput/buoy_wmoBUFR2ioda.yaml @@ -37,19 +37,19 @@ observations: mnemonic: CLONH stationElevation: mnemonic: HSAWS - temperatureAir: + airTemperature: mnemonic: TMDB - temperatureDewpoint: + dewpointTemperature: mnemonic: TMDP windDirection: mnemonic: WDIR windSpeed: mnemonic: WSPD - pressureStation: + stationPressure: mnemonic: PRES - meanSeaLevelPressure: + pressureReducedToMeanSeaLevel: mnemonic: PMSL - temperatureSeaSurface: + seaSurfaceTemperature: mnemonic: SST0 ioda: @@ -57,97 +57,97 @@ observations: obsdataout: "./testrun/buoy_wmo_multi.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - - name: "MetaData/station_id" + - name: "MetaData/stationIdentification" source: variables/stationIdentification - dimensions: [ "nlocs" ] - longName: "Station Identification" + dimensions: [ "Location" ] + longName: "Station Identifier" units: "none" - name: "MetaData/stationLongName" source: variables/stationLongName - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station long name" units: "none" - - name: "MetaData/station_elevation" + - name: "MetaData/stationElevation" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station Elevation" units: "m" - name: "MetaData/height" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Height" units: "m" - - name: "ObsValue/air_temperature" + - name: "ObsValue/airTemperature" + source: variables/airTemperature coordinates: "longitude latitude" - source: variables/temperatureAir - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Air Temperature" units: "K" - - name: "ObsValue/dewpoint_temperature" + - name: "ObsValue/dewpointTemperature" + source: variables/dewpointTemperature coordinates: "longitude latitude" - source: variables/temperatureDewpoint - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Dewpoint Temperature" units: "K" - - name: "ObsValue/wind_direction" - coordinates: "longitude latitude" + - name: "ObsValue/windDirection" source: variables/windDirection - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Direction" units: "degrees" - - name: "ObsValue/wind_speed" - coordinates: "longitude latitude" + - name: "ObsValue/windSpeed" source: variables/windSpeed - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Speed" units: "m s-1" - - name: "ObsValue/surface_pressure" + - name: "ObsValue/stationPressure" + source: variables/stationPressure coordinates: "longitude latitude" - source: variables/pressureStation - dimensions: [ "nlocs" ] - longName: "Surface Pressure" + dimensions: [ "Location" ] + longName: "Surface station pressure" units: "Pa" - - name: "ObsValue/sea_level_pressure" + - name: "ObsValue/pressureReducedToMeanSeaLevel" + source: variables/pressureReducedToMeanSeaLevel coordinates: "longitude latitude" - source: variables/meanSeaLevelPressure - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Mean Sea Level Pressure" units: "Pa" - - name: "ObsValue/sea_surface_temperature" + - name: "ObsValue/seaSurfaceTemperature" + source: variables/seaSurfaceTemperature coordinates: "longitude latitude" - source: variables/temperatureSeaSurface - dimensions: [ "nlocs" ] - longName: "Sea Surface Temperature" + dimensions: [ "Location" ] + longName: "Sea-surface temperature" units: "K" diff --git a/test/testinput/gnssro_wmoBUFR2ioda.yaml b/test/testinput/gnssro_wmoBUFR2ioda.yaml index 8cf315c04..6d4322707 100644 --- a/test/testinput/gnssro_wmoBUFR2ioda.yaml +++ b/test/testinput/gnssro_wmoBUFR2ioda.yaml @@ -37,7 +37,7 @@ observations: mnemonic: HEIT geopotentialHeight: mnemonic: GPHTST - airPressure: + pressure: mnemonic: PRES airTemperature: mnemonic: TMDBST @@ -58,18 +58,18 @@ observations: mnemonic: QFRO percentConfidence: mnemonic: PCCF - impactParameter: + impactParameterRO: mnemonic: IMPP geoidUndulation: mnemonic: GEODU - azimuth: + sensorAzimuthAngle: mnemonic: BEARAZ earthRadiusCurvature: mnemonic: ELRC bendingAngle: mnemonic: BNDA - refractivity: + atmosphericRefractivity: mnemonic: ARFR ioda: @@ -77,141 +77,130 @@ observations: obsdataout: "./testrun/gnssro_2020-306-2358C2E6.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - name: "MetaData/height" source: variables/height - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Height" units: "m" - name: "MetaData/geopotentialHeight" source: variables/geopotentialHeight - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Geopotential height" units: "m" - - name: "MetaData/airPressure" - coordinates: "longitude latitude" - source: variables/airPressure - dimensions: [ "nlocs" ] + - name: "MetaData/pressure" + source: variables/pressure + dimensions: [ "Location" ] longName: "Air pressure" units: "Pa" - - name: "MetaData/process_center - coordinates: "longitude latitude" + - name: "MetaData/originatingCenter" source: variables/originatingCenter - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Originating center" - units: "unitless" + units: "" - - name: "MetaData/gnss_sat_class - coordinates: "longitude latitude" + - name: "MetaData/satelliteClassification" source: variables/satelliteClassification - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "GNSS satellite classification" - units: "unitless" + units: "" - - name: "MetaData/reference_sat_id - coordinates: "longitude latitude" + - name: "MetaData/satelliteIdentifier" source: variables/satelliteIdentifier - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "GNSS satellite ID" - units: "unitless" + units: "" - - name: "MetaData/occulting_sat_is - coordinates: "longitude latitude" + - name: "MetaData/instrumentIdentifier" source: variables/instrumentIdentifier - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Instrument ID" - units: "unitless" + units: "" - - name: "MetaData/occulting_sat_id - coordinates: "longitude latitude" + - name: "MetaData/platformTransmitterId" source: variables/platformTransmitterId - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "GNSS platform transmitter ID" - units: "unitless" + units: "" - - name: "MetaData/qualityFlags - coordinates: "longitude latitude" + - name: "MetaData/qualityFlags" source: variables/qualityFlags - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Quality flags" - units: "unitless" + units: "" - - name: "MetaData/earth_radius_of_curvature" - coordinates: "longitude latitude" + - name: "MetaData/earthRadiusCurvature" source: variables/earthRadiusCurvature - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Earth local radius of curvature" units: "m" - - name: "MetaData/geoid_height_above_reference_ellipsoid - coordinates: "longitude latitude" + - name: "MetaData/geoidUndulation" source: variables/geoidUndulation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Geoid undulation" units: "m" - - name: "MetaData/impact_parameter - coordinates: "longitude latitude" - source: variables/impactParameter - dimensions: [ "nlocs" ] + - name: "MetaData/impactParameterRO" + source: variables/impactParameterRO + dimensions: [ "Location" ] longName: "Impact parameter" - units: "m" + units: "" - - name: "MetaData/sensor_azimuth_angle - coordinates: "longitude latitude" - source: variables/azimuth - dimensions: [ "nlocs" ] + - name: "MetaData/sensorAzimuthAngle" + source: variables/sensorAzimuthAngle + dimensions: [ "Location" ] longName: "Sensor azimuth angle" units: "degrees" - name: "ObsValue/airTemperature" - coordinates: "longitude latitude" source: variables/airTemperature - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Air temperature" units: "K" - name: "ObsValue/specificHumidity" - coordinates: "longitude latitude" source: variables/specificHumidity - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Specific humidity" units: "kg kg-1" - - name: "ObsValue/bending_angle" - coordinates: "longitude latitude" + - name: "ObsValue/bendingAngle" source: variables/bendingAngle - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Bending angle" units: "radians" - - name: "ObsValue/refractivity" + - name: "ObsValue/atmosphericRefractivity" + source: variables/atmosphericRefractivity coordinates: "longitude latitude" - source: variables/refractivity - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Refractivity" - units: "N units" + units: "INVALID N units" diff --git a/test/testinput/rass_wmoBUFR2ioda.yaml b/test/testinput/rass_wmoBUFR2ioda.yaml index e8b793fc2..d9b190a65 100644 --- a/test/testinput/rass_wmoBUFR2ioda.yaml +++ b/test/testinput/rass_wmoBUFR2ioda.yaml @@ -26,9 +26,9 @@ observations: day: DAYS hour: HOUR minute: MINU - stationIdWMOblock: + wmoBlockNumber: mnemonic: WMOB - stationIdWMOstation: + wmoStationNumber: mnemonic: WMOS latitude: mnemonic: CLAT @@ -50,68 +50,69 @@ observations: obsdataout: "./testrun/rass_wmo_multi.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - - name: "MetaData/stationIdWMOblock" - source: variables/stationIdWMOblock - dimensions: [ "nlocs" ] + - name: "MetaData/wmoBlockNumber" + source: variables/wmoBlockNumber + dimensions: [ "Location" ] longName: "Station Identification WMO block number" - units: "none" + units: "" - - name: "MetaData/stationIdWMOstation" - source: variables/stationIdWMOstation - dimensions: [ "nlocs" ] + - name: "MetaData/wmoStationNumber" + source: variables/wmoStationNumber + dimensions: [ "Location" ] longName: "Station Identification WMO station number" - units: "none" + units: "" - - name: "MetaData/station_elevation" + - name: "MetaData/stationElevation" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station Elevation" units: "m" - name: "MetaData/height" source: variables/height - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Height" units: "m" # ADD this in later # - name: "MetaData/qualityIndicator" # source: variables/qualityIndicator - # dimensions: [ "nlocs" ] + # dimensions: [ "Location" ] # longName: "Quality Indicator (0=good, 1=no-good)" # units: "unitless" - - name: "MetaData/signalToNoiseRatio" + - name: "ObsValue/signalToNoiseRatio" source: variables/signalToNoiseRatio - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Signal-to-noise Ratio" - units: "unitless" + units: "0.1 lg(re 0.001 m2 kg s-3)" - - name: "ObsValue/virtual_temperature" - coordinates: "longitude latitude" + - name: "ObsValue/virtualTemperature" source: variables/virtualTemperature - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Virtual Temperature" units: "K" diff --git a/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml b/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml index 2bf8b503e..23fa1a8ab 100644 --- a/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml +++ b/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml @@ -38,7 +38,7 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteId: + satelliteIdentifier: mnemonic: SAID generatingApplication: mnemonic: GNAPS @@ -54,7 +54,7 @@ observations: mnemonic: AMVQ sensorZenithAngle: mnemonic: SAZA - pressureAir: + pressure: mnemonic: PRLC windEastward: mnemonic: UWND @@ -68,103 +68,97 @@ observations: obsdataout: "./testrun/satwind_EUMet.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows - name: "nconfidences" size: variables/windPercentConfidence.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platform" type: string value: "EUMetSat_AMV" - - name: "MetaData/platformLongDescription" - type: string - value: "EUMetSat AMV from IR cloudy regions" - variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/generatingApplication" source: variables/generatingApplication - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Generating application" - units: "unitless" + units: "" - name: "MetaData/windComputationMethod" source: variables/windComputationMethod - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite wind calculation method" - units: "unitless" + units: "" - name: "MetaData/windHeightAssignMethod" source: variables/windHeightAssignMethod - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite wind height assignment method" - units: "unitless" + units: "" - name: "MetaData/sensorZenithAngle" - coordinates: "longitude latitude" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite zenith angle" units: "degrees" - - name: "MetaData/pressureAir" - coordinates: "longitude latitude" - source: variables/pressureAir - dimensions: ["nlocs"] + - name: "MetaData/pressure" + source: variables/pressure + dimensions: ["Location"] longName: "Pressure" units: "Pa" - name: "ObsValue/windEastward" - coordinates: "longitude latitude" source: variables/windEastward - dimensions: ["nlocs"] + coordinates: "longitude latitude" + dimensions: ["Location"] longName: "Wind eastward component" units: "m s-1" - name: "ObsValue/windNorthward" - coordinates: "longitude latitude" source: variables/windNorthward - dimensions: ["nlocs"] + coordinates: "longitude latitude" + dimensions: ["Location"] longName: "Wind northward component" units: "m s-1" - name: "MetaData/windPercentConfidence" - coordinates: "longitude latitude nconfidences" source: variables/windPercentConfidence - dimensions: ["nlocs", "nconfidences"] + coordinates: "longitude latitude nconfidences" + dimensions: ["Location", "nconfidences"] longName: "Percent confidence" units: "percent" - name: "MetaData/sensorCentralFrequency" - coordinates: "longitude latitude nconfidences" source: variables/sensorCentralFrequency - dimensions: ["nlocs"] + coordinates: "longitude latitude nconfidences" + dimensions: ["Location"] longName: "Sensor Central Frequency" - units: "hz" + units: "Hz" diff --git a/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml b/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml index 1059bc7e5..ae337bf84 100644 --- a/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml +++ b/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml @@ -40,7 +40,7 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteId: + satelliteIdentification: mnemonic: SAID dataProviderOrigin: mnemonic: GCLONG @@ -56,7 +56,7 @@ observations: mnemonic: TCMD sensorZenithAngle: mnemonic: SAZA - pressureAir: + pressure: mnemonic: PRLC windDirection: mnemonic: WDIR @@ -70,109 +70,103 @@ observations: obsdataout: "./testrun/satwind_Himawari.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows - name: "nconfidences" size: variables/windPercentConfidence.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platform" type: string value: "Himiwari_AMV" - - name: "MetaData/platformLongDescription" - type: string - value: "Himiwari AMV from IR cloudy regions" - variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] + - name: "MetaData/satelliteIdentification" + source: variables/satelliteIdentification + dimensions: ["Location"] longName: "Satellite identification" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/dataProviderOrigin" source: variables/dataProviderOrigin - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Data provider origin" units: "" - name: "MetaData/generatingApplication" source: variables/generatingApplication - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Generating application" units: "" - name: "MetaData/windComputationMethod" source: variables/windComputationMethod - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite wind calculation method" - units: " " + units: "" - name: "MetaData/windHeightAssignMethod" source: variables/windHeightAssignMethod - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite wind height assignment method" - units: " " + units: "" - name: "MetaData/sensorZenithAngle" - coordinates: "longitude latitude" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite zenith angle" units: "degrees" - - name: "MetaData/pressureAir" - coordinates: "longitude latitude" - source: variables/pressureAir - dimensions: ["nlocs"] + - name: "MetaData/pressure" + source: variables/pressure + dimensions: ["Location"] longName: "Pressure" units: "Pa" - name: "ObsValue/windDirection" - coordinates: "longitude latitude" source: variables/windDirection - dimensions: ["nlocs"] + coordinates: "longitude latitude" + dimensions: ["Location"] longName: "Wind direction" - units: "degrees true" + units: "degrees" - name: "ObsValue/windSpeed" - coordinates: "longitude latitude" source: variables/windSpeed - dimensions: ["nlocs"] + coordinates: "longitude latitude" + dimensions: ["Location"] longName: "Wind Speed" units: "m s-1" - name: "MetaData/windPercentConfidence" - coordinates: "longitude latitude nconfidences" source: variables/windPercentConfidence - dimensions: ["nlocs", "nconfidences"] + coordinates: "longitude latitude nconfidences" + dimensions: ["Location", "nconfidences"] longName: "Percent confidence" units: "percent" - name: "MetaData/sensorCentralFrequency" - coordinates: "longitude latitude nconfidences" source: variables/sensorCentralFrequency - dimensions: ["nlocs"] + coordinates: "longitude latitude nconfidences" + dimensions: ["Location"] longName: "Sensor Central Frequency" - units: "hz" + units: "Hz" diff --git a/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml b/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml index 078970ad5..0bcd2dbdc 100644 --- a/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml +++ b/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml @@ -39,7 +39,7 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteId: + satelliteIdentification: mnemonic: SAID dataProviderOrigin: mnemonic: GCLONG @@ -55,7 +55,7 @@ observations: mnemonic: TCMD sensorZenithAngle: mnemonic: SAZA - pressureAir: + pressure: mnemonic: PRLC windDirection: mnemonic: WDIR @@ -69,109 +69,103 @@ observations: obsdataout: "./testrun/satwind_Insat.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows - name: "nconfidences" size: variables/windPercentConfidence.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platform" type: string value: "Insat_AMV" - - name: "MetaData/platformLongDescription" - type: string - value: "Insat (Indian) AMV from IR cloudy regions" - variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] + - name: "MetaData/satelliteIdentification" + source: variables/satelliteIdentification + dimensions: ["Location"] longName: "Satellite identification" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/dataProviderOrigin" source: variables/dataProviderOrigin - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Data provider origin" units: "" - name: "MetaData/generatingApplication" source: variables/generatingApplication - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Generating application" units: "" - name: "MetaData/windComputationMethod" source: variables/windComputationMethod - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite wind calculation method" - units: " " + units: "" - name: "MetaData/windHeightAssignMethod" source: variables/windHeightAssignMethod - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite wind height assignment method" - units: " " + units: "" - name: "MetaData/sensorZenithAngle" - coordinates: "longitude latitude" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Satellite zenith angle" units: "degrees" - - name: "MetaData/air_pressure" - coordinates: "longitude latitude" - source: variables/pressureAir - dimensions: ["nlocs"] + - name: "MetaData/pressure" + source: variables/pressure + dimensions: ["Location"] longName: "Pressure" units: "Pa" - - name: "ObsValue/windDirection" - coordinates: "longitude latitude" - source: variables/windDirection - dimensions: ["nlocs"] - longName: "Wind direction" - units: "degrees true" - - - name: "ObsValue/windSpeed" - coordinates: "longitude latitude" - source: variables/windSpeed - dimensions: ["nlocs"] - longName: "Wind Speed" - units: "m s-1" - - name: "MetaData/windPercentConfidence" - coordinates: "longitude latitude nconfidences" source: variables/windPercentConfidence - dimensions: ["nlocs", "nconfidences"] + coordinates: "longitude latitude nconfidences" + dimensions: ["Location", "nconfidences"] longName: "Percent confidence" units: "percent" - name: "MetaData/sensorCentralFrequency" - coordinates: "longitude latitude nconfidences" source: variables/sensorCentralFrequency - dimensions: ["nlocs"] + coordinates: "longitude latitude nconfidences" + dimensions: ["Location"] longName: "Sensor Central Frequency" - units: "hz" + units: "Hz" + + - name: "ObsValue/windDirection" + source: variables/windDirection + coordinates: "longitude latitude" + dimensions: ["Location"] + longName: "Wind direction" + units: "degrees" + + - name: "ObsValue/windSpeed" + source: variables/windSpeed + coordinates: "longitude latitude" + dimensions: ["Location"] + longName: "Wind Speed" + units: "m s-1" diff --git a/test/testinput/ship_wmoBUFR2ioda.yaml b/test/testinput/ship_wmoBUFR2ioda.yaml index 6e4522076..12f079466 100644 --- a/test/testinput/ship_wmoBUFR2ioda.yaml +++ b/test/testinput/ship_wmoBUFR2ioda.yaml @@ -40,21 +40,21 @@ observations: mnemonic: CLON stationElevation: mnemonic: HBMSL - temperatureAir: + airTemperature: mnemonic: TMDB - temperatureDewpoint: + dewpointTemperature: mnemonic: TMDP - temperatureWetbulb: + wetBulbTemperature: mnemonic: TMWB windDirection: mnemonic: WDIR windSpeed: mnemonic: WSPD - pressureStation: + stationPressure: mnemonic: PRES - pressureMeanSeaLevel: + pressureReducedToMeanSeaLevel: mnemonic: PMSL - temperatureSeaSurface: + seaSurfaceTemperature: mnemonic: SST1 ioda: @@ -62,97 +62,104 @@ observations: obsdataout: "./testrun/ship_wmo_multi.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - name: "MetaData/stationIdentification" source: variables/stationIdentification - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station Identification" units: "none" - name: "MetaData/stationType" source: variables/stationType - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station type" units: "none" - - name: "MetaData/station_elevation" + - name: "MetaData/stationElevation" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station Elevation" units: "m" - name: "MetaData/height" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Height" units: "m" - - name: "ObsValue/air_temperature" + - name: "ObsValue/airTemperature" + source: variables/airTemperature coordinates: "longitude latitude" - source: variables/temperatureAir - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Air Temperature" units: "K" - - name: "ObsValue/dewpoint_temperature" + - name: "ObsValue/dewpointTemperature" + source: variables/dewpointTemperature coordinates: "longitude latitude" - source: variables/temperatureDewpoint - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Dewpoint Temperature" units: "K" - - name: "ObsValue/wetbulb_temperature" + - name: "ObsValue/wetBulbTemperature" + source: variables/wetBulbTemperature coordinates: "longitude latitude" - source: variables/temperatureWetbulb - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Wetbulb Temperature" units: "K" - - name: "ObsValue/wind_direction" - coordinates: "longitude latitude" + - name: "ObsValue/windDirection" source: variables/windDirection - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Direction" units: "degrees" - - name: "ObsValue/wind_speed" - coordinates: "longitude latitude" + - name: "ObsValue/windSpeed" source: variables/windSpeed - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Speed" units: "m s-1" - - name: "ObsValue/surface_pressure" + - name: "ObsValue/pressureReducedToMeanSeaLevel" + source: variables/pressureReducedToMeanSeaLevel + coordinates: "longitude latitude" + dimensions: [ "Location" ] + longName: "Mean sea-level pressure" + units: "Pa" + + - name: "ObsValue/stationPressure" + source: variables/stationPressure coordinates: "longitude latitude" - source: variables/pressureStation - dimensions: [ "nlocs" ] - longName: "Surface Pressure" + dimensions: [ "Location" ] + longName: "Surface station Pressure" units: "Pa" - - name: "ObsValue/sea_surface_temperature" + - name: "ObsValue/seaSurfaceTemperature" + source: variables/seaSurfaceTemperature coordinates: "longitude latitude" - source: variables/temperatureSeaSurface - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Sea Surface Temperature" units: "K" diff --git a/test/testinput/synop_wmoBUFR2ioda.yaml b/test/testinput/synop_wmoBUFR2ioda.yaml index fd1747eb5..3997e9f93 100644 --- a/test/testinput/synop_wmoBUFR2ioda.yaml +++ b/test/testinput/synop_wmoBUFR2ioda.yaml @@ -25,9 +25,9 @@ observations: day: DAYS hour: HOUR minute: MINU - stationIdWMOblock: + wmoBlockNumber: mnemonic: WMOB - stationIdWMOstation: + wmoStationNumber: mnemonic: WMOS stationLongName: mnemonic: STSN @@ -37,15 +37,15 @@ observations: mnemonic: CLONH stationElevation: mnemonic: HSMSL - temperatureAir: + airTemperature: mnemonic: TMDB - temperatureDewpoint: + dewpointTemperature: mnemonic: TMDP windDirection: mnemonic: WDIR windSpeed: mnemonic: WSPD - pressureStation: + stationPressure: mnemonic: PRES ioda: @@ -53,83 +53,83 @@ observations: obsdataout: "./testrun/synop_wmo_multi.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - - name: "MetaData/stationIdWMOblock" - source: variables/stationIdWMOblock - dimensions: [ "nlocs" ] + - name: "MetaData/wmoBlockNumber" + source: variables/wmoBlockNumber + dimensions: [ "Location" ] longName: "Station Identification WMO block number" units: "none" - - name: "MetaData/stationIdWMOstation" - source: variables/stationIdWMOstation - dimensions: [ "nlocs" ] + - name: "MetaData/wmoStationNumber" + source: variables/wmoStationNumber + dimensions: [ "Location" ] longName: "Station Identification WMO station number" units: "none" - - name: "MetaData/station_elevation" + - name: "MetaData/stationElevation" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station Elevation" units: "m" - name: "MetaData/height" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Height" units: "m" - - name: "ObsValue/air_temperature" + - name: "ObsValue/airTemperature" + source: variables/airTemperature coordinates: "longitude latitude" - source: variables/temperatureAir - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Air Temperature" units: "K" - - name: "ObsValue/dewpoint_temperature" + - name: "ObsValue/dewpointTemperature" + source: variables/dewpointTemperature coordinates: "longitude latitude" - source: variables/temperatureDewpoint - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Dewpoint Temperature" units: "K" - - name: "ObsValue/wind_direction" - coordinates: "longitude latitude" + - name: "ObsValue/windDirection" source: variables/windDirection - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Direction" units: "degrees" - - name: "ObsValue/wind_speed" - coordinates: "longitude latitude" + - name: "ObsValue/windSpeed" source: variables/windSpeed - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Speed" units: "m s-1" - - name: "ObsValue/surface_pressure" + - name: "ObsValue/stationPressure" + source: variables/stationPressure coordinates: "longitude latitude" - source: variables/pressureStation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Surface Pressure" units: "Pa" diff --git a/test/testinput/vadwinds_wmoBUFR2ioda.yaml b/test/testinput/vadwinds_wmoBUFR2ioda.yaml index 49e546617..44b3c8be8 100644 --- a/test/testinput/vadwinds_wmoBUFR2ioda.yaml +++ b/test/testinput/vadwinds_wmoBUFR2ioda.yaml @@ -25,9 +25,9 @@ observations: day: DAYS hour: HOUR minute: MINU - stationIdWMOblock: + wmoBlockNumber: mnemonic: WMOB - stationIdWMOstation: + wmoStationNumber: mnemonic: WMOS latitude: mnemonic: CLAT @@ -49,69 +49,69 @@ observations: obsdataout: "./testrun/vadwinds_wmo_multi.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/latitude.nrows variables: - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/latitude" source: variables/latitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Latitude" units: "degrees_north" - name: "MetaData/longitude" source: variables/longitude - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Longitude" units: "degrees_east" - - name: "MetaData/stationIdWMOblock" - source: variables/stationIdWMOblock - dimensions: [ "nlocs" ] + - name: "MetaData/wmoBlockNumber" + source: variables/wmoBlockNumber + dimensions: [ "Location" ] longName: "Station Identification WMO block number" units: "none" - - name: "MetaData/stationIdWMOstation" - source: variables/stationIdWMOstation - dimensions: [ "nlocs" ] + - name: "MetaData/wmoStationNumber" + source: variables/wmoStationNumber + dimensions: [ "Location" ] longName: "Station Identification WMO station number" units: "none" - - name: "MetaData/station_elevation" + - name: "MetaData/stationElevation" source: variables/stationElevation - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Station Elevation" units: "m" - name: "MetaData/height" source: variables/height - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "Height" units: "m" # ADD this in later # - name: "MetaData/qualityIndicator" # source: variables/qualityIndicator - # dimensions: [ "nlocs" ] + # dimensions: [ "Location" ] # longName: "Quality Indicator" # units: "unitless" - - name: "ObsValue/wind_direction" - coordinates: "longitude latitude" + - name: "ObsValue/windDirection" source: variables/windDirection - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Direction" units: "degrees" - - name: "ObsValue/wind_speed" - coordinates: "longitude latitude" + - name: "ObsValue/windSpeed" source: variables/windSpeed - dimensions: [ "nlocs" ] + coordinates: "longitude latitude" + dimensions: [ "Location" ] longName: "Wind Speed" units: "m s-1" From 74a67f5bcf7ccfedb1862b3fca5bdafecb906611 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Thu, 10 Mar 2022 16:07:39 -0600 Subject: [PATCH 08/29] adjust many files to align with JEDI naming conventions --- test/testinput/aircar_BUFR2ioda.yaml | 18 ++++++++++---- test/testinput/amdar_wmoBUFR2ioda.yaml | 22 ++++++----------- test/testinput/gnssro_wmoBUFR2ioda.yaml | 16 ++++--------- .../testinput/satwind_EUMet_wmoBUFR2ioda.yaml | 18 +++++++------- .../satwind_Himawari_wmoBUFR2ioda.yaml | 24 +++++++++---------- .../testinput/satwind_Insat_wmoBUFR2ioda.yaml | 24 +++++++++---------- 6 files changed, 57 insertions(+), 65 deletions(-) diff --git a/test/testinput/aircar_BUFR2ioda.yaml b/test/testinput/aircar_BUFR2ioda.yaml index 69d6cebfe..c557ea6bb 100644 --- a/test/testinput/aircar_BUFR2ioda.yaml +++ b/test/testinput/aircar_BUFR2ioda.yaml @@ -14,7 +14,7 @@ observations: - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, SECO] - mnemonics: [ACID, ACRN] - mnemonics: [CLAT, CLON] - - mnemonics: [IALT, DPOF, ROLQ] + - mnemonics: [IALT, DPOF, ROLL, ROLQ] - mnemonics: [MIXR, TMDB, WDIR, WSPD] - mnemonics: [TASP, ACTH] @@ -36,7 +36,7 @@ observations: mnemonic: IALT aircraftIdentifier: mnemonic: ACID - aircraftRegistrationNum: + aircraftTailNumber: mnemonic: ACRN aircraftFlightPhase: mnemonic: DPOF @@ -45,6 +45,8 @@ observations: aircraftHeading: mnemonic: ACTH aircraftRollAngle: + mnemonic: ROLL + aircraftRollAngleQuality: mnemonic: ROLQ airTemperature: mnemonic: TMDB @@ -88,8 +90,8 @@ observations: longName: "Height" units: "m" - - name: "MetaData/aircraftRegistrationNum" - source: variables/aircraftRegistrationNum + - name: "MetaData/aircraftTailNumber" + source: variables/aircraftTailNumber dimensions: [ "Location" ] longName: "Aircraft registration number or other ID" units: "none" @@ -121,9 +123,15 @@ observations: - name: "MetaData/aircraftRollAngle" source: variables/aircraftRollAngle dimensions: [ "Location" ] - longName: "Aircraft roll angle quality" + longName: "Aircraft roll angle" units: "degrees" + - name: "MetaData/aircraftRollAngleQuality" + source: variables/aircraftRollAngleQuality + dimensions: [ "Location" ] + longName: "Aircraft roll angle quality" + units: "none" + - name: "ObsValue/airTemperature" source: variables/airTemperature coordinates: "longitude latitude" diff --git a/test/testinput/amdar_wmoBUFR2ioda.yaml b/test/testinput/amdar_wmoBUFR2ioda.yaml index 8669c6b4b..4fef29c9a 100644 --- a/test/testinput/amdar_wmoBUFR2ioda.yaml +++ b/test/testinput/amdar_wmoBUFR2ioda.yaml @@ -36,11 +36,9 @@ observations: height: mnemonic: FLVLST aircraftIdentifier: - mnemonic: ACRN - aircraftFlightNum: mnemonic: ACID - aircraftTailNum: - mnemonic: ACTN + aircraftTailNumber: + mnemonic: [ACTN, ACRN] observationSequenceNum: mnemonic: OSQN aircraftFlightPhase: @@ -49,7 +47,7 @@ observations: mnemonic: TASP aircraftHeading: mnemonic: ACTH - aircraftRollAngle: + aircraftRollAngleQuality: mnemonic: ROLQ airTemperature: mnemonic: TMDB @@ -99,14 +97,8 @@ observations: longName: "Aircraft Identifier" units: "none" - - name: "MetaData/aircraftFlightNum" - source: variables/aircraftFlightNum - dimensions: [ "Location" ] - longName: "Aircraft flight number" - units: "none" - - - name: "MetaData/aircraftTailNum" - source: variables/aircraftTailNum + - name: "MetaData/aircraftTailNumber" + source: variables/aircraftTailNumber dimensions: [ "Location" ] longName: "Aircraft tail number" units: "none" @@ -135,8 +127,8 @@ observations: longName: "Aircraft heading" units: "degrees" - - name: "MetaData/aircraftRollAngle" - source: variables/aircraftRollAngle + - name: "MetaData/aircraftRollAngleQuality" + source: variables/aircraftRollAngleQuality dimensions: [ "Location" ] longName: "Aircraft roll angle" units: "none" diff --git a/test/testinput/gnssro_wmoBUFR2ioda.yaml b/test/testinput/gnssro_wmoBUFR2ioda.yaml index 6d4322707..0bfc57cfc 100644 --- a/test/testinput/gnssro_wmoBUFR2ioda.yaml +++ b/test/testinput/gnssro_wmoBUFR2ioda.yaml @@ -48,11 +48,9 @@ observations: mnemonic: SAID instrumentIdentifier: mnemonic: SIID - satelliteClassification: - mnemonic: SCLF platformTransmitterId: mnemonic: PTID - originatingCenter: + dataProviderOrigin: mnemonic: OGCE qualityFlags: mnemonic: QFRO @@ -117,18 +115,12 @@ observations: longName: "Air pressure" units: "Pa" - - name: "MetaData/originatingCenter" - source: variables/originatingCenter + - name: "MetaData/dataProviderOrigin" + source: variables/dataProviderOrigin dimensions: [ "Location" ] longName: "Originating center" units: "" - - name: "MetaData/satelliteClassification" - source: variables/satelliteClassification - dimensions: [ "Location" ] - longName: "GNSS satellite classification" - units: "" - - name: "MetaData/satelliteIdentifier" source: variables/satelliteIdentifier dimensions: [ "Location" ] @@ -147,7 +139,7 @@ observations: longName: "GNSS platform transmitter ID" units: "" - - name: "MetaData/qualityFlags" + - name: "QualityMarker/qualityFlags" source: variables/qualityFlags dimensions: [ "Location" ] longName: "Quality flags" diff --git a/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml b/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml index 23fa1a8ab..7c539a97a 100644 --- a/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml +++ b/test/testinput/satwind_EUMet_wmoBUFR2ioda.yaml @@ -70,7 +70,7 @@ observations: dimensions: - name: "Location" size: variables/latitude.nrows - - name: "nconfidences" + - name: "Confidence" size: variables/windPercentConfidence.ncols globals: @@ -151,14 +151,14 @@ observations: - name: "MetaData/windPercentConfidence" source: variables/windPercentConfidence - coordinates: "longitude latitude nconfidences" - dimensions: ["Location", "nconfidences"] + coordinates: "longitude latitude Confidence" + dimensions: ["Location", "Confidence"] longName: "Percent confidence" units: "percent" - - name: "MetaData/sensorCentralFrequency" - source: variables/sensorCentralFrequency - coordinates: "longitude latitude nconfidences" - dimensions: ["Location"] - longName: "Sensor Central Frequency" - units: "Hz" +# - name: "MetaData/sensorCentralFrequency" +# source: variables/sensorCentralFrequency +# coordinates: "longitude latitude Confidence" +# dimensions: ["Location", "Confidence"] +# longName: "Sensor Central Frequency" +# units: "Hz" diff --git a/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml b/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml index ae337bf84..f4f041c43 100644 --- a/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml +++ b/test/testinput/satwind_Himawari_wmoBUFR2ioda.yaml @@ -40,7 +40,7 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteIdentification: + satelliteIdentifier: mnemonic: SAID dataProviderOrigin: mnemonic: GCLONG @@ -72,7 +72,7 @@ observations: dimensions: - name: "Location" size: variables/latitude.nrows - - name: "nconfidences" + - name: "Confidence" size: variables/windPercentConfidence.ncols globals: @@ -81,8 +81,8 @@ observations: value: "Himiwari_AMV" variables: - - name: "MetaData/satelliteIdentification" - source: variables/satelliteIdentification + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier dimensions: ["Location"] longName: "Satellite identification" units: "" @@ -159,14 +159,14 @@ observations: - name: "MetaData/windPercentConfidence" source: variables/windPercentConfidence - coordinates: "longitude latitude nconfidences" - dimensions: ["Location", "nconfidences"] + coordinates: "longitude latitude Confidence" + dimensions: ["Location", "Confidence"] longName: "Percent confidence" units: "percent" - - name: "MetaData/sensorCentralFrequency" - source: variables/sensorCentralFrequency - coordinates: "longitude latitude nconfidences" - dimensions: ["Location"] - longName: "Sensor Central Frequency" - units: "Hz" +# - name: "MetaData/sensorCentralFrequency" +# source: variables/sensorCentralFrequency +# coordinates: "longitude latitude nconfidences" +# dimensions: ["Location"] +# longName: "Sensor Central Frequency" +# units: "Hz" diff --git a/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml b/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml index 0bcd2dbdc..c35f816ba 100644 --- a/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml +++ b/test/testinput/satwind_Insat_wmoBUFR2ioda.yaml @@ -39,7 +39,7 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteIdentification: + satelliteIdentifier: mnemonic: SAID dataProviderOrigin: mnemonic: GCLONG @@ -71,7 +71,7 @@ observations: dimensions: - name: "Location" size: variables/latitude.nrows - - name: "nconfidences" + - name: "Confidence" size: variables/windPercentConfidence.ncols globals: @@ -80,8 +80,8 @@ observations: value: "Insat_AMV" variables: - - name: "MetaData/satelliteIdentification" - source: variables/satelliteIdentification + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier dimensions: ["Location"] longName: "Satellite identification" units: "" @@ -144,17 +144,17 @@ observations: - name: "MetaData/windPercentConfidence" source: variables/windPercentConfidence - coordinates: "longitude latitude nconfidences" - dimensions: ["Location", "nconfidences"] + coordinates: "longitude latitude Confidence" + dimensions: ["Location", "Confidence"] longName: "Percent confidence" units: "percent" - - name: "MetaData/sensorCentralFrequency" - source: variables/sensorCentralFrequency - coordinates: "longitude latitude nconfidences" - dimensions: ["Location"] - longName: "Sensor Central Frequency" - units: "Hz" +# - name: "MetaData/sensorCentralFrequency" +# source: variables/sensorCentralFrequency +# coordinates: "longitude latitude Confidence" +# dimensions: ["Location"] +# longName: "Sensor Central Frequency" +# units: "Hz" - name: "ObsValue/windDirection" source: variables/windDirection From 82b8eec7f7aa3cc0cacd15997a54e35ab4ec13e7 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Thu, 10 Mar 2022 16:09:58 -0600 Subject: [PATCH 09/29] make all new test ref files for JEDI naming conventions during sprint --- test/testoutput/airep_multi.nc | 4 ++-- test/testoutput/amdar_wmo_multi.nc | 4 ++-- test/testoutput/buoy_wmo_multi.nc | 4 ++-- test/testoutput/gdas.aircar.t00z.20210801.nc | 4 ++-- test/testoutput/gnssro_2020-306-2358C2E6.nc | 4 ++-- test/testoutput/rass_wmo_multi.nc | 4 ++-- test/testoutput/satwind_EUMet.nc | 4 ++-- test/testoutput/satwind_Himawari.nc | 4 ++-- test/testoutput/satwind_Insat.nc | 4 ++-- test/testoutput/ship_wmo_multi.nc | 4 ++-- test/testoutput/synop_wmo_multi.nc | 4 ++-- test/testoutput/vadwinds_wmo_multi.nc | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/test/testoutput/airep_multi.nc b/test/testoutput/airep_multi.nc index 1da573380..3913dd1c2 100644 --- a/test/testoutput/airep_multi.nc +++ b/test/testoutput/airep_multi.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d580598af8555471d9cec146653fa3ddecb8e172d9c23636b90413f4be7ba0 -size 33659 +oid sha256:b9a6569409cefda0378adbf2031bd0bb3bd529482d863f68f221676f977091ab +size 33577 diff --git a/test/testoutput/amdar_wmo_multi.nc b/test/testoutput/amdar_wmo_multi.nc index 3ada5f53e..56683ac91 100644 --- a/test/testoutput/amdar_wmo_multi.nc +++ b/test/testoutput/amdar_wmo_multi.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6de8c92a9524d3ddd57c334ddb69246caa7e1046dda1ade81686347cf172ba78 -size 75401 +oid sha256:d8a2d9ddd2356c4246c73a5b3d6d4de8cf6404ed831e2b5c33dbd565db00c54b +size 74735 diff --git a/test/testoutput/buoy_wmo_multi.nc b/test/testoutput/buoy_wmo_multi.nc index c2e45a473..9090719aa 100644 --- a/test/testoutput/buoy_wmo_multi.nc +++ b/test/testoutput/buoy_wmo_multi.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:979fdaa036c7e97ed2307d673458a80155efb574a1b4d457d4ad1ca6173999c9 -size 47553 +oid sha256:01fee1267bf77e643dabdd0671db26f6b8f0581189186782d02b6e2b4ca83d81 +size 47373 diff --git a/test/testoutput/gdas.aircar.t00z.20210801.nc b/test/testoutput/gdas.aircar.t00z.20210801.nc index 7bfc3a9cd..fd4942040 100644 --- a/test/testoutput/gdas.aircar.t00z.20210801.nc +++ b/test/testoutput/gdas.aircar.t00z.20210801.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aec810bef04cbc5a159ad69d7a14b4c4b1a8ac4a0781f2c0cfdcb63d04a567d9 -size 357770 +oid sha256:6d2df314a0a55292db8badf4fd473bab5394a755b1780c1219265208803f52b7 +size 359813 diff --git a/test/testoutput/gnssro_2020-306-2358C2E6.nc b/test/testoutput/gnssro_2020-306-2358C2E6.nc index a7459bb25..46e4694a9 100644 --- a/test/testoutput/gnssro_2020-306-2358C2E6.nc +++ b/test/testoutput/gnssro_2020-306-2358C2E6.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0693e36a339294ef235a9abfa9c90d26d95cc5a3550c4eada6d7dbc69b9f56a -size 65140 +oid sha256:ec91ca5584dedc5d9e0c22b8bbccc9aed6560edc7386b87f832e0e0bc7655602 +size 61514 diff --git a/test/testoutput/rass_wmo_multi.nc b/test/testoutput/rass_wmo_multi.nc index 28d5d7d4a..faf554056 100644 --- a/test/testoutput/rass_wmo_multi.nc +++ b/test/testoutput/rass_wmo_multi.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e33e964986d3adef96cc3c8f0ef88ea2edc6017285d17dded21469e3cbcbb188 -size 33579 +oid sha256:b49142f3d4bca8fc17349e61731eaa7b3cb192a1fe1dd59fc5bf341f0febbb8d +size 33411 diff --git a/test/testoutput/satwind_EUMet.nc b/test/testoutput/satwind_EUMet.nc index 8522ebd07..19065dfb8 100644 --- a/test/testoutput/satwind_EUMet.nc +++ b/test/testoutput/satwind_EUMet.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3a5972a66ad38c489314764654cdd996c5e9d0b74e2ffbebabd3829999a8a63 -size 1479625 +oid sha256:4669b55b5e5969f63f16eb53c4b769c80743eebdd1d5c0a62ec75417570e255f +size 1476245 diff --git a/test/testoutput/satwind_Himawari.nc b/test/testoutput/satwind_Himawari.nc index 61b0e44db..d66f4ee68 100644 --- a/test/testoutput/satwind_Himawari.nc +++ b/test/testoutput/satwind_Himawari.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:540f64fd02a5d7297107f366e3187ae0852319a42be1055fa00925e2927843ba -size 62451 +oid sha256:a1b37129b086c40d6b6212fda399b787e0897836ad5570671d37286afc0340a0 +size 58760 diff --git a/test/testoutput/satwind_Insat.nc b/test/testoutput/satwind_Insat.nc index 92f7d4509..01b561b2e 100644 --- a/test/testoutput/satwind_Insat.nc +++ b/test/testoutput/satwind_Insat.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53c69f2962c5a6e436be6540acf92c0ea6e52dd44cad708ff12cc1595822aae2 -size 144131 +oid sha256:b15bd7c3cb2e13c0969d56cb2ff36ceb4266996320f6578e9e723312cbffd445 +size 140365 diff --git a/test/testoutput/ship_wmo_multi.nc b/test/testoutput/ship_wmo_multi.nc index 23027386f..6c3479333 100644 --- a/test/testoutput/ship_wmo_multi.nc +++ b/test/testoutput/ship_wmo_multi.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83fbd1a46909cf5f103cbb3e708daae0bc9313ac9cd1c25ed1a106318001569a -size 73395 +oid sha256:64002bc2bed0a9b06c717a2c2671bc8f5916892d998cc887f75b123d6d1f4aec +size 78355 diff --git a/test/testoutput/synop_wmo_multi.nc b/test/testoutput/synop_wmo_multi.nc index 8bf2a916e..fecc3fabf 100644 --- a/test/testoutput/synop_wmo_multi.nc +++ b/test/testoutput/synop_wmo_multi.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11216f7bd66acc5481f83381be3905562c446daef3b0f13db19e7595f0cb1713 -size 71715 +oid sha256:8836c57fc59600b21b1d8f1a340c724d891cd4cc234f367d8468b791fd0bec4c +size 71524 diff --git a/test/testoutput/vadwinds_wmo_multi.nc b/test/testoutput/vadwinds_wmo_multi.nc index e074f0f65..35582992f 100644 --- a/test/testoutput/vadwinds_wmo_multi.nc +++ b/test/testoutput/vadwinds_wmo_multi.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cfe2c86ccd07f412e04e6d3907703980107fa4ea60577be117d30a3c7721cbf -size 33606 +oid sha256:88040a8312a5d5401b25d1462aa963837faceb8902e2a7e74e134009c55e80d2 +size 33411 From 535845eea00230db2f19567bdd4afe096c8528ae Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 12:08:25 -0500 Subject: [PATCH 10/29] start of changes for matching JEDI Data Conventions --- test/testinput/bufr_mhs.yaml | 73 +++++++++++----------- test/testinput/bufr_sevcrs_v2.yaml | 56 ++++++++--------- test/testinput/bufr_ssmis_v2.yaml | 98 +++++++++++++++--------------- 3 files changed, 112 insertions(+), 115 deletions(-) diff --git a/test/testinput/bufr_mhs.yaml b/test/testinput/bufr_mhs.yaml index 98404134e..7aa9160a2 100644 --- a/test/testinput/bufr_mhs.yaml +++ b/test/testinput/bufr_mhs.yaml @@ -44,7 +44,7 @@ observations: mnemonic: SAZA vaz: mnemonic: BEARAZ - radiance: + brightnessTemperature: mnemonic: TMBR ioda: @@ -52,103 +52,100 @@ observations: obsdataout: "./testrun/gdas.t18z.1bmhs.tm00.nc" dimensions: - - name: "nlocs" - size: variables/radiance.nrows - - name: "nchans" - size: variables/radiance.ncols + - name: "Location" + size: variables/brightnessTemperature.nrows + - name: "Channel" + size: variables/brightnessTemperature.ncols globals: - - name: "sensorCentralFrequency@MetaData" + - name: "sensorCentralFrequency" type: floatVector value: [89.0, 157.0, 183.311, 183.311, 190.311] - - name: "platformCommonName@MetaData" + - name: "platformCommonName" type: string value: "MHS" variables: - - name: "stationElevation@MetaData" + - name: "MetaData/stationElevation" source: variables/height - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Station Elevation" - units: "meters" + units: "m" - - name: "heightOfSurface@MetaData" + - name: "MetaData/heightOfSurface" source: variables/hols - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Height of Land Surface" - units: "meters" + units: "m" - - name: "fieldOfViewNumber@MetaData" + - name: "MetaData/fieldOfViewNumber" source: variables/fovn - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Field of View Number" units: "none" - - name: "landSeaQualifier@MetaData" + - name: "MetaData/landSeaQualifier" source: variables/lsql - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Land/Sea Qualifier" units: "none" - - name: "dateTime@MetaData" + - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - - name: "latitude@MetaData" + - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - - name: "longitude@MetaData" + - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - - name: "solarZenithAngle@MetaData" + - name: "MetaData/solarZenithAngle" source: variables/sza - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar Zenith Angle" units: "degrees" range: [0, 180] - - name: "solarAzimuthAngle@MetaData" + - name: "MetaData/solarAzimuthAngle" source: variables/saz - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar Azimuth Angle" units: "degrees" range: [-180, 180] - - name: "sensorZenithAngle@MetaData" + - name: "MetaData/sensorZenithAngle" source: variables/vza - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor Zenith Angle" units: "degrees" range: [0, 180] - - name: "sensorAzimuthAngle@MetaData" + - name: "MetaData/sensorAzimuthAngle" source: variables/vaz - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor Azimuth Angle" units: "degrees" range: [-180, 180] - - name: "brightnessTemperature@ObsValue" - coordinates: "longitude latitude nchans" - source: variables/radiance - dimensions: ["nlocs", "nchans"] + - name: "ObsValue/brightnessTemperature" + source: variables/brightnessTemperature + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] longName: "Brightness Temperature" units: "K" range: [120, 500] chunks: [1000, 15] compressionLevel: 4 - - - diff --git a/test/testinput/bufr_sevcrs_v2.yaml b/test/testinput/bufr_sevcrs_v2.yaml index 45738e714..af7c5c9f9 100644 --- a/test/testinput/bufr_sevcrs_v2.yaml +++ b/test/testinput/bufr_sevcrs_v2.yaml @@ -26,7 +26,7 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteId: + satelliteIdentifier: mnemonic: SAID solarZenithAngle: mnemonic: SOZA @@ -36,91 +36,91 @@ observations: mnemonic: CLDMNT brightnessTemperature: mnemonic: TMBRST - brightnessTemperatureStdDev: - mnemonic: SDTB +# brightnessTemperatureStdDev: +# mnemonic: SDTB ioda: backend: netcdf obsdataout: "./testrun/gdas.t00z.sevcsr.tm00.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/brightnessTemperature.nrows - - name: "nchans" + - name: "Channel" size: variables/brightnessTemperature.ncols 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/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/solarZenithAngle" source: variables/solarZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar zenith angle" units: "degrees" range: [0, 180] - name: "MetaData/sensorZenithAngle" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor zenith angle" units: "degrees" range: [0, 90] - name: "ObsValue/cloudAmount" - coordinates: "longitude latitude nchans" + coordinates: "longitude latitude Channel" source: variables/cloudAmount - dimensions: ["nlocs", "nchans"] + dimensions: ["Location", "Channel"] longName: "cloud fraction" - units: "%" + units: "1" range: [0, 100] chunks: [1000, 15] - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] longName: "Brightness temperature" units: "K" range: [150, 350] chunks: [1000, 15] - - name: "ObsValue/brightnessTemperatureStdDev" - coordinates: "longitude latitude nchans" - source: variables/brightnessTemperatureStdDev - dimensions: ["nlocs", "nchans"] - longName: "Brightness temperature standard deviation" - units: "K" - chunks: [1000, 15] +# - name: "ObsValue/brightnessTemperatureStdDev" +# source: variables/brightnessTemperatureStdDev +# coordinates: "longitude latitude Channel" +# dimensions: ["Location", "Channel"] +# longName: "Brightness temperature standard deviation" +# units: "K" +# chunks: [1000, 15] diff --git a/test/testinput/bufr_ssmis_v2.yaml b/test/testinput/bufr_ssmis_v2.yaml index 67b5c0dbc..28a8bc39c 100644 --- a/test/testinput/bufr_ssmis_v2.yaml +++ b/test/testinput/bufr_ssmis_v2.yaml @@ -8,8 +8,9 @@ observations: name: bufr obsdatain: "./testinput/gdas.t00z.ssmisu.tm00.bufr_d" mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLAT, CLON] - - mnemonics: [SAID, FOVN, BEARAZ, SFLG, RFLAG] + - mnemonics: [SAID, YEAR, MNTH, DAYS, HOUR, MINU, SECO] + - mnemonics: [CLAT, CLON] + - mnemonics: [SLNM, FOVN, SFLG, RFLAG] - mnemonics: [CHNM, TMBR] channels: 1-24 @@ -22,22 +23,23 @@ observations: day: DAYS hour: HOUR minute: MINU + second: SECO + satelliteIdentifier: + mnemonic: SAID latitude: mnemonic: CLAT longitude: mnemonic: CLON - satelliteId: - mnemonic: SAID - channelNumber: - mnemonic: CHNM + scanLineNumber: + mnemonic: SLNM fieldOfViewNumber: mnemonic: FOVN - sensorAzimuthAngle: - mnemonic: BEARAZ - surfaceFlag: + earthSurfaceType: mnemonic: SFLG rainFlag: mnemonic: RFLAG + sensorChannelNumber: + mnemonic: CHNM brightnessTemperature: mnemonic: TMBR @@ -46,92 +48,90 @@ observations: obsdataout: "./testrun/gdas.t00z.ssmisu.tm00.nc" dimensions: - - name: "nlocs" - size: variables/brightnessTemperature.nrows - - name: "nchans" + - name: "Location" + size: variables/latitude.nrows + - name: "Channel" size: variables/brightnessTemperature.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platformCommonName" type: string - value: "SSMIS" + value: "SSMIS-DMSP18" - - name: "MetaData/platformLongDescription" + - name: "platformLongDescription" type: string value: "MTYP 021-201 DMSP SSM/IS Tb (UNIFIED PRE-PROCESSOR)" - - name: "MetaData/sensorCentralFrequency" + - name: "sensorCentralFrequency" type: floatVector + dimensions: ["Channel"] value: [19.35, 19.35, 22.235, 37.0, 37.0, 50.3, 52.8, 53.596, 54.4, 55.5, 57.29, 59.4, 63.283248, 60.792668, 60.792668, 60.792668, 60.792668, 60.792668, 91.665, 91.665, 150, 183.311, 183.311, 183.311] variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] longName: "Satellite identification" units: "" - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" - units: "" - - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" + - name: "MetaData/scanLineNumber" + source: variables/scanLineNumber + dimensions: ["Location"] + longName: "Scan line number" + units: "1" + - name: "MetaData/fieldOfViewNumber" source: variables/fieldOfViewNumber - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Field of view number" units: "" - - name: "MetaData/sensorAzimuthAngle" - source: variables/sensorAzimuthAngle - dimensions: ["nlocs"] - longName: "Sensor azimuth angle" - units: "degrees" - range: [0, 360] - - - name: "MetaData/surfaceFlag" - coordinates: "longitude latitude" - source: variables/surfaceFlag - dimensions: ["nlocs"] + - name: "MetaData/earthSurfaceType" + source: variables/earthSurfaceType + dimensions: ["Location"] longName: "Suface flag" - units: "code" + units: "" - - name: "MetaData/rainFlag" - coordinates: "longitude latitude" - source: variables/rainFlag - dimensions: ["nlocs"] + - name: "MetaData/qualityFlags" + source: variables/qualityFlags + dimensions: ["Location"] longName: "Rain flag" - units: "code" + units: "" + + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] longName: "Brightness temperature" units: "K" range: [120, 500] - chunks: [1000, 15] + chunks: [1000, 24] compressionLevel: 4 From 84dec784c75b97a23cfacb6bc9ed78e72a5954ea Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 13:40:43 -0500 Subject: [PATCH 11/29] able to combine v2 into prior MHS file --- test/testinput/bufr_mhs.yaml | 109 ++++++++++++++---------- test/testinput/bufr_mhs_v2.yaml | 146 -------------------------------- 2 files changed, 63 insertions(+), 192 deletions(-) delete mode 100644 test/testinput/bufr_mhs_v2.yaml diff --git a/test/testinput/bufr_mhs.yaml b/test/testinput/bufr_mhs.yaml index 7aa9160a2..4fc7f3bb5 100644 --- a/test/testinput/bufr_mhs.yaml +++ b/test/testinput/bufr_mhs.yaml @@ -11,7 +11,7 @@ observations: - mnemonics: [SAID, SIID, FOVN, YEAR, MNTH, DAYS, HOUR, MINU, SECO, CLAT, CLON, CLATH, CLONH] - mnemonics: [LSQL, HOLS, HMSL] - mnemonics: [SAZA, SOZA, BEARAZ, SOLAZI] - - mnemonics: [TMBR] + - mnemonics: [CHNM, TMBR] channels : 1-5 exports: @@ -24,26 +24,32 @@ observations: hour: HOUR minute: MINU second: SECO - height: + latitude: + mnemonic: CLAT + longitude: + mnemonic: CLON + satelliteIdentifier: + mnemonic: SAID + stationElevation: mnemonic: HMSL - hols: + heightOfSurface: mnemonic: HOLS - fovn: + fieldOfViewNumber: mnemonic: FOVN - lsql: + landOrSeaQualifier: mnemonic: LSQL - longitude: - mnemonic: CLON - latitude: - mnemonic: CLAT - sza: + fieldOfViewNumber: + mnemonic: FOVN + solarZenithAngle: mnemonic: SOZA - saz: + solarAzimuthAngle: mnemonic: SOLAZI - vza: + sensorZenithAngle: mnemonic: SAZA - vaz: + sensorAzimuthAngle: mnemonic: BEARAZ + sensorChannelNumber: + mnemonic: CHNM brightnessTemperature: mnemonic: TMBR @@ -53,44 +59,25 @@ observations: dimensions: - name: "Location" - size: variables/brightnessTemperature.nrows + size: variables/latitude.nrows - name: "Channel" size: variables/brightnessTemperature.ncols globals: - - name: "sensorCentralFrequency" - type: floatVector - value: [89.0, 157.0, 183.311, 183.311, 190.311] - name: "platformCommonName" type: string value: "MHS" - - variables: - - - name: "MetaData/stationElevation" - source: variables/height - dimensions: ["Location"] - longName: "Station Elevation" - units: "m" - - - name: "MetaData/heightOfSurface" - source: variables/hols - dimensions: ["Location"] - longName: "Height of Land Surface" - units: "m" - - name: "MetaData/fieldOfViewNumber" - source: variables/fovn - dimensions: ["Location"] - longName: "Field of View Number" - units: "none" + - name: "platformLongDescription" + type: string + value: "MTYP 021-027 PROCESSED MHS Tb (NOAA-18-19, METOP-1,2)" - - name: "MetaData/landSeaQualifier" - source: variables/lsql - dimensions: ["Location"] - longName: "Land/Sea Qualifier" - units: "none" +# - name: "sensorCentralFrequency" +# type: floatVector +# value: [89.0, 157.0, 183.311, 183.311, 190.311] + + variables: - name: "MetaData/dateTime" source: variables/timestamp @@ -112,34 +99,64 @@ observations: units: "degrees_east" range: [-180, 180] + - name: "MetaData/stationElevation" + source: variables/stationElevation + dimensions: ["Location"] + longName: "Height" + units: "m" + + - name: "MetaData/heightOfSurface" + source: variables/heightOfSurface + dimensions: ["Location"] + longName: "Height of Land Surface" + units: "m" + + - name: "MetaData/fieldOfViewNumber" + source: variables/fieldOfViewNumber + dimensions: ["Location"] + longName: "Field of View Number" + units: "none" + + - name: "MetaData/landOrSeaQualifier" + source: variables/landOrSeaQualifier + dimensions: ["Location"] + longName: "Land/Sea Qualifier" + units: "none" + - name: "MetaData/solarZenithAngle" - source: variables/sza + source: variables/solarZenithAngle dimensions: ["Location"] longName: "Solar Zenith Angle" units: "degrees" range: [0, 180] - name: "MetaData/solarAzimuthAngle" - source: variables/saz + source: variables/solarAzimuthAngle dimensions: ["Location"] longName: "Solar Azimuth Angle" units: "degrees" range: [-180, 180] - name: "MetaData/sensorZenithAngle" - source: variables/vza + source: variables/sensorZenithAngle dimensions: ["Location"] longName: "Sensor Zenith Angle" units: "degrees" range: [0, 180] - name: "MetaData/sensorAzimuthAngle" - source: variables/vaz + source: variables/sensorAzimuthAngle dimensions: ["Location"] longName: "Sensor Azimuth Angle" units: "degrees" range: [-180, 180] + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" + - name: "ObsValue/brightnessTemperature" source: variables/brightnessTemperature coordinates: "longitude latitude Channel" @@ -147,5 +164,5 @@ observations: longName: "Brightness Temperature" units: "K" range: [120, 500] - chunks: [1000, 15] + chunks: [1000, 5] compressionLevel: 4 diff --git a/test/testinput/bufr_mhs_v2.yaml b/test/testinput/bufr_mhs_v2.yaml deleted file mode 100644 index 52bbdfe23..000000000 --- a/test/testinput/bufr_mhs_v2.yaml +++ /dev/null @@ -1,146 +0,0 @@ -# (C) Copyright 2021 UCAR -# -# 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. - -observations: - - obs space: - name: bufr - obsdatain: "./testinput/gdas.t18z.1bmhs.tm00.bufr_d" - mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLAT, CLON] - - mnemonics: [SAID, SIID, FOVN, SAZA, SOZA, BEARAZ, SOLAZI] - - mnemonics: [CHNM, TMBR] - channels : 1-5 - - exports: - variables: - timestamp: - datetime: - year: YEAR - month: MNTH - day: DAYS - hour: HOUR - minute: MINU - latitude: - mnemonic: CLAT - longitude: - mnemonic: CLON - satelliteId: - mnemonic: SAID - sensorID: - mnemonic: SIID - channelNumber: - mnemonic: CHNM - fieldOfViewNumber: - mnemonic: FOVN - solarZenithAngle: - mnemonic: SOZA - solarAzimuthAngle: - mnemonic: SOLAZI - sensorZenithAngle: - mnemonic: SAZA - sensorAzimuthAngle: - mnemonic: BEARAZ - brightnessTemperature: - mnemonic: TMBR - - ioda: - backend: netcdf - obsdataout: "./testrun/gdas.t18z.1bmhs.tm00.nc" - - dimensions: - - name: "nlocs" - size: variables/brightnessTemperature.nrows - - name: "nchans" - size: variables/brightnessTemperature.ncols - - globals: - - name: "MetaData/platformCommonName" - type: string - value: "MHS" - - - name: "MetaData/platformLongDescription" - type: string - value: "MTYP 021-027 PROCESSED MHS Tb (NOAA-18-19, METOP-1,2)" - - - name: "MetaData/sensorCentralFrequency" - type: floatVector - value: [89.0, 157.0, 183.311, 183.311, 190.311] - - variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" - units: "" - - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" - units: "" - - - name: "MetaData/latitude" - source: variables/latitude - dimensions: ["nlocs"] - longName: "Latitude" - units: "degrees_north" - range: [-90, 90] - - - name: "MetaData/longitude" - source: variables/longitude - dimensions: ["nlocs"] - longName: "Longitude" - units: "degrees_east" - range: [-180, 180] - - - name: "MetaData/dateTime" - source: variables/timestamp - dimensions: ["nlocs"] - longName: "dateTime" - units: "seconds since 1970-01-01T00:00:00Z" - - - name: "MetaData/fieldOfViewNumber" - source: variables/fieldOfViewNumber - dimensions: ["nlocs"] - longName: "Field of view number" - units: "" - - - name: "MetaData/solarZenithAngle" - source: variables/solarZenithAngle - dimensions: ["nlocs"] - longName: "Solar zenith angle" - units: "degrees" - range: [0, 180] - - - name: "MetaData/solarAzimuthAngle" - source: variables/solarAzimuthAngle - dimensions: ["nlocs"] - longName: "Solar azimuth angle" - units: "degrees" - range: [0, 360] - - - name: "MetaData/sensorZenithAngle" - source: variables/sensorZenithAngle - dimensions: ["nlocs"] - longName: "Sensor zenith angle" - units: "degrees" - range: [0, 90] - - - name: "MetaData/sensorAzimuthAngle" - source: variables/sensorAzimuthAngle - dimensions: ["nlocs"] - longName: "Sensor azimuth angle" - units: "degrees" - range: [0, 360] - - - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" - source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] - longName: "Brightness temperature" - units: "K" - range: [120, 500] - chunks: [1000, 15] - compressionLevel: 4 From 62ee0bdadd7d8528821f14927642276e30d80ced Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 13:59:41 -0500 Subject: [PATCH 12/29] able to merge v2 yaml into HRS earlier file when updating to JEDI Data Conventions --- test/testinput/bufr_hirs_v2.yaml | 147 ------------------------------- test/testinput/bufr_hrs.yaml | 124 +++++++++++++++++++++----- 2 files changed, 104 insertions(+), 167 deletions(-) delete mode 100644 test/testinput/bufr_hirs_v2.yaml diff --git a/test/testinput/bufr_hirs_v2.yaml b/test/testinput/bufr_hirs_v2.yaml deleted file mode 100644 index 310acfa1b..000000000 --- a/test/testinput/bufr_hirs_v2.yaml +++ /dev/null @@ -1,147 +0,0 @@ -# (C) Copyright 2021 UCAR -# -# 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. - -observations: - - obs space: - name: bufr - obsdatain: "./testinput/gdas.t00z.1bhrs4.tm00.bufr_d" - mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLAT, CLON] - - mnemonics: [SAID, SIID, FOVN, SAZA, SOZA, BEARAZ, SOLAZI] - - mnemonics: [CHNM, TMBR] - channels: 1-20 - - exports: - variables: - timestamp: - datetime: - year: YEAR - month: MNTH - day: DAYS - hour: HOUR - minute: MINU - latitude: - mnemonic: CLAT - longitude: - mnemonic: CLON - satelliteId: - mnemonic: SAID - sensorID: - mnemonic: SIID - channelNumber: - mnemonic: CHNM - fieldOfViewNumber: - mnemonic: FOVN - solarZenithAngle: - mnemonic: SOZA - solarAzimuthAngle: - mnemonic: SOLAZI - sensorZenithAngle: - mnemonic: SAZA - sensorAzimuthAngle: - mnemonic: BEARAZ - brightnessTemperature: - mnemonic: TMBR - - ioda: - backend: netcdf - obsdataout: "./testrun/gdas.t00z.hirs.tm00.nc" - - dimensions: - - name: "nlocs" - size: variables/brightnessTemperature.nrows - - name: "nchans" - size: variables/brightnessTemperature.ncols - - globals: - - name: "MetaData/platformCommonName" - type: string - value: "HIRS" - - - name: "MetaData/platformLongDescription" - type: string - value: "MTYP 021-028 PROC HIRS-4 1B Tb (NOAA-18-19, METOP-1,2)" - -# - name: "MetaData/sensorCentralFrequency" -# type: floatVector -# value: [23.8, 31.4, 50.3, 51.76, 52.8, 53.596, 54.40, 54.94, 55.50, -# 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, -# 88.20, 165.5, 183.31, 183.31, 183.31, 183.31, 183.31] - - variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" - units: "" - - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" - units: "" - - - name: "MetaData/latitude" - source: variables/latitude - dimensions: ["nlocs"] - longName: "Latitude" - units: "degrees_north" - range: [-90, 90] - - - name: "MetaData/longitude" - source: variables/longitude - dimensions: ["nlocs"] - longName: "Longitude" - units: "degrees_east" - range: [-180, 180] - - - name: "MetaData/dateTime" - source: variables/timestamp - dimensions: ["nlocs"] - longName: "dateTime" - units: "seconds since 1970-01-01T00:00:00Z" - - - name: "MetaData/fieldOfViewNumber" - source: variables/fieldOfViewNumber - dimensions: ["nlocs"] - longName: "Field of view number" - units: "" - - - name: "MetaData/solarZenithAngle" - source: variables/solarZenithAngle - dimensions: ["nlocs"] - longName: "Solar zenith angle" - units: "degrees" - range: [0, 180] - - - name: "MetaData/solarAzimuthAngle" - source: variables/solarAzimuthAngle - dimensions: ["nlocs"] - longName: "Solar azimuth angle" - units: "degrees" - range: [0, 360] - - - name: "MetaData/sensorZenithAngle" - source: variables/sensorZenithAngle - dimensions: ["nlocs"] - longName: "Sensor zenith angle" - units: "degrees" - range: [0, 90] - - - name: "MetaData/sensorAzimuthAngle" - source: variables/sensorAzimuthAngle - dimensions: ["nlocs"] - longName: "Sensor azimuth angle" - units: "degrees" - range: [0, 360] - - - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" - source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] - longName: "Brightness temperature" - units: "K" - range: [120, 500] - chunks: [1000, 15] diff --git a/test/testinput/bufr_hrs.yaml b/test/testinput/bufr_hrs.yaml index c4d05b635..e81783828 100644 --- a/test/testinput/bufr_hrs.yaml +++ b/test/testinput/bufr_hrs.yaml @@ -10,10 +10,10 @@ observations: obsdatain: "./testinput/gdas.t00z.1bhrs4.tm00.bufr_d" mnemonicSets: - - mnemonics: [SAID, FOVN, YEAR, MNTH, DAYS, HOUR, MINU, SECO, CLAT, CLON, CLATH, CLONH, HOLS] - - mnemonics: [SAZA, SOZA, BEARAZ, SOLAZI] - - mnemonics: [TMBR] - channels : 1-19 + - mnemonics: [SAID, FOVN, YEAR, MNTH, DAYS, HOUR, MINU, SECO, CLAT, CLON, HOLS] + - mnemonics: [FOVN, SAZA, SOZA, BEARAZ, SOLAZI] + - mnemonics: [CHNM, TMBR] + channels : 1-20 exports: variables: @@ -29,7 +29,23 @@ observations: mnemonic: CLON latitude: mnemonic: CLAT - radiance: + satelliteIdentifier: + mnemonic: SAID + heightOfSurface: + mnemonic: HOLS + fieldOfViewNumber: + mnemonic: FOVN + solarZenithAngle: + mnemonic: SOZA + solarAzimuthAngle: + mnemonic: SOLAZI + sensorZenithAngle: + mnemonic: SAZA + sensorAzimuthAngle: + mnemonic: BEARAZ + sensorChannelNumber: + mnemonic: CHNM + brightnessTemperature: mnemonic: TMBR ioda: @@ -37,36 +53,104 @@ observations: obsdataout: "./testrun/gdas.t00z.1bhrs4.tm00.nc" dimensions: - - name: "nlocs" - size: variables/radiance.nrows - - name: "nchans" - size: variables/radiance.ncols + - name: "Location" + size: variables/latitude.nrows + - name: "Channel" + size: variables/brightnessTemperature.ncols + globals: + - name: "platformCommonName" + type: string + value: "HIRS" + + - name: "platformLongDescription" + type: string + value: "MTYP 021-028 PROC HIRS-4 1B Tb (NOAA-18-19, METOP-1,2)" + +# - name: "sensorCentralFrequency" +# type: floatVector +# value: [23.8, 31.4, 50.3, 51.76, 52.8, 53.596, 54.40, 54.94, 55.50, +# 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, +# 88.20, 165.5, 183.31, 183.31, 183.31, 183.31, 183.31] +# variables: - - name: "dateTime@MetaData" + - name: "MetaData/dateTime" source: variables/timestamp - dimensions: [ "nlocs" ] + dimensions: [ "Location" ] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - - name: "latitude@MetaData" + - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - - name: "longitude@MetaData" + - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - - name: "radiance@ObsValue" - coordinates: "longitude latitude nchans" - source: variables/radiance - dimensions: ["nlocs", "nchans"] - longName: "Radiance" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identification" + units: "" + + - name: "MetaData/heightOfSurface" + source: variables/heightOfSurface + dimensions: ["Location"] + longName: "Height of Land Surface" + units: "m" + + - name: "MetaData/fieldOfViewNumber" + source: variables/fieldOfViewNumber + dimensions: ["Location"] + longName: "Field of View Number" + units: "none" + + - name: "MetaData/solarZenithAngle" + source: variables/solarZenithAngle + dimensions: ["Location"] + longName: "Solar Zenith Angle" + units: "degrees" + range: [0, 180] + + - name: "MetaData/solarAzimuthAngle" + source: variables/solarAzimuthAngle + dimensions: ["Location"] + longName: "Solar Azimuth Angle" + units: "degrees" + range: [-180, 180] + + - name: "MetaData/sensorZenithAngle" + source: variables/sensorZenithAngle + dimensions: ["Location"] + longName: "Sensor Zenith Angle" + units: "degrees" + range: [0, 180] + + - name: "MetaData/sensorAzimuthAngle" + source: variables/sensorAzimuthAngle + dimensions: ["Location"] + longName: "Sensor Azimuth Angle" + units: "degrees" + range: [-180, 180] + + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" + + - name: "ObsValue/brightnessTemperature" + source: variables/brightnessTemperature + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] + longName: "brightnessTemperature" units: "K" range: [120, 500] + chunks: [1000, 20] From af598673a5793f280edce50538952f903ff68ef1 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 14:04:41 -0500 Subject: [PATCH 13/29] update testref files compliant with JEDI Data Conventions --- test/testoutput/gdas.t00z.1bhrs4.tm00.nc | 4 ++-- test/testoutput/gdas.t18z.1bmhs.tm00.nc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/testoutput/gdas.t00z.1bhrs4.tm00.nc b/test/testoutput/gdas.t00z.1bhrs4.tm00.nc index 59fb13d91..d2771e12c 100644 --- a/test/testoutput/gdas.t00z.1bhrs4.tm00.nc +++ b/test/testoutput/gdas.t00z.1bhrs4.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17b24d16a5d2a80cdd9ac2d9788ba5792405cde725afd023ad83a6a0ef2e732a -size 639909 +oid sha256:68585899e79371d6844d99ad9c38719d9c607d21c42201d293997dec7b5bc96a +size 764192 diff --git a/test/testoutput/gdas.t18z.1bmhs.tm00.nc b/test/testoutput/gdas.t18z.1bmhs.tm00.nc index 7f0ae2678..ea005e234 100644 --- a/test/testoutput/gdas.t18z.1bmhs.tm00.nc +++ b/test/testoutput/gdas.t18z.1bmhs.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d2b8dd1ec4ee2ff31278b7904f3dd62a357aa6394307c630f2dcffa9fc45a90 -size 797849 +oid sha256:6be816b756176d0d42ec8adec6ca112d00e623d35f8c8d24fc5e76d636b45b43 +size 799977 From e9894e5ab9c0fbf7d41c53b18506ff256412c288 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 16:22:33 -0500 Subject: [PATCH 14/29] new addition of AVHRR testinput/output files and consistent with JEDI Data Conventions --- test/testinput/bufr_avhrr_v2.yaml | 79 ++++++++++++------------ test/testoutput/gdas.t12z.avcsam.tm00.nc | 3 + 2 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 test/testoutput/gdas.t12z.avcsam.tm00.nc diff --git a/test/testinput/bufr_avhrr_v2.yaml b/test/testinput/bufr_avhrr_v2.yaml index 240b7d5d7..854919c33 100644 --- a/test/testinput/bufr_avhrr_v2.yaml +++ b/test/testinput/bufr_avhrr_v2.yaml @@ -8,8 +8,9 @@ observations: name: bufr obsdatain: "./testinput/gdas.t00z.avcsam.tm00.bufr_d" mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLATH, CLONH] - - mnemonics: [SAID, FOVN, SAZA, SOZA] + - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU] + - mnemonics: [CLATH, CLONH, SAID] + - mnemonics: [FOVN, SAZA, SOZA] - mnemonics: [INCN, ALBD, TMBR] channels : 1-5 @@ -26,18 +27,20 @@ observations: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteId: + satelliteIdentifier: mnemonic: SAID - channelNumber: - mnemonic: INCN fieldOfViewNumber: mnemonic: FOVN solarZenithAngle: mnemonic: SOZA sensorZenithAngle: mnemonic: SAZA + sensorChannelNumber: + mnemonic: INCN albedo: mnemonic: ALBD + transforms: + - scale: 0.01 brightnessTemperature: mnemonic: TMBR @@ -46,93 +49,93 @@ observations: obsdataout: "./testrun/gdas.t12z.avcsam.tm00.nc" dimensions: - - name: "nlocs" - size: variables/brightnessTemperature.nrows - - name: "nchans" + - name: "Location" + size: variables/latitude.nrows + - name: "Channel" size: variables/brightnessTemperature.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platformCommonName" type: string value: "AVHRR" - - name: "MetaData/platformLongDescription" + - name: "platformLongDescription" type: string value: "MTYP 021-051 PROC AVHRR(GAC) 1B Tb-CLR & SEA (N-17,N-18,M-2)" - - name: "MetaData/sensorCentralWavelength" - type: floatVector - value: [0.630, 0.865, 3.74, 10.8, 12.0] # μm +# - name: "sensorCentralWavelength" +# type: floatVector +# value: [0.630, 0.865, 3.74, 10.8, 12.0] # μm variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" - units: "" - - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/fieldOfViewNumber" source: variables/fieldOfViewNumber - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Field of view number" units: "" - name: "MetaData/solarZenithAngle" source: variables/solarZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar zenith angle" units: "degrees" range: [0, 180] - name: "MetaData/sensorZenithAngle" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor zenith angle" units: "degrees" range: [0, 90] + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" + - name: "ObsValue/albedo" - coordinates: "longitude latitude nchans" - source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] + source: variables/albedo + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] longName: "Albedo" - units: "" - range: [120, 500] - chunks: [1000, 15] + units: "1" + range: [0, 1.0] + chunks: [1000, 5] compressionLevel: 4 - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] longName: "Brightness temperature" units: "K" range: [120, 500] - chunks: [1000, 15] + chunks: [1000, 5] compressionLevel: 4 diff --git a/test/testoutput/gdas.t12z.avcsam.tm00.nc b/test/testoutput/gdas.t12z.avcsam.tm00.nc new file mode 100644 index 000000000..cc688eac2 --- /dev/null +++ b/test/testoutput/gdas.t12z.avcsam.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e801c0405bfb28caa5d06b19fcb3c9c5a8e87dedd21fc4cb7e68e3d45f4554f6 +size 476448 From 0daa2c77ffacf8890b65f87e32fd00310ce4d626 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 16:24:12 -0500 Subject: [PATCH 15/29] new addition of AVHRR testinput/output files and consistent with JEDI Data Conventions --- test/testinput/gdas.t00z.avcsam.tm00.bufr_d | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test/testinput/gdas.t00z.avcsam.tm00.bufr_d diff --git a/test/testinput/gdas.t00z.avcsam.tm00.bufr_d b/test/testinput/gdas.t00z.avcsam.tm00.bufr_d new file mode 100644 index 000000000..06d71d608 --- /dev/null +++ b/test/testinput/gdas.t00z.avcsam.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6988638572696effb00fd1583d6f3f7b74e2c3bb5f2df8d73318bd85eda9f302 +size 1153813 From db0009d6eef5c33bfcb798b2f214c08f1947adac Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 16:28:12 -0500 Subject: [PATCH 16/29] add ctest for AVHRR --- test/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 696a9e0bc..0f606eacb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -136,6 +136,7 @@ if( iodaconv_bufr_ENABLED ) testinput/bufr_tables testinput/gdas.t18z.1bmhs.tm00.bufr_d testinput/gdas.t00z.1bhrs4.tm00.bufr_d + testinput/gdas.t00z.avcsam.tm00.bufr_d testinput/gdas.t06z.adpsfc.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr testinput/bufr_read_wmo_radiosonde.bufr @@ -184,6 +185,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t18z.1bmhs.tm00.filtering.nc testoutput/gdas.t18z.1bmhs.tm00.15.seven.split.nc testoutput/gdas.t18z.1bmhs.tm00.15.7.filter_split.nc + testoutput/gdas.t00z.avcsam.tm00.nc testoutput/gdas.t06z.adpsfc.tm00.nc testoutput/gdas.t06z.adpsfc_snow.tm00.nc testoutput/bufr_read_2_dim_blocks.nc @@ -840,6 +842,15 @@ if(iodaconv_bufr_ENABLED) gdas.t18z.1bmhs.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_avhrr2ioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_avhrr_v2.yaml" + gdas.t00z.avcsam.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_hrs2ioda TYPE SCRIPT COMMAND bash From 68eadbeb2fb52f98266f975b43105be7c37bb31d Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 17:43:36 -0500 Subject: [PATCH 17/29] new addition of AIRS testinput/output yaml and ctest consistent with JEDI Data Conventions --- test/CMakeLists.txt | 11 ++ test/testinput/bufr_airs_v2.yaml | 105 ++++++++++---------- test/testinput/gdas.t00z.airsev.tm00.bufr_d | 3 + test/testoutput/gdas.t00z.airsev.tm00.nc | 3 + 4 files changed, 67 insertions(+), 55 deletions(-) create mode 100644 test/testinput/gdas.t00z.airsev.tm00.bufr_d create mode 100644 test/testoutput/gdas.t00z.airsev.tm00.nc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0f606eacb..8b7642184 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -136,6 +136,7 @@ if( iodaconv_bufr_ENABLED ) testinput/bufr_tables testinput/gdas.t18z.1bmhs.tm00.bufr_d testinput/gdas.t00z.1bhrs4.tm00.bufr_d + testinput/gdas.t00z.airsev.tm00.bufr_d testinput/gdas.t00z.avcsam.tm00.bufr_d testinput/gdas.t06z.adpsfc.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr @@ -185,6 +186,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t18z.1bmhs.tm00.filtering.nc testoutput/gdas.t18z.1bmhs.tm00.15.seven.split.nc testoutput/gdas.t18z.1bmhs.tm00.15.7.filter_split.nc + testoutput/gdas.t00z.airsev.tm00.nc testoutput/gdas.t00z.avcsam.tm00.nc testoutput/gdas.t06z.adpsfc.tm00.nc testoutput/gdas.t06z.adpsfc_snow.tm00.nc @@ -842,6 +844,15 @@ if(iodaconv_bufr_ENABLED) gdas.t18z.1bmhs.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_airs2ioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_airs_v2.yaml" + gdas.t00z.airsev.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_avhrr2ioda TYPE SCRIPT COMMAND bash diff --git a/test/testinput/bufr_airs_v2.yaml b/test/testinput/bufr_airs_v2.yaml index 80126e211..6a554197f 100644 --- a/test/testinput/bufr_airs_v2.yaml +++ b/test/testinput/bufr_airs_v2.yaml @@ -6,14 +6,16 @@ observations: - obs space: name: bufr - obsdatain: "./testinput/gdas.t12z.airsev.tm00.bufr_d" + obsdatain: "./testinput/gdas.t00z.airsev.tm00.bufr_d" mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLATH, CLONH] - - mnemonics: [SAID, SIID, FOVN, SAZA, SOZA, BEARAZ, SOLAZI, TOCC] -# - mnemonics: [ALBD] -# channels: 1-4 - - mnemonics: [CHNM, LOGRCW, TMBR] - channels: 1-10 + - mnemonics: [SAID, SLNM, SOZA, SOLAZI] + - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, SECO] + - mnemonics: [CLATH, CLONH, SAZA, BEARAZ, FOVN] + - mnemonics: [ALBD] + channels: 1-4 + - mnemonics: [CHNM, TMBR] + channels: 1-15 + - mnemonics: [TOCC] exports: variables: @@ -24,18 +26,15 @@ observations: day: DAYS hour: HOUR minute: MINU + second: SECO latitude: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteId: + satelliteIdentifier: mnemonic: SAID - sensorID: - mnemonic: SIID - channelNumber: + sensorChannelNumber: mnemonic: CHNM - centralWavenumber: - mnemonic: LOGRCW fieldOfViewNumber: mnemonic: FOVN solarZenithAngle: @@ -48,127 +47,123 @@ observations: mnemonic: BEARAZ cloudAmount: mnemonic: TOCC + transforms: + - scale: 0.01 # albedo: # mnemonic: ALBD +# transforms: +# - scale: 0.01 brightnessTemperature: mnemonic: TMBR ioda: backend: netcdf - obsdataout: "./testrun/gdas.t12z.airsev.tm00.nc" + obsdataout: "./testrun/gdas.t00z.airsev.tm00.nc" dimensions: - - name: "nlocs" - size: variables/brightnessTemperature.nrows - - name: "nchans" + - name: "Location" + size: variables/latitude.nrows + - name: "Channel" size: variables/brightnessTemperature.ncols -# - name: "nchans_albedo" -# size: variables/albedo.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platformCommonName" type: string value: "AIRS" - - name: "MetaData/platformLongDescription" + - name: "platformLongDescription" type: string value: "MTYP 021-249 EVERY FOV AIRS/AMSU-A/HSB 1B BTEMPS(AQUA)" variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" - units: "" - - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" - units: "" - - - name: "MetaData/centralWavenumber" - source: variables/centralWavenumber - dimensions: ["nchans"] - longName: "Central wavenumber (log10)" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/fieldOfViewNumber" source: variables/fieldOfViewNumber - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Field of view number" units: "" - name: "MetaData/solarZenithAngle" source: variables/solarZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar zenith angle" units: "degrees" range: [0, 180] - name: "MetaData/solarAzimuthAngle" source: variables/solarAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar azimuth angle" units: "degrees" range: [0, 360] - name: "MetaData/sensorZenithAngle" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor zenith angle" units: "degrees" range: [0, 90] - name: "MetaData/sensorAzimuthAngle" source: variables/sensorAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor azimuth angle" units: "degrees" range: [0, 360] - - name: "MetaData/cloudAmount" + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" + + - name: "ObsValue/cloudAmount" coordinates: "longitude latitude" source: variables/cloudAmount - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Cloud fraction" - units: "percent" - range: [0, 100] + units: "1" + range: [0, 1] # - name: "ObsValue/albedo" -# coordinates: "longitude latitude nchans_albedo" +# coordinates: "longitude latitude Channel" # source: variables/albedo -# dimensions: ["nlocs", "nchans_albedo"] +# dimensions: ["Location", "Channel"] # longName: "albedo" -# units: "percent" -# range: [0, 100] +# units: "1" +# range: [0, 1] # chunks: [1000, 15] # compressionLevel: 4 - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" + coordinates: "longitude latitude Channel" source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] + dimensions: ["Location", "Channel"] longName: "Brightness temperature" units: "K" range: [120, 500] diff --git a/test/testinput/gdas.t00z.airsev.tm00.bufr_d b/test/testinput/gdas.t00z.airsev.tm00.bufr_d new file mode 100644 index 000000000..5acd7fa87 --- /dev/null +++ b/test/testinput/gdas.t00z.airsev.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb9d7a4518317dfb405cac212f3546717c803847fa5c6c5ba2f6d5cde9ccb98a +size 4962147 diff --git a/test/testoutput/gdas.t00z.airsev.tm00.nc b/test/testoutput/gdas.t00z.airsev.tm00.nc new file mode 100644 index 000000000..4e72c8ad3 --- /dev/null +++ b/test/testoutput/gdas.t00z.airsev.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef281bca7d782232243a214f7a605fdb6de19791d6d7bf3580315bfd29453557 +size 441101 From 9d6ddacc10689a7c96e323642250ddaa7057733b Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 17:58:03 -0500 Subject: [PATCH 18/29] new addition of AMSUA testinput/output yaml and ctest consistent with JEDI Data Conventions --- test/CMakeLists.txt | 11 ++++ test/testinput/bufr_amsua_v2.yaml | 71 ++++++++++----------- test/testinput/gdas.t00z.1bamua.tm00.bufr_d | 3 + test/testoutput/gdas.t00z.1bamsua.tm00.nc | 3 + 4 files changed, 52 insertions(+), 36 deletions(-) create mode 100644 test/testinput/gdas.t00z.1bamua.tm00.bufr_d create mode 100644 test/testoutput/gdas.t00z.1bamsua.tm00.nc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8b7642184..4fff18081 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -137,6 +137,7 @@ if( iodaconv_bufr_ENABLED ) testinput/gdas.t18z.1bmhs.tm00.bufr_d testinput/gdas.t00z.1bhrs4.tm00.bufr_d testinput/gdas.t00z.airsev.tm00.bufr_d + testinput/gdas.t00z.1bamua.tm00.bufr_d testinput/gdas.t00z.avcsam.tm00.bufr_d testinput/gdas.t06z.adpsfc.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr @@ -187,6 +188,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t18z.1bmhs.tm00.15.seven.split.nc testoutput/gdas.t18z.1bmhs.tm00.15.7.filter_split.nc testoutput/gdas.t00z.airsev.tm00.nc + testoutput/gdas.t00z.1bamsua.tm00.bufr_d testoutput/gdas.t00z.avcsam.tm00.nc testoutput/gdas.t06z.adpsfc.tm00.nc testoutput/gdas.t06z.adpsfc_snow.tm00.nc @@ -853,6 +855,15 @@ if(iodaconv_bufr_ENABLED) gdas.t00z.airsev.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_amsua2ioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_amsua_v2.yaml" + gdas.t00z.1bamsua.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_avhrr2ioda TYPE SCRIPT COMMAND bash diff --git a/test/testinput/bufr_amsua_v2.yaml b/test/testinput/bufr_amsua_v2.yaml index 16c179110..d7a898804 100644 --- a/test/testinput/bufr_amsua_v2.yaml +++ b/test/testinput/bufr_amsua_v2.yaml @@ -8,8 +8,8 @@ observations: name: bufr obsdatain: "./testinput/gdas.t00z.1bamua.tm00.bufr_d" mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLAT, CLON] - - mnemonics: [SAID, SIID, FOVN, SAZA, SOZA, BEARAZ, SOLAZI] + - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, SECO, CLAT, CLON] + - mnemonics: [SAID, FOVN, LSQL, SAZA, SOZA, SOLAZI, BEARAZ] - mnemonics: [CHNM, TMBR] channels: 1-15 @@ -22,16 +22,13 @@ observations: day: DAYS hour: HOUR minute: MINU + second: SECO latitude: mnemonic: CLAT longitude: mnemonic: CLON - satelliteId: + satelliteIdentifier: mnemonic: SAID - sensorID: - mnemonic: SIID - channelNumber: - mnemonic: CHNM fieldOfViewNumber: mnemonic: FOVN solarZenithAngle: @@ -42,6 +39,8 @@ observations: mnemonic: SAZA sensorAzimuthAngle: mnemonic: BEARAZ + sensorChannelNumber: + mnemonic: CHNM brightnessTemperature: mnemonic: TMBR @@ -50,96 +49,96 @@ observations: obsdataout: "./testrun/gdas.t00z.1bamsua.tm00.nc" dimensions: - - name: "nlocs" - size: variables/brightnessTemperature.nrows - - name: "nchans" + - name: "Location" + size: variables/latitude.nrows + - name: "Channel" size: variables/brightnessTemperature.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platformCommonName" type: string value: "AMSUA" - - name: "MetaData/platformLongDescription" + - name: "platformLongDescription" type: string value: "MTYP 021-023 PROC AMSU-A 1B Tb (NOAA-15-19, METOP-1,2)" - - name: "MetaData/sensorCentralFrequency" - type: floatVector - value: [23.8, 31.4, 50.3, 52.8, 53.596, 54.4, 54.94, 55.5, 57.290, - 57.290, 57.290, 57.290, 57.290, 57.290, 89.0] +# - name: "sensorCentralFrequency" +# type: floatVector +# value: [23.8, 31.4, 50.3, 52.8, 53.596, 54.4, 54.94, 55.5, 57.290, +# 57.290, 57.290, 57.290, 57.290, 57.290, 89.0] variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" - units: "" - - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/fieldOfViewNumber" source: variables/fieldOfViewNumber - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Field of view number" units: "" - name: "MetaData/solarZenithAngle" source: variables/solarZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar zenith angle" units: "degrees" range: [0, 180] - name: "MetaData/solarAzimuthAngle" source: variables/solarAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar azimuth angle" units: "degrees" range: [0, 360] - name: "MetaData/sensorZenithAngle" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor zenith angle" units: "degrees" range: [0, 90] - name: "MetaData/sensorAzimuthAngle" source: variables/sensorAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor azimuth angle" units: "degrees" range: [0, 360] + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" + - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" + coordinates: "longitude latitude Channel" source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] + dimensions: ["Location", "Channel"] longName: "Brightness temperature" units: "K" range: [120, 500] diff --git a/test/testinput/gdas.t00z.1bamua.tm00.bufr_d b/test/testinput/gdas.t00z.1bamua.tm00.bufr_d new file mode 100644 index 000000000..4adb00910 --- /dev/null +++ b/test/testinput/gdas.t00z.1bamua.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fd762221a1048500eda19896b71ef7441aa4112c30d97b38fe170d41b08dd65 +size 3210561 diff --git a/test/testoutput/gdas.t00z.1bamsua.tm00.nc b/test/testoutput/gdas.t00z.1bamsua.tm00.nc new file mode 100644 index 000000000..5818efd92 --- /dev/null +++ b/test/testoutput/gdas.t00z.1bamsua.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8538cc3b4dea08cce9460cd326d74557c4c42d572491c24f9af52033a84bc1b +size 4960596 From 6a57bba4010fe654c62a8ec2c7b8a11a92d55a7f Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 15 Mar 2022 20:56:07 -0500 Subject: [PATCH 19/29] new addition of ATMS testinput/output yaml and ctest consistent with JEDI Data Conventions --- test/CMakeLists.txt | 11 +++ test/testinput/bufr_atms_v2.yaml | 93 +++++++++++++---------- test/testinput/gdas.t00z.atms.tm00.bufr_d | 3 + test/testoutput/gdas.t00z.atms.tm00.nc | 3 + 4 files changed, 69 insertions(+), 41 deletions(-) create mode 100644 test/testinput/gdas.t00z.atms.tm00.bufr_d create mode 100644 test/testoutput/gdas.t00z.atms.tm00.nc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4fff18081..f5a020e60 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -139,6 +139,7 @@ if( iodaconv_bufr_ENABLED ) testinput/gdas.t00z.airsev.tm00.bufr_d testinput/gdas.t00z.1bamua.tm00.bufr_d testinput/gdas.t00z.avcsam.tm00.bufr_d + testinput/gdas.t00z.atms.tm00.bufr_d testinput/gdas.t06z.adpsfc.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr testinput/bufr_read_wmo_radiosonde.bufr @@ -190,6 +191,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t00z.airsev.tm00.nc testoutput/gdas.t00z.1bamsua.tm00.bufr_d testoutput/gdas.t00z.avcsam.tm00.nc + testoutput/gdas.t00z.atms.tm00.nc testoutput/gdas.t06z.adpsfc.tm00.nc testoutput/gdas.t06z.adpsfc_snow.tm00.nc testoutput/bufr_read_2_dim_blocks.nc @@ -864,6 +866,15 @@ if(iodaconv_bufr_ENABLED) gdas.t00z.1bamsua.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_atmsioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_atms_v2.yaml" + gdas.t00z.atms.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_avhrr2ioda TYPE SCRIPT COMMAND bash diff --git a/test/testinput/bufr_atms_v2.yaml b/test/testinput/bufr_atms_v2.yaml index afe99788a..0c5fb404c 100644 --- a/test/testinput/bufr_atms_v2.yaml +++ b/test/testinput/bufr_atms_v2.yaml @@ -8,8 +8,10 @@ observations: name: bufr obsdatain: "./testinput/gdas.t00z.atms.tm00.bufr_d" mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLATH, CLONH] - - mnemonics: [SAID, SIID, FOVN, SAZA, SOZA, BEARAZ, SOLAZI] + - mnemonics: [SAID, YEAR, MNTH, DAYS, HOUR, MINU, SECO] + - mnemonics: [SLNM, FOVN, ATMSSQ] + - mnemonics: [CLATH, CLONH] + - mnemonics: [SAZA, BEARAZ, SOZA, SOLAZI] - mnemonics: [CHNM, TMBR] channels: 1-22 @@ -22,26 +24,29 @@ observations: day: DAYS hour: HOUR minute: MINU + second: SECO latitude: mnemonic: CLATH longitude: mnemonic: CLONH - satelliteId: + satelliteIdentifier: mnemonic: SAID - sensorID: - mnemonic: SIID - channelNumber: - mnemonic: CHNM + scanLineNumber: + mnemonic: SLNM fieldOfViewNumber: mnemonic: FOVN - solarZenithAngle: - mnemonic: SOZA - solarAzimuthAngle: - mnemonic: SOLAZI + qualityFlags: + mnemonic: ATMSSQ sensorZenithAngle: mnemonic: SAZA sensorAzimuthAngle: mnemonic: BEARAZ + solarZenithAngle: + mnemonic: SOZA + solarAzimuthAngle: + mnemonic: SOLAZI + sensorChannelNumber: + mnemonic: CHNM brightnessTemperature: mnemonic: TMBR @@ -50,98 +55,104 @@ observations: obsdataout: "./testrun/gdas.t00z.atms.tm00.nc" dimensions: - - name: "nlocs" + - name: "Location" size: variables/brightnessTemperature.nrows - - name: "nchans" + - name: "Channel" size: variables/brightnessTemperature.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platformCommonName" type: string value: "ATMS" - - name: "MetaData/platformLongDescription" + - name: "platformLongDescription" type: string value: "MTYP 021-203 ATMS BRIGHTNESS TEMPERATURE DATA" - - name: "MetaData/sensorCentralFrequency" - type: floatVector - value: [23.8, 31.4, 50.3, 51.76, 52.8, 53.596, 54.40, 54.94, 55.50, - 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, - 88.20, 165.5, 183.31, 183.31, 183.31, 183.31, 183.31] +# - name: "sensorCentralFrequency" +# type: floatVector +# value: [23.8, 31.4, 50.3, 51.76, 52.8, 53.596, 54.40, 54.94, 55.50, +# 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, 57.2903, +# 88.20, 165.5, 183.31, 183.31, 183.31, 183.31, 183.31] variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" - units: "" - - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - name: "MetaData/fieldOfViewNumber" source: variables/fieldOfViewNumber - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Field of view number" units: "" + - name: "MetaData/scanLineNumber" + source: variables/scanLineNumber + dimensions: ["Location"] + longName: "Scan line number" + units: "" + - name: "MetaData/solarZenithAngle" source: variables/solarZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar zenith angle" units: "degrees" range: [0, 180] - name: "MetaData/solarAzimuthAngle" source: variables/solarAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar azimuth angle" units: "degrees" range: [0, 360] - name: "MetaData/sensorZenithAngle" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor zenith angle" units: "degrees" range: [0, 90] - name: "MetaData/sensorAzimuthAngle" source: variables/sensorAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor azimuth angle" units: "degrees" range: [0, 360] + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" + - name: "ObsValue/brightnessTemperature" - coordinates: "longitude latitude nchans" + coordinates: "longitude latitude Channel" source: variables/brightnessTemperature - dimensions: ["nlocs", "nchans"] + dimensions: ["Location", "Channel"] longName: "Brightness temperature" units: "K" range: [120, 500] - chunks: [1000, 15] + chunks: [1000, 22] diff --git a/test/testinput/gdas.t00z.atms.tm00.bufr_d b/test/testinput/gdas.t00z.atms.tm00.bufr_d new file mode 100644 index 000000000..f4bb3702b --- /dev/null +++ b/test/testinput/gdas.t00z.atms.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db6d2a691cf0615936fa28cd329ece424ecef63f21115c948027609ae9c4c7b2 +size 5546061 diff --git a/test/testoutput/gdas.t00z.atms.tm00.nc b/test/testoutput/gdas.t00z.atms.tm00.nc new file mode 100644 index 000000000..58ad3325e --- /dev/null +++ b/test/testoutput/gdas.t00z.atms.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b62ddceadd378d67e4ef9e7494fe9a87ee98d07b892310ffec083c2f515af855 +size 3863613 From dfc5a2c62383cba6c3baa07fce4b98df7f2ccf82 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 16 Mar 2022 09:04:39 -0500 Subject: [PATCH 20/29] new addition of CRIS testinput/output yaml and ctest consistent with JEDI Data Conventions --- test/CMakeLists.txt | 11 ++ test/testinput/bufr_cris_v2.yaml | 187 ++++++++------------ test/testinput/gdas.t00z.crisf4.tm00.bufr_d | 3 + test/testoutput/gdas.t00z.crisf4.tm00.nc | 3 + 4 files changed, 90 insertions(+), 114 deletions(-) create mode 100644 test/testinput/gdas.t00z.crisf4.tm00.bufr_d create mode 100644 test/testoutput/gdas.t00z.crisf4.tm00.nc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f5a020e60..a48eae2a2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -141,6 +141,7 @@ if( iodaconv_bufr_ENABLED ) testinput/gdas.t00z.avcsam.tm00.bufr_d testinput/gdas.t00z.atms.tm00.bufr_d testinput/gdas.t06z.adpsfc.tm00.bufr_d + testinput/gdas.t00z.crisf4.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr testinput/bufr_read_wmo_radiosonde.bufr testinput/bufr_satwnd_new_format.bufr @@ -194,6 +195,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t00z.atms.tm00.nc testoutput/gdas.t06z.adpsfc.tm00.nc testoutput/gdas.t06z.adpsfc_snow.tm00.nc + testoutput/gdas.t00z.crisf4.tm00.bufr_d testoutput/bufr_read_2_dim_blocks.nc testoutput/bufr_read_wmo_radiosonde.nc testoutput/NC005031.nc @@ -884,6 +886,15 @@ if(iodaconv_bufr_ENABLED) gdas.t00z.avcsam.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_cris2ioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_cris_v2.yaml" + gdas.t00z.crisf4.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_hrs2ioda TYPE SCRIPT COMMAND bash diff --git a/test/testinput/bufr_cris_v2.yaml b/test/testinput/bufr_cris_v2.yaml index 54f8030d9..27d083ebe 100644 --- a/test/testinput/bufr_cris_v2.yaml +++ b/test/testinput/bufr_cris_v2.yaml @@ -8,16 +8,14 @@ observations: name: bufr obsdatain: "./testinput/gdas.t00z.crisf4.tm00.bufr_d" mnemonicSets: - - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLAT, CLON] - - mnemonics: [SAID, SIID, MYPE, SLNM, FORN, FOVN, SAZA, SOZA, BEARAZ, SOLAZI] - - mnemonics: [TOCC, HOCT, SAZA, SOZA, BEARAZ, SOLAZI] - - mnemonics: [NSQF, QMRKH] - - mnemonics: [NCQF, NFQF] - channels : 1-3 + - mnemonics: [SAID, YEAR, MNTH, DAYS, HOUR, MINU, SECO, CLATH, CLONH] + - mnemonics: [SAZA, BEARAZ, SOZA, SOLAZI, STKO] + - mnemonics: [SLNM, FOVN, HOLS] + - mnemonics: [TOCC, HOCT, NSQF] - mnemonics: [CHNM, SRAD] channels : 1-616 - - mnemonics: [CHNM, SCHRAD] - channels : 1-16 +# - mnemonics: [CHNM, SCHRAD] # VIIRS radiance +# channels : 1-16 exports: variables: @@ -28,22 +26,17 @@ observations: day: DAYS hour: HOUR minute: MINU + second: SECO latitude: - mnemonic: CLAT + mnemonic: CLATH longitude: - mnemonic: CLON - satelliteId: + mnemonic: CLONH + satelliteIdentifier: mnemonic: SAID - sensorID: - mnemonic: SIID - measurementType: - mnemonic: MTYP - channelNumber: - mnemonic: CHNM - sensorScanLineNumber: + scanLineNumber: mnemonic: SLNM - fieldOfRegardNumber: - mnemonic: FORN + satelliteAscendingFlag: + mnemonic: STKO fieldOfViewNumber: mnemonic: FOVN solarZenithAngle: @@ -56,179 +49,145 @@ observations: mnemonic: BEARAZ cloudAmount: mnemonic: TOCC - cloudTopHeight: + transforms: + - scale: 0.01 + heightOfTopOfCloud: mnemonic: HOCT - qualityInfo: - mnemonic: QMRKH - qualityFlagsScan: + qualityFlags: mnemonic: NSQF - qualityFlagsCalibration: - mnemonic: NCQF - qualityFlagsFieldOfView: - mnemonic: NFQF + sensorChannelNumber: + mnemonic: CHNM radiance: mnemonic: SRAD - radianceVIIRS: - mnemonic: SCHRAD +# radianceVIIRS: +# mnemonic: SCHRAD ioda: backend: netcdf obsdataout: "./testrun/gdas.t00z.crisf4.tm00.nc" dimensions: - - name: "nlocs" - size: variables/radiance.nrows - - name: "nchans" + - name: "Location" + size: variables/latitude.nrows + - name: "Channel" size: variables/radiance.ncols - - name: "nchans2" - size: variables/radianceVIIRS.ncols - - name: "nqualityFlags" - size: variables/qualityFlagsCalibration.ncols globals: - - name: "MetaData/platformCommonName" + - name: "platformCommonName" type: string value: "SNPP" - - name: "MetaData/platformLongDescription" + - name: "platformLongDescription" type: string value: "MTYP 021-206 CrIS FULL SPCTRL RADIANCE (431 CHN SUBSET)" variables: - - name: "MetaData/satelliteId" - source: variables/satelliteId - dimensions: ["nlocs"] - longName: "Satellite identification" - units: "" - - - name: "MetaData/channelNumber" - source: variables/channelNumber - dimensions: ["nchans"] - longName: "Channel number" - units: "" - - - name: "MetaData/measurementType" - source: variables/measurementType - dimensions: ["nchans"] - longName: "Measurement type" + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" units: "" - name: "MetaData/latitude" source: variables/latitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Latitude" units: "degrees_north" range: [-90, 90] - name: "MetaData/longitude" source: variables/longitude - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Longitude" units: "degrees_east" range: [-180, 180] - name: "MetaData/dateTime" source: variables/timestamp - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "dateTime" units: "seconds since 1970-01-01T00:00:00Z" - - name: "MetaData/fieldOfRegardNumber" - source: variables/fieldOfRegardNumber - dimensions: ["nlocs"] - longName: "Field of regard number" - units: "" - - name: "MetaData/fieldOfViewNumber" source: variables/fieldOfViewNumber - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Field of view number" units: "" - name: "MetaData/solarZenithAngle" source: variables/solarZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar zenith angle" units: "degrees" range: [0, 180] - name: "MetaData/solarAzimuthAngle" source: variables/solarAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Solar azimuth angle" units: "degrees" range: [0, 360] - name: "MetaData/sensorZenithAngle" source: variables/sensorZenithAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor zenith angle" units: "degrees" range: [0, 90] - name: "MetaData/sensorAzimuthAngle" source: variables/sensorAzimuthAngle - dimensions: ["nlocs"] + dimensions: ["Location"] longName: "Sensor azimuth angle" units: "degrees" range: [0, 360] - - name: "MetaData/sensorScanLineNumber" - source: variables/sensorScanLineNumber - dimensions: ["nlocs"] + - name: "MetaData/scanLineNumber" + source: variables/scanLineNumber + dimensions: ["Location"] longName: "Sensor scan line number" units: "" - - name: "MetaData/cloudAmount" - source: variables/cloudAmount - dimensions: ["nlocs"] - longName: "Cloud fraction" - units: "percent" - - - name: "MetaData/cloudTopHeight" - source: variables/cloudTopHeight - dimensions: ["nlocs"] - longName: "Cloud top height" - units: "m" - - - name: "MetaData/qualityInfo" - source: variables/qualityInfo - dimensions: ["nlocs"] - longName: "Quality information" - units: "" - - - name: "MetaData/qualityFlagsScan" - source: variables/qualityFlagsScan - dimensions: ["nlocs"] + - name: "MetaData/qualityFlags" + source: variables/qualityFlags + dimensions: ["Location"] longName: "Scan level quality flags" units: "" - - name: "MetaData/qualityFlagsCalibration" - source: variables/qualityFlagsCalibration - dimensions: ["nlocs", "nqualityFlags"] - longName: "Calibration quality flags" + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" units: "" - - name: "MetaData/qualityFlagsFieldOfView" - source: variables/qualityFlagsFieldOfView - dimensions: ["nlocs", "nqualityFlags"] - longName: "Field of view quality flags" - units: "" + - name: "ObsValue/cloudAmount" + source: variables/cloudAmount + coordinates: "longitude latitude" + dimensions: ["Location"] + longName: "Cloud fraction" + units: "1" + + - name: "ObsValue/heightOfTopOfCloud" + source: variables/heightOfTopOfCloud + coordinates: "longitude latitude" + dimensions: ["Location"] + longName: "Cloud top height" + units: "m" - name: "ObsValue/radiance" - coordinates: "longitude latitude nchans" source: variables/radiance - dimensions: ["nlocs", "nchans"] + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] longName: "radiance" - units: "W m-2 sr-1 cm" - chunks: [1000, 15] + units: "W m-2 sr-1" + chunks: [1000, 616] compressionLevel: 4 - - name: "ObsValue/radianceVIIRS" - coordinates: "longitude latitude nchans" - source: variables/radianceVIIRS - dimensions: ["nlocs", "nchans2"] - longName: "radiance" - units: "W m-2 sr-1 um-1" - chunks: [1000, 15] - compressionLevel: 4 +# - name: "ObsValue/radianceVIIRS" +# coordinates: "longitude latitude Channel" +# source: variables/radianceVIIRS +# dimensions: ["Location", "Channel"] +# longName: "radiance" +# units: "W m-2 sr-1 um-1" +# chunks: [1000, 16] +# compressionLevel: 4 diff --git a/test/testinput/gdas.t00z.crisf4.tm00.bufr_d b/test/testinput/gdas.t00z.crisf4.tm00.bufr_d new file mode 100644 index 000000000..55c6096d4 --- /dev/null +++ b/test/testinput/gdas.t00z.crisf4.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65ed2ed7b4be038a7e374b7424c2aacd6c0141e32518a95487b03b5393316cf3 +size 6205239 diff --git a/test/testoutput/gdas.t00z.crisf4.tm00.nc b/test/testoutput/gdas.t00z.crisf4.tm00.nc new file mode 100644 index 000000000..f7cb22bcf --- /dev/null +++ b/test/testoutput/gdas.t00z.crisf4.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6a9e3cc2bf65812d29a861a65ecadaa11bdcdd06406fad4a5d99b13e1d94d79 +size 10040877 From ca8b0abd82a8da943403bb98b24fb5e171b4c1d7 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 16 Mar 2022 09:33:45 -0500 Subject: [PATCH 21/29] new addition of SEVIRI (CSR) testinput/output yaml and ctest consistent with JEDI Data Conventions --- test/CMakeLists.txt | 13 ++++++++++++- test/testinput/bufr_sevcrs_v2.yaml | 21 ++++++++++++++++----- test/testinput/gdas.t00z.sevcsr.tm00.bufr_d | 3 +++ test/testoutput/gdas.t00z.sevcsr.tm00.nc | 3 +++ 4 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 test/testinput/gdas.t00z.sevcsr.tm00.bufr_d create mode 100644 test/testoutput/gdas.t00z.sevcsr.tm00.nc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a48eae2a2..e16f11cab 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -142,6 +142,7 @@ if( iodaconv_bufr_ENABLED ) testinput/gdas.t00z.atms.tm00.bufr_d testinput/gdas.t06z.adpsfc.tm00.bufr_d testinput/gdas.t00z.crisf4.tm00.bufr_d + testinput/gdas.t00z.sevcsr.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr testinput/bufr_read_wmo_radiosonde.bufr testinput/bufr_satwnd_new_format.bufr @@ -195,7 +196,8 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t00z.atms.tm00.nc testoutput/gdas.t06z.adpsfc.tm00.nc testoutput/gdas.t06z.adpsfc_snow.tm00.nc - testoutput/gdas.t00z.crisf4.tm00.bufr_d + testoutput/gdas.t00z.crisf4.tm00.nc + testoutput/gdas.t00z.sevcsr.tm00.nc testoutput/bufr_read_2_dim_blocks.nc testoutput/bufr_read_wmo_radiosonde.nc testoutput/NC005031.nc @@ -904,6 +906,15 @@ if(iodaconv_bufr_ENABLED) gdas.t00z.1bhrs4.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_sevcsr2ioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_sevcsr_v2.yaml" + gdas.t00z.sevcsr.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_filtering TYPE SCRIPT COMMAND bash diff --git a/test/testinput/bufr_sevcrs_v2.yaml b/test/testinput/bufr_sevcrs_v2.yaml index af7c5c9f9..69c1239c9 100644 --- a/test/testinput/bufr_sevcrs_v2.yaml +++ b/test/testinput/bufr_sevcrs_v2.yaml @@ -11,7 +11,8 @@ observations: - mnemonics: [YEAR, MNTH, DAYS, HOUR, MINU, CLATH, CLONH] - mnemonics: [SAID, SAZA, SOZA] - mnemonics: [CLDMNT, TMBRST, SDTB] - channels: 1-7 + channels: 1-12 + - mnemonics: [SEQNUM] exports: variables: @@ -34,10 +35,14 @@ observations: mnemonic: SAZA cloudAmount: mnemonic: CLDMNT + transforms: + - scale: 0.01 brightnessTemperature: mnemonic: TMBRST # brightnessTemperatureStdDev: # mnemonic: SDTB + observationSequenceNum: + mnemonic: SEQNUM ioda: backend: netcdf @@ -45,7 +50,7 @@ observations: dimensions: - name: "Location" - size: variables/brightnessTemperature.nrows + size: variables/latitude.nrows - name: "Channel" size: variables/brightnessTemperature.ncols @@ -99,14 +104,20 @@ observations: units: "degrees" range: [0, 90] + - name: "MetaData/observationSequenceNum" + source: variables/observationSequenceNum + dimensions: ["Location"] + longName: "Channel sequence number" + units: "" + - name: "ObsValue/cloudAmount" coordinates: "longitude latitude Channel" source: variables/cloudAmount dimensions: ["Location", "Channel"] longName: "cloud fraction" units: "1" - range: [0, 100] - chunks: [1000, 15] + range: [0, 1] + chunks: [1000, 12] - name: "ObsValue/brightnessTemperature" source: variables/brightnessTemperature @@ -115,7 +126,7 @@ observations: longName: "Brightness temperature" units: "K" range: [150, 350] - chunks: [1000, 15] + chunks: [1000, 12] # - name: "ObsValue/brightnessTemperatureStdDev" # source: variables/brightnessTemperatureStdDev diff --git a/test/testinput/gdas.t00z.sevcsr.tm00.bufr_d b/test/testinput/gdas.t00z.sevcsr.tm00.bufr_d new file mode 100644 index 000000000..ec1e8becf --- /dev/null +++ b/test/testinput/gdas.t00z.sevcsr.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:465372e2730f6a15097ca5102bd7688bf6b2c15d0364dfc21368c6811c16dc25 +size 7780193 diff --git a/test/testoutput/gdas.t00z.sevcsr.tm00.nc b/test/testoutput/gdas.t00z.sevcsr.tm00.nc new file mode 100644 index 000000000..85d027750 --- /dev/null +++ b/test/testoutput/gdas.t00z.sevcsr.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1935dd5d778b478cbe37be939da54509960286d2db4f41b73b4de3c96452e04c +size 3331044 From 71df5a2b5cc27b45b19ec2e23b8619a6e4d5114b Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 16 Mar 2022 10:09:48 -0500 Subject: [PATCH 22/29] new addition of SSMIS testinput/output yaml and ctest consistent with JEDI Data Conventions --- test/CMakeLists.txt | 11 +++++++++++ test/testinput/bufr_ssmis_v2.yaml | 19 ++++++++++--------- test/testinput/gdas.t00z.ssmisu.tm00.bufr_d | 3 +++ test/testoutput/gdas.t00z.ssmisu.tm00.nc | 3 +++ 4 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 test/testinput/gdas.t00z.ssmisu.tm00.bufr_d create mode 100644 test/testoutput/gdas.t00z.ssmisu.tm00.nc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e16f11cab..8784bd9be 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -143,6 +143,7 @@ if( iodaconv_bufr_ENABLED ) testinput/gdas.t06z.adpsfc.tm00.bufr_d testinput/gdas.t00z.crisf4.tm00.bufr_d testinput/gdas.t00z.sevcsr.tm00.bufr_d + testinput/gdas.t00z.ssmisu.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr testinput/bufr_read_wmo_radiosonde.bufr testinput/bufr_satwnd_new_format.bufr @@ -198,6 +199,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t06z.adpsfc_snow.tm00.nc testoutput/gdas.t00z.crisf4.tm00.nc testoutput/gdas.t00z.sevcsr.tm00.nc + testoutput/gdas.t00z.ssmisu.tm00.nc testoutput/bufr_read_2_dim_blocks.nc testoutput/bufr_read_wmo_radiosonde.nc testoutput/NC005031.nc @@ -915,6 +917,15 @@ if(iodaconv_bufr_ENABLED) gdas.t00z.sevcsr.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_ssmir2ioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_sssmis_v2.yaml" + gdas.t00z.ssmisu.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + ecbuild_add_test( TARGET test_iodaconv_bufr_filtering TYPE SCRIPT COMMAND bash diff --git a/test/testinput/bufr_ssmis_v2.yaml b/test/testinput/bufr_ssmis_v2.yaml index 28a8bc39c..7e24e2c15 100644 --- a/test/testinput/bufr_ssmis_v2.yaml +++ b/test/testinput/bufr_ssmis_v2.yaml @@ -9,8 +9,9 @@ observations: obsdatain: "./testinput/gdas.t00z.ssmisu.tm00.bufr_d" mnemonicSets: - mnemonics: [SAID, YEAR, MNTH, DAYS, HOUR, MINU, SECO] + - mnemonics: [SLNM, FOVN] - mnemonics: [CLAT, CLON] - - mnemonics: [SLNM, FOVN, SFLG, RFLAG] + - mnemonics: [SFLG, RFLAG] - mnemonics: [CHNM, TMBR] channels: 1-24 @@ -36,7 +37,7 @@ observations: mnemonic: FOVN earthSurfaceType: mnemonic: SFLG - rainFlag: + qualityFlags: mnemonic: RFLAG sensorChannelNumber: mnemonic: CHNM @@ -62,12 +63,12 @@ observations: type: string value: "MTYP 021-201 DMSP SSM/IS Tb (UNIFIED PRE-PROCESSOR)" - - name: "sensorCentralFrequency" - type: floatVector - dimensions: ["Channel"] - value: [19.35, 19.35, 22.235, 37.0, 37.0, 50.3, 52.8, 53.596, - 54.4, 55.5, 57.29, 59.4, 63.283248, 60.792668, 60.792668, 60.792668, - 60.792668, 60.792668, 91.665, 91.665, 150, 183.311, 183.311, 183.311] +# - name: "sensorCentralFrequency" +# type: floatVector +# dimensions: ["Channel"] +# value: [19.35, 19.35, 22.235, 37.0, 37.0, 50.3, 52.8, 53.596, +# 54.4, 55.5, 57.29, 59.4, 63.283248, 60.792668, 60.792668, 60.792668, +# 60.792668, 60.792668, 91.665, 91.665, 150, 183.311, 183.311, 183.311] variables: - name: "MetaData/satelliteIdentifier" @@ -100,7 +101,7 @@ observations: source: variables/scanLineNumber dimensions: ["Location"] longName: "Scan line number" - units: "1" + units: "" - name: "MetaData/fieldOfViewNumber" source: variables/fieldOfViewNumber diff --git a/test/testinput/gdas.t00z.ssmisu.tm00.bufr_d b/test/testinput/gdas.t00z.ssmisu.tm00.bufr_d new file mode 100644 index 000000000..c4635026f --- /dev/null +++ b/test/testinput/gdas.t00z.ssmisu.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f1eada9ead947ac9cc7e99eae94d62b5c718121e4910eae1deeaa69707b6d5b +size 5082931 diff --git a/test/testoutput/gdas.t00z.ssmisu.tm00.nc b/test/testoutput/gdas.t00z.ssmisu.tm00.nc new file mode 100644 index 000000000..109375911 --- /dev/null +++ b/test/testoutput/gdas.t00z.ssmisu.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c27602691f92581d815a1ab1345eafa1dc3a35719840f5039c76c4a2ff17e06f +size 6194460 From c04b0bcafe0fc6fc97c45db8fcff7cc5cb361c4f Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 16 Mar 2022 13:01:31 -0500 Subject: [PATCH 23/29] new addition of IASI testinput/output yaml and ctest consistent with JEDI Data Conventions --- .../satellite_IASI_mnemonics.txt | 112 +++++++++++ test/CMakeLists.txt | 39 +++- test/testinput/bufr_iasi.yaml | 176 ++++++++++++++++++ test/testinput/gdas.t00z.mtiasi.tm00.bufr_d | 3 + test/testoutput/gdas.t00z.mtiasi.tm00.nc | 3 + 5 files changed, 323 insertions(+), 10 deletions(-) create mode 100644 doc/bufr_table_samples/satellite_IASI_mnemonics.txt create mode 100644 test/testinput/bufr_iasi.yaml create mode 100644 test/testinput/gdas.t00z.mtiasi.tm00.bufr_d create mode 100644 test/testoutput/gdas.t00z.mtiasi.tm00.nc diff --git a/doc/bufr_table_samples/satellite_IASI_mnemonics.txt b/doc/bufr_table_samples/satellite_IASI_mnemonics.txt new file mode 100644 index 000000000..5dfaa8367 --- /dev/null +++ b/doc/bufr_table_samples/satellite_IASI_mnemonics.txt @@ -0,0 +1,112 @@ +Here is the DX table that was generated: + +.------------------------------------------------------------------------------. +| ------------ USER DEFINITIONS FOR TABLE-A TABLE-B TABLE D -------------- | +|------------------------------------------------------------------------------| +| MNEMONIC | NUMBER | DESCRIPTION | +|----------|--------|----------------------------------------------------------| +| | | | +| NC021241 | A61207 | MTYP 021-241 IASI 1C RADIANCES (VARIABLE CHNS) (METOP) | +| | | | +| NC021241 | SAID GCLONG SIID SCLF YEAR MNTH DAYS HOUR MINU 202131 | +| NC021241 | 201138 SECO 201000 202000 CLATH CLONH SAZA BEARAZ SOZA | +| NC021241 | SOLAZI FOVN ORBN 201133 SLNM 201000 201132 MJFC 201000 | +| NC021241 | 202126 SELV 202000 QGFQ QGQI QGQIL QGQIR QGQIS QGSSQ | +| NC021241 | "IASIL1CB"10 (IASICHN) SIID AVHCST "IASIL1CS"7 | +| | | | +| IASIL1CB | 340002 | IASI LEVEL 1C BAND DESCRIPTION SEQUENCE | +| IASIL1CS | 340004 | IASI LEVEL 1C AVHRR SINGLE SCENE SEQUENCE | +| IASICHN | 361137 | IASI LEVEL 1C SCALED RADIANCE SEQUENCE | +| | | +| IASIL1CB | STCH ENCH CHSF | +| | | +| IASIL1CS | YAPCG ZAPCG FCPH "AVHRCHN"6 | +| | | +| AVHRCHN | 361139 | IASI LEVEL 1C MEAN AND STANDARD DEVIATION RADIANCE SEQ | +| AVHRCHN | CHNM CHSF SMRA CHSF SSDR | +| | | +| IASICHN | 201136 CHNM 201000 SCRA | +| | | | +| SAID | 001007 | SATELLITE IDENTIFIER | +| GCLONG | 001031 | ORIGINATING/GENERATING CENTER | +| SIID | 002019 | SATELLITE INSTRUMENTS | +| SCLF | 002020 | SATELLITE CLASSIFICATION | +| YEAR | 004001 | YEAR | +| MNTH | 004002 | MONTH | +| DAYS | 004003 | DAY | +| HOUR | 004004 | HOUR | +| MINU | 004005 | MINUTE | +| SECO | 004006 | SECOND | +| CLATH | 005001 | LATITUDE (HIGH ACCURACY) | +| CLONH | 006001 | LONGITUDE (HIGH ACCURACY) | +| SAZA | 007024 | SATELLITE ZENITH ANGLE | +| SOZA | 007025 | SOLAR ZENITH ANGLE | +| BEARAZ | 005021 | BEARING OR AZIMUTH | +| SOLAZI | 005022 | SOLAR AZIMUTH | +| FOVN | 005043 | FIELD OF VIEW NUMBER | +| ORBN | 005040 | ORBIT NUMBER | +| SLNM | 005041 | SCAN LINE NUMBER | +| MJFC | 025070 | MAJOR FRAME COUNT | +| SELV | 007001 | HEIGHT OF STATION | +| QGFQ | 033060 | INDIVIDUAL IASI-SYSTEM QUALITY FLAG | +| QGQI | 033061 | INSTR. NOISE PERF. INDICATOR (SPECTRAL & RADIOMETRIC) | +| QGQIL | 033062 | GEOMETRIC QUALITY INDEX INDICATOR | +| QGQIR | 033063 | INSTR. NOISE PERF. INDICATOR (RADIOMETRIC CALIBRATION) | +| QGQIS | 033064 | INSTRUMENT NOISE PERF. INDICATOR (SPECTRAL CALIBRATION) | +| QGSSQ | 033065 | OUTPUT OF TEC FUNCTION | +| AVHCST | 025051 | AVHRR CHANNEL COMBINATION | +| STCH | 025140 | START CHANNEL | +| ENCH | 025141 | END CHANNEL | +| CHSF | 025142 | CHANNEL SCALE FACTOR | +| YAPCG | 005060 | Y ANGULAR POSITION OF CENTER OF GRAVITY | +| ZAPCG | 005061 | Z ANGULAR POSITION OF CENTER OF GRAVITY | +| FCPH | 025085 | FRACTION OF CLEAR PIXELS IN HIRS FOV | +| CHNM | 005042 | CHANNEL NUMBER | +| SMRA | 014047 | SCALED MEAN AVHRR RADIANCE | +| SSDR | 014048 | SCALED STANDARD DEVIATION OF AVHRR RADIANCE | +| SCRA | 014046 | SCALED IASI RADIANCE | +| | | +|------------------------------------------------------------------------------| +| MNEMONIC | SCAL | REFERENCE | BIT | UNITS |-------------| +|----------|------|-------------|-----|--------------------------|-------------| +| | | | | |-------------| +| SAID | 0 | 0 | 10 | CODE TABLE |-------------| +| GCLONG | 0 | 0 | 16 | CODE TABLE |-------------| +| SIID | 0 | 0 | 11 | CODE TABLE |-------------| +| SCLF | 0 | 0 | 9 | CODE TABLE |-------------| +| YEAR | 0 | 0 | 12 | YEAR |-------------| +| MNTH | 0 | 0 | 4 | MONTH |-------------| +| DAYS | 0 | 0 | 6 | DAY |-------------| +| HOUR | 0 | 0 | 5 | HOUR |-------------| +| MINU | 0 | 0 | 6 | MINUTE |-------------| +| SECO | 0 | 0 | 6 | SECOND |-------------| +| CLATH | 5 | -9000000 | 25 | DEGREE |-------------| +| CLONH | 5 | -18000000 | 26 | DEGREE |-------------| +| SAZA | 2 | -9000 | 15 | DEGREE |-------------| +| SOZA | 2 | -9000 | 15 | DEGREE |-------------| +| BEARAZ | 2 | 0 | 16 | DEGREE TRUE |-------------| +| SOLAZI | 2 | 0 | 16 | DEGREE TRUE |-------------| +| FOVN | 0 | 0 | 8 | NUMERIC |-------------| +| ORBN | 0 | 0 | 24 | NUMERIC |-------------| +| SLNM | 0 | 0 | 8 | NUMERIC |-------------| +| MJFC | 0 | 0 | 4 | NUMERIC |-------------| +| SELV | 0 | -400 | 15 | M |-------------| +| QGFQ | 0 | 0 | 2 | CODE TABLE |-------------| +| QGQI | 0 | 0 | 7 | % |-------------| +| QGQIL | 0 | 0 | 7 | % |-------------| +| QGQIR | 0 | 0 | 7 | % |-------------| +| QGQIS | 0 | 0 | 7 | % |-------------| +| QGSSQ | 0 | 0 | 24 | NUMERIC |-------------| +| AVHCST | 0 | 0 | 7 | FLAG TABLE |-------------| +| STCH | 0 | 0 | 14 | NUMERIC |-------------| +| ENCH | 0 | 0 | 14 | NUMERIC |-------------| +| CHSF | 0 | 0 | 6 | NUMERIC |-------------| +| YAPCG | 6 | -8000000 | 24 | DEGREE |-------------| +| ZAPCG | 6 | -8000000 | 24 | DEGREE |-------------| +| FCPH | 0 | 0 | 7 | NUMERIC |-------------| +| CHNM | 0 | 0 | 6 | NUMERIC |-------------| +| SMRA | 0 | 0 | 31 | W M**-2 SR**-1 M |-------------| +| SSDR | 0 | 0 | 31 | W M**-2 SR**-1 M |-------------| +| SCRA | 0 | 0 | 16 | W M**-2 SR**-1 M |-------------| +| | | | | |-------------| +`------------------------------------------------------------------------------' diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8784bd9be..f5dc8b038 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -142,14 +142,23 @@ if( iodaconv_bufr_ENABLED ) testinput/gdas.t00z.atms.tm00.bufr_d testinput/gdas.t06z.adpsfc.tm00.bufr_d testinput/gdas.t00z.crisf4.tm00.bufr_d + testinput/gdas.t00z.mtiasi.tm00.bufr_d testinput/gdas.t00z.sevcsr.tm00.bufr_d testinput/gdas.t00z.ssmisu.tm00.bufr_d testinput/bufr_read_2_dim_blocks.bufr testinput/bufr_read_wmo_radiosonde.bufr testinput/bufr_satwnd_new_format.bufr testinput/bufr_satwnd_old_format.bufr - testinput/bufr_mhs.yaml + testinput/bufr_airs.yaml + testinput/bufr_amsua.yaml + testinput/bufr_atms.yaml + testinput/bufr_avhrr.yaml + testinput/bufr_cris.yaml testinput/bufr_hrs.yaml + testinput/bufr_iasi.yaml + testinput/bufr_mhs.yaml + testinput/bufr_seviri.yaml + testinput/bufr_ssmis.yaml testinput/bufr_filtering.yaml testinput/bufr_splitting.yaml testinput/bufr_filter_split.yaml @@ -198,6 +207,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t06z.adpsfc.tm00.nc testoutput/gdas.t06z.adpsfc_snow.tm00.nc testoutput/gdas.t00z.crisf4.tm00.nc + testoutput/gdas.t00z.mtiasi.tm00.nc testoutput/gdas.t00z.sevcsr.tm00.nc testoutput/gdas.t00z.ssmisu.tm00.nc testoutput/bufr_read_2_dim_blocks.nc @@ -859,7 +869,7 @@ if(iodaconv_bufr_ENABLED) COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_airs_v2.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_airs.yaml" gdas.t00z.airsev.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) @@ -868,7 +878,7 @@ if(iodaconv_bufr_ENABLED) COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_amsua_v2.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_amsua.yaml" gdas.t00z.1bamsua.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) @@ -877,7 +887,7 @@ if(iodaconv_bufr_ENABLED) COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_atms_v2.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_atms.yaml" gdas.t00z.atms.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) @@ -886,7 +896,7 @@ if(iodaconv_bufr_ENABLED) COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_avhrr_v2.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_avhrr.yaml" gdas.t00z.avcsam.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) @@ -895,7 +905,7 @@ if(iodaconv_bufr_ENABLED) COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_cris_v2.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_cris.yaml" gdas.t00z.crisf4.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) @@ -908,21 +918,30 @@ if(iodaconv_bufr_ENABLED) gdas.t00z.1bhrs4.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) - ecbuild_add_test( TARGET test_iodaconv_bufr_sevcsr2ioda + ecbuild_add_test( TARGET test_iodaconv_bufr_iasi2ioda + TYPE SCRIPT + COMMAND bash + ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh + netcdf + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_iasi.yaml" + gdas.t00z.mtiasi.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} + DEPENDS bufr2ioda.x ) + + ecbuild_add_test( TARGET test_iodaconv_bufr_seviri2ioda TYPE SCRIPT COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_sevcsr_v2.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_seviri.yaml" gdas.t00z.sevcsr.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) - ecbuild_add_test( TARGET test_iodaconv_bufr_ssmir2ioda + ecbuild_add_test( TARGET test_iodaconv_bufr_ssmis2ioda TYPE SCRIPT COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_sssmis_v2.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_sssmis.yaml" gdas.t00z.ssmisu.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) diff --git a/test/testinput/bufr_iasi.yaml b/test/testinput/bufr_iasi.yaml new file mode 100644 index 000000000..4c883f508 --- /dev/null +++ b/test/testinput/bufr_iasi.yaml @@ -0,0 +1,176 @@ +# (C) Copyright 2022 UCAR +# +# 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. + +observations: + - obs space: + name: bufr + obsdatain: "./testinput/gdas.t00z.mtiasi.tm00.bufr_d" + mnemonicSets: + - mnemonics: [SAID, YEAR, MNTH, DAYS, HOUR, MINU, SECO] + - mnemonics: [CLATH, CLONH, SAZA, BEARAZ, SOZA, SOLAZI, FOVN, SLNM] + - mnemonics: [STCH, ENCH, CHSF] + channels: 1-10 + - mnemonics: [CHNM, SCRA] + channels: 1-616 + + exports: + variables: + timestamp: + datetime: + year: YEAR + month: MNTH + day: DAYS + hour: HOUR + minute: MINU + second: SECO + latitude: + mnemonic: CLATH + longitude: + mnemonic: CLONH + satelliteIdentifier: + mnemonic: SAID + scanLineNumber: + mnemonic: SLNM + fieldOfViewNumber: + mnemonic: FOVN + solarZenithAngle: + mnemonic: SOZA + solarAzimuthAngle: + mnemonic: SOLAZI + sensorZenithAngle: + mnemonic: SAZA + sensorAzimuthAngle: + mnemonic: BEARAZ + sensorChannelStart: + mnemonic: STCH + sensorChannelEnd: + mnemonic: ENCH + channelScaleFactor: + mnemonic: CHSF + sensorChannelNumber: + mnemonic: CHNM + radianceScaled: + mnemonic: SCRA + + ioda: + backend: netcdf + obsdataout: "./testrun/gdas.t00z.mtiasi.tm00.nc" + + dimensions: + - name: "Location" + size: variables/latitude.nrows + - name: "Channel" + size: variables/radianceScaled.ncols + - name: "ChannelBlock" + size: variables/sensorChannelStart.ncols + + globals: + - name: "platformCommonName" + type: string + value: "IASI" + + - name: "platformLongDescription" + type: string + value: "MTYP 021-241 IASI 1C RADIANCES (VARIABLE CHNS) (METOP)" + + variables: + - name: "MetaData/satelliteIdentifier" + source: variables/satelliteIdentifier + dimensions: ["Location"] + longName: "Satellite identifier" + units: "" + + - name: "MetaData/latitude" + source: variables/latitude + dimensions: ["Location"] + longName: "Latitude" + units: "degrees_north" + range: [-90, 90] + + - name: "MetaData/longitude" + source: variables/longitude + dimensions: ["Location"] + longName: "Longitude" + units: "degrees_east" + range: [-180, 180] + + - name: "MetaData/dateTime" + source: variables/timestamp + dimensions: ["Location"] + longName: "dateTime" + units: "seconds since 1970-01-01T00:00:00Z" + + - name: "MetaData/fieldOfViewNumber" + source: variables/fieldOfViewNumber + dimensions: ["Location"] + longName: "Field of view number" + units: "" + + - name: "MetaData/scanLineNumber" + source: variables/scanLineNumber + dimensions: ["Location"] + longName: "Scan line number" + units: "" + + - name: "MetaData/solarZenithAngle" + source: variables/solarZenithAngle + dimensions: ["Location"] + longName: "Solar zenith angle" + units: "degrees" + range: [0, 180] + + - name: "MetaData/solarAzimuthAngle" + source: variables/solarAzimuthAngle + dimensions: ["Location"] + longName: "Solar azimuth angle" + units: "degrees" + range: [0, 360] + + - name: "MetaData/sensorZenithAngle" + source: variables/sensorZenithAngle + dimensions: ["Location"] + longName: "Sensor zenith angle" + units: "degrees" + range: [0, 90] + + - name: "MetaData/sensorAzimuthAngle" + source: variables/sensorAzimuthAngle + dimensions: ["Location"] + longName: "Sensor azimuth angle" + units: "degrees" + range: [0, 360] + + - name: "MetaData/sensorChannelStart" + source: variables/sensorChannelStart + dimensions: ["ChannelBlock"] + longName: "Starting channel number" + units: "" + + - name: "MetaData/sensorChannelEnd" + source: variables/sensorChannelEnd + dimensions: ["ChannelBlock"] + longName: "Ending channel number" + units: "" + + - name: "MetaData/channelScaleFactor" + source: variables/channelScaleFactor + dimensions: ["ChannelBlock"] + longName: "Channel scale factor" + units: "" + + - name: "MetaData/sensorChannelNumber" + source: variables/sensorChannelNumber + dimensions: ["Channel"] + longName: "Channel number" + units: "" + + - name: "ObsValue/radianceScaled" + source: variables/radianceScaled + coordinates: "longitude latitude Channel" + dimensions: ["Location", "Channel"] + longName: "Scaled radiance" + units: "W m-2 sr-1" + chunks: [1000, 616] + compressionLevel: 4 diff --git a/test/testinput/gdas.t00z.mtiasi.tm00.bufr_d b/test/testinput/gdas.t00z.mtiasi.tm00.bufr_d new file mode 100644 index 000000000..a4973dd78 --- /dev/null +++ b/test/testinput/gdas.t00z.mtiasi.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70d3c2b743ce4fcc5950c62149e612c67710f794cfa78e0874ca158877d6868c +size 2324599 diff --git a/test/testoutput/gdas.t00z.mtiasi.tm00.nc b/test/testoutput/gdas.t00z.mtiasi.tm00.nc new file mode 100644 index 000000000..1926effd9 --- /dev/null +++ b/test/testoutput/gdas.t00z.mtiasi.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99006132166bae5238f11d24b4205a4fcea9e2464a599e0e5e2125972abd6845 +size 2620862 From d47bc242c209bcfcf610bce359e12155550def60 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Wed, 16 Mar 2022 13:04:42 -0500 Subject: [PATCH 24/29] remove the v2 reference of filename because we will be using JEDI Data Conventions eventually --- test/testinput/{bufr_airs_v2.yaml => bufr_airs.yaml} | 0 test/testinput/{bufr_amsua_v2.yaml => bufr_amsua.yaml} | 0 test/testinput/{bufr_atms_v2.yaml => bufr_atms.yaml} | 0 test/testinput/{bufr_avhrr_v2.yaml => bufr_avhrr.yaml} | 0 test/testinput/{bufr_cris_v2.yaml => bufr_cris.yaml} | 0 test/testinput/{bufr_sevcrs_v2.yaml => bufr_seviri.yaml} | 0 test/testinput/{bufr_ssmis_v2.yaml => bufr_ssmis.yaml} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename test/testinput/{bufr_airs_v2.yaml => bufr_airs.yaml} (100%) rename test/testinput/{bufr_amsua_v2.yaml => bufr_amsua.yaml} (100%) rename test/testinput/{bufr_atms_v2.yaml => bufr_atms.yaml} (100%) rename test/testinput/{bufr_avhrr_v2.yaml => bufr_avhrr.yaml} (100%) rename test/testinput/{bufr_cris_v2.yaml => bufr_cris.yaml} (100%) rename test/testinput/{bufr_sevcrs_v2.yaml => bufr_seviri.yaml} (100%) rename test/testinput/{bufr_ssmis_v2.yaml => bufr_ssmis.yaml} (100%) diff --git a/test/testinput/bufr_airs_v2.yaml b/test/testinput/bufr_airs.yaml similarity index 100% rename from test/testinput/bufr_airs_v2.yaml rename to test/testinput/bufr_airs.yaml diff --git a/test/testinput/bufr_amsua_v2.yaml b/test/testinput/bufr_amsua.yaml similarity index 100% rename from test/testinput/bufr_amsua_v2.yaml rename to test/testinput/bufr_amsua.yaml diff --git a/test/testinput/bufr_atms_v2.yaml b/test/testinput/bufr_atms.yaml similarity index 100% rename from test/testinput/bufr_atms_v2.yaml rename to test/testinput/bufr_atms.yaml diff --git a/test/testinput/bufr_avhrr_v2.yaml b/test/testinput/bufr_avhrr.yaml similarity index 100% rename from test/testinput/bufr_avhrr_v2.yaml rename to test/testinput/bufr_avhrr.yaml diff --git a/test/testinput/bufr_cris_v2.yaml b/test/testinput/bufr_cris.yaml similarity index 100% rename from test/testinput/bufr_cris_v2.yaml rename to test/testinput/bufr_cris.yaml diff --git a/test/testinput/bufr_sevcrs_v2.yaml b/test/testinput/bufr_seviri.yaml similarity index 100% rename from test/testinput/bufr_sevcrs_v2.yaml rename to test/testinput/bufr_seviri.yaml diff --git a/test/testinput/bufr_ssmis_v2.yaml b/test/testinput/bufr_ssmis.yaml similarity index 100% rename from test/testinput/bufr_ssmis_v2.yaml rename to test/testinput/bufr_ssmis.yaml From b24882ca0cdd5059c985fb321be49bd1d40432bc Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Fri, 18 Mar 2022 12:16:52 -0500 Subject: [PATCH 25/29] eliminate channelBlock, scaleFactor, and start/end channel info for now --- test/testinput/bufr_cris.yaml | 24 +++++++++------------- test/testinput/bufr_iasi.yaml | 38 +++++++++++++++++------------------ 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/test/testinput/bufr_cris.yaml b/test/testinput/bufr_cris.yaml index 27d083ebe..52119aee5 100644 --- a/test/testinput/bufr_cris.yaml +++ b/test/testinput/bufr_cris.yaml @@ -12,8 +12,9 @@ observations: - mnemonics: [SAZA, BEARAZ, SOZA, SOLAZI, STKO] - mnemonics: [SLNM, FOVN, HOLS] - mnemonics: [TOCC, HOCT, NSQF] + - mnemonics: [STCH, ENCH, CHSF] - mnemonics: [CHNM, SRAD] - channels : 1-616 + channels : 1-430 # - mnemonics: [CHNM, SCHRAD] # VIIRS radiance # channels : 1-16 @@ -55,12 +56,16 @@ observations: mnemonic: HOCT qualityFlags: mnemonic: NSQF + sensorChannelStart: + mnemonic: STCH + sensorChannelEnd: + mnemonic: ENCH + channelScaleFactor: + mnemonic: CHSF sensorChannelNumber: mnemonic: CHNM - radiance: + radiance: # This is actually a scaled radiance, needs a fix mnemonic: SRAD -# radianceVIIRS: -# mnemonic: SCHRAD ioda: backend: netcdf @@ -180,14 +185,5 @@ observations: dimensions: ["Location", "Channel"] longName: "radiance" units: "W m-2 sr-1" - chunks: [1000, 616] + chunks: [1000, 430] compressionLevel: 4 - -# - name: "ObsValue/radianceVIIRS" -# coordinates: "longitude latitude Channel" -# source: variables/radianceVIIRS -# dimensions: ["Location", "Channel"] -# longName: "radiance" -# units: "W m-2 sr-1 um-1" -# chunks: [1000, 16] -# compressionLevel: 4 diff --git a/test/testinput/bufr_iasi.yaml b/test/testinput/bufr_iasi.yaml index 4c883f508..a951eb34d 100644 --- a/test/testinput/bufr_iasi.yaml +++ b/test/testinput/bufr_iasi.yaml @@ -51,7 +51,7 @@ observations: mnemonic: CHSF sensorChannelNumber: mnemonic: CHNM - radianceScaled: + radiance: # This is actually a scaled radiance, needs a fix mnemonic: SCRA ioda: @@ -62,7 +62,7 @@ observations: - name: "Location" size: variables/latitude.nrows - name: "Channel" - size: variables/radianceScaled.ncols + size: variables/radiance.ncols - name: "ChannelBlock" size: variables/sensorChannelStart.ncols @@ -142,23 +142,23 @@ observations: units: "degrees" range: [0, 360] - - name: "MetaData/sensorChannelStart" - source: variables/sensorChannelStart - dimensions: ["ChannelBlock"] - longName: "Starting channel number" - units: "" +# - name: "MetaData/sensorChannelStart" +# source: variables/sensorChannelStart +# dimensions: ["ChannelBlock"] +# longName: "Starting channel number" +# units: "" - - name: "MetaData/sensorChannelEnd" - source: variables/sensorChannelEnd - dimensions: ["ChannelBlock"] - longName: "Ending channel number" - units: "" +# - name: "MetaData/sensorChannelEnd" +# source: variables/sensorChannelEnd +# dimensions: ["ChannelBlock"] +# longName: "Ending channel number" +# units: "" - - name: "MetaData/channelScaleFactor" - source: variables/channelScaleFactor - dimensions: ["ChannelBlock"] - longName: "Channel scale factor" - units: "" +# - name: "MetaData/channelScaleFactor" +# source: variables/channelScaleFactor +# dimensions: ["ChannelBlock"] +# longName: "Channel scale factor" +# units: "" - name: "MetaData/sensorChannelNumber" source: variables/sensorChannelNumber @@ -166,8 +166,8 @@ observations: longName: "Channel number" units: "" - - name: "ObsValue/radianceScaled" - source: variables/radianceScaled + - name: "ObsValue/radiance" + source: variables/radiance coordinates: "longitude latitude Channel" dimensions: ["Location", "Channel"] longName: "Scaled radiance" From 06db436b83914cba1ffb2709b36f4b836ec6014c Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Fri, 18 Mar 2022 12:24:23 -0500 Subject: [PATCH 26/29] fix up the test ref files --- test/testinput/bufr_iasi.yaml | 4 ++-- test/testoutput/gdas.t00z.crisf4.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.mtiasi.tm00.nc | 4 ++-- test/testoutput/gdas.t18z.1bmhs.tm00.nc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/testinput/bufr_iasi.yaml b/test/testinput/bufr_iasi.yaml index a951eb34d..2bc2beed8 100644 --- a/test/testinput/bufr_iasi.yaml +++ b/test/testinput/bufr_iasi.yaml @@ -63,8 +63,8 @@ observations: size: variables/latitude.nrows - name: "Channel" size: variables/radiance.ncols - - name: "ChannelBlock" - size: variables/sensorChannelStart.ncols + # - name: "ChannelBlock" + # size: variables/sensorChannelStart.ncols globals: - name: "platformCommonName" diff --git a/test/testoutput/gdas.t00z.crisf4.tm00.nc b/test/testoutput/gdas.t00z.crisf4.tm00.nc index f7cb22bcf..0624d7eee 100644 --- a/test/testoutput/gdas.t00z.crisf4.tm00.nc +++ b/test/testoutput/gdas.t00z.crisf4.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6a9e3cc2bf65812d29a861a65ecadaa11bdcdd06406fad4a5d99b13e1d94d79 -size 10040877 +oid sha256:2de5eee7d43eb393126ab97302626c3c0cad7bf8dd730823344b1bb1f5b2c2b7 +size 9935576 diff --git a/test/testoutput/gdas.t00z.mtiasi.tm00.nc b/test/testoutput/gdas.t00z.mtiasi.tm00.nc index 1926effd9..61e51864b 100644 --- a/test/testoutput/gdas.t00z.mtiasi.tm00.nc +++ b/test/testoutput/gdas.t00z.mtiasi.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99006132166bae5238f11d24b4205a4fcea9e2464a599e0e5e2125972abd6845 -size 2620862 +oid sha256:7a61f6e8f56d63a45a02c2dcbda3a16a6d4e62bb030afef6f7ebadfd00140e70 +size 2610502 diff --git a/test/testoutput/gdas.t18z.1bmhs.tm00.nc b/test/testoutput/gdas.t18z.1bmhs.tm00.nc index ea005e234..083f5f93e 100644 --- a/test/testoutput/gdas.t18z.1bmhs.tm00.nc +++ b/test/testoutput/gdas.t18z.1bmhs.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6be816b756176d0d42ec8adec6ca112d00e623d35f8c8d24fc5e76d636b45b43 +oid sha256:8e490bd300622397bbcdfb4637c48e7fe1d7dbbe726787e374adddd49ae7102e size 799977 From c4b0d85e23cf5f96959d3b0f3cfc07283779c524 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Thu, 24 Mar 2022 13:59:32 -0500 Subject: [PATCH 27/29] major reduction in file sizes --- test/testinput/gdas.t00z.1bamua.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.1bhrs4.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.1bmhs.tm00.bufr_d | 3 +++ test/testinput/gdas.t00z.airsev.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.atms.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.avcsam.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.crisf4.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.mtiasi.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.sevcsr.tm00.bufr_d | 4 ++-- test/testinput/gdas.t00z.ssmisu.tm00.bufr_d | 4 ++-- test/testinput/gdas.t18z.1bmhs.tm00.bufr_d | 4 ++-- test/testoutput/gdas.t00z.1bamsua.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.1bhrs4.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.airsev.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.atms.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.crisf4.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.mtiasi.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.sevcsr.tm00.nc | 4 ++-- test/testoutput/gdas.t00z.ssmisu.tm00.nc | 4 ++-- test/testoutput/gdas.t12z.avcsam.tm00.nc | 4 ++-- test/testoutput/gdas.t18z.1bmhs.tm00.nc | 4 ++-- 21 files changed, 43 insertions(+), 40 deletions(-) create mode 100644 test/testinput/gdas.t00z.1bmhs.tm00.bufr_d diff --git a/test/testinput/gdas.t00z.1bamua.tm00.bufr_d b/test/testinput/gdas.t00z.1bamua.tm00.bufr_d index 4adb00910..2b53e63f3 100644 --- a/test/testinput/gdas.t00z.1bamua.tm00.bufr_d +++ b/test/testinput/gdas.t00z.1bamua.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fd762221a1048500eda19896b71ef7441aa4112c30d97b38fe170d41b08dd65 -size 3210561 +oid sha256:abd06cad28d4bb5d18ee03ffd90a78bc6099ba543f76d6cdb99b0f8b90f6a5d8 +size 492555 diff --git a/test/testinput/gdas.t00z.1bhrs4.tm00.bufr_d b/test/testinput/gdas.t00z.1bhrs4.tm00.bufr_d index cdc7fe9d2..bbc30b310 100644 --- a/test/testinput/gdas.t00z.1bhrs4.tm00.bufr_d +++ b/test/testinput/gdas.t00z.1bhrs4.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6aa27e06ca5cca41952f6a39728001b138c2079d41bc2a1f59cad2a436417eb4 -size 501104 +oid sha256:dda9ac9eda2e1c5dffcce9b3774a1836e1d46181003e93984a20abe443b8b74c +size 271749 diff --git a/test/testinput/gdas.t00z.1bmhs.tm00.bufr_d b/test/testinput/gdas.t00z.1bmhs.tm00.bufr_d new file mode 100644 index 000000000..e91430c52 --- /dev/null +++ b/test/testinput/gdas.t00z.1bmhs.tm00.bufr_d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c91f1d846f75c808a3944c6f6c2bb126f3632920dbdd0e167f3178f9e83f11c8 +size 941961 diff --git a/test/testinput/gdas.t00z.airsev.tm00.bufr_d b/test/testinput/gdas.t00z.airsev.tm00.bufr_d index 5acd7fa87..37b9ad514 100644 --- a/test/testinput/gdas.t00z.airsev.tm00.bufr_d +++ b/test/testinput/gdas.t00z.airsev.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb9d7a4518317dfb405cac212f3546717c803847fa5c6c5ba2f6d5cde9ccb98a -size 4962147 +oid sha256:2f929d61d06c3ec8612cb56a21c9ae391c9d79376d356bb52c49b67f2131a574 +size 380537 diff --git a/test/testinput/gdas.t00z.atms.tm00.bufr_d b/test/testinput/gdas.t00z.atms.tm00.bufr_d index f4bb3702b..b0cd69743 100644 --- a/test/testinput/gdas.t00z.atms.tm00.bufr_d +++ b/test/testinput/gdas.t00z.atms.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db6d2a691cf0615936fa28cd329ece424ecef63f21115c948027609ae9c4c7b2 -size 5546061 +oid sha256:982c56d7173d765dde58797bfac37bbcfe28b8c2d22bdcf92ef4b7520607f679 +size 584798 diff --git a/test/testinput/gdas.t00z.avcsam.tm00.bufr_d b/test/testinput/gdas.t00z.avcsam.tm00.bufr_d index 06d71d608..445dc3989 100644 --- a/test/testinput/gdas.t00z.avcsam.tm00.bufr_d +++ b/test/testinput/gdas.t00z.avcsam.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6988638572696effb00fd1583d6f3f7b74e2c3bb5f2df8d73318bd85eda9f302 -size 1153813 +oid sha256:20f37fe4b9b0b7f0eca694c562696540f1b84e6851909651cbb466cf0aed41d5 +size 405237 diff --git a/test/testinput/gdas.t00z.crisf4.tm00.bufr_d b/test/testinput/gdas.t00z.crisf4.tm00.bufr_d index 55c6096d4..024d7a5fa 100644 --- a/test/testinput/gdas.t00z.crisf4.tm00.bufr_d +++ b/test/testinput/gdas.t00z.crisf4.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65ed2ed7b4be038a7e374b7424c2aacd6c0141e32518a95487b03b5393316cf3 -size 6205239 +oid sha256:3bb2ebff85458875644569f2a503e0dcfa5da6fa344b8876ec409972c8e64af0 +size 792000 diff --git a/test/testinput/gdas.t00z.mtiasi.tm00.bufr_d b/test/testinput/gdas.t00z.mtiasi.tm00.bufr_d index a4973dd78..9fb5902dc 100644 --- a/test/testinput/gdas.t00z.mtiasi.tm00.bufr_d +++ b/test/testinput/gdas.t00z.mtiasi.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70d3c2b743ce4fcc5950c62149e612c67710f794cfa78e0874ca158877d6868c -size 2324599 +oid sha256:521fd7f05f1fa15a95386b74cf856dba340180587d4d4d4f2ac43b095cfa242b +size 574611 diff --git a/test/testinput/gdas.t00z.sevcsr.tm00.bufr_d b/test/testinput/gdas.t00z.sevcsr.tm00.bufr_d index ec1e8becf..70ee9b2c9 100644 --- a/test/testinput/gdas.t00z.sevcsr.tm00.bufr_d +++ b/test/testinput/gdas.t00z.sevcsr.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:465372e2730f6a15097ca5102bd7688bf6b2c15d0364dfc21368c6811c16dc25 -size 7780193 +oid sha256:8977151480d41ac15a127354e8393b276e3853b8fa47193e50aad45cbc0de37a +size 499917 diff --git a/test/testinput/gdas.t00z.ssmisu.tm00.bufr_d b/test/testinput/gdas.t00z.ssmisu.tm00.bufr_d index c4635026f..c01801747 100644 --- a/test/testinput/gdas.t00z.ssmisu.tm00.bufr_d +++ b/test/testinput/gdas.t00z.ssmisu.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f1eada9ead947ac9cc7e99eae94d62b5c718121e4910eae1deeaa69707b6d5b -size 5082931 +oid sha256:bd00bffeef1f3d3a4a5fb8275310a426e97fb77ba87adfdd007d29ba08696868 +size 604509 diff --git a/test/testinput/gdas.t18z.1bmhs.tm00.bufr_d b/test/testinput/gdas.t18z.1bmhs.tm00.bufr_d index 67b2294f5..d85d48ac5 100644 --- a/test/testinput/gdas.t18z.1bmhs.tm00.bufr_d +++ b/test/testinput/gdas.t18z.1bmhs.tm00.bufr_d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f8176608de9c3473784affadd9992d64154b443c674e47b6729a5bb444818d8 -size 601592 +oid sha256:c367930a85cc0ef8c649a320e5abdbbcccd52581cae57b63ae40e769fbc3d227 +size 322305 diff --git a/test/testoutput/gdas.t00z.1bamsua.tm00.nc b/test/testoutput/gdas.t00z.1bamsua.tm00.nc index 5818efd92..9d9c40777 100644 --- a/test/testoutput/gdas.t00z.1bamsua.tm00.nc +++ b/test/testoutput/gdas.t00z.1bamsua.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8538cc3b4dea08cce9460cd326d74557c4c42d572491c24f9af52033a84bc1b -size 4960596 +oid sha256:3ccfe44e77b5d6e3043b623d82025379a436b72fca7c124e73a06b83878548ff +size 751996 diff --git a/test/testoutput/gdas.t00z.1bhrs4.tm00.nc b/test/testoutput/gdas.t00z.1bhrs4.tm00.nc index d2771e12c..b7a0e8fe8 100644 --- a/test/testoutput/gdas.t00z.1bhrs4.tm00.nc +++ b/test/testoutput/gdas.t00z.1bhrs4.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68585899e79371d6844d99ad9c38719d9c607d21c42201d293997dec7b5bc96a -size 764192 +oid sha256:9510d0ea36b1d15a187dd8eb189366c0f85850a2e2f15f518d1a68c9d8472513 +size 416277 diff --git a/test/testoutput/gdas.t00z.airsev.tm00.nc b/test/testoutput/gdas.t00z.airsev.tm00.nc index 4e72c8ad3..d5ea4df44 100644 --- a/test/testoutput/gdas.t00z.airsev.tm00.nc +++ b/test/testoutput/gdas.t00z.airsev.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef281bca7d782232243a214f7a605fdb6de19791d6d7bf3580315bfd29453557 -size 441101 +oid sha256:4e4add417ebb2b367300fa761c7d7af770496c5f6f793a44a98a282377c9dea4 +size 75289 diff --git a/test/testoutput/gdas.t00z.atms.tm00.nc b/test/testoutput/gdas.t00z.atms.tm00.nc index 58ad3325e..76b35bc42 100644 --- a/test/testoutput/gdas.t00z.atms.tm00.nc +++ b/test/testoutput/gdas.t00z.atms.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b62ddceadd378d67e4ef9e7494fe9a87ee98d07b892310ffec083c2f515af855 -size 3863613 +oid sha256:77d9251b041da01394737ed1da1cb9f2db6e950244cbb56adc0f5e099f43c89f +size 432204 diff --git a/test/testoutput/gdas.t00z.crisf4.tm00.nc b/test/testoutput/gdas.t00z.crisf4.tm00.nc index 0624d7eee..604003c9e 100644 --- a/test/testoutput/gdas.t00z.crisf4.tm00.nc +++ b/test/testoutput/gdas.t00z.crisf4.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2de5eee7d43eb393126ab97302626c3c0cad7bf8dd730823344b1bb1f5b2c2b7 -size 9935576 +oid sha256:415e75fbbd176ff5ae7c4fb82a94faf53005beccfb17117293d137f4584caca1 +size 1294387 diff --git a/test/testoutput/gdas.t00z.mtiasi.tm00.nc b/test/testoutput/gdas.t00z.mtiasi.tm00.nc index 61e51864b..790c6cb70 100644 --- a/test/testoutput/gdas.t00z.mtiasi.tm00.nc +++ b/test/testoutput/gdas.t00z.mtiasi.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a61f6e8f56d63a45a02c2dcbda3a16a6d4e62bb030afef6f7ebadfd00140e70 -size 2610502 +oid sha256:18b8d5f75790d58673fcd6ed846a0e9644b327efe4a63155c918209ab0057846 +size 658210 diff --git a/test/testoutput/gdas.t00z.sevcsr.tm00.nc b/test/testoutput/gdas.t00z.sevcsr.tm00.nc index 85d027750..97a9aeeb8 100644 --- a/test/testoutput/gdas.t00z.sevcsr.tm00.nc +++ b/test/testoutput/gdas.t00z.sevcsr.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1935dd5d778b478cbe37be939da54509960286d2db4f41b73b4de3c96452e04c -size 3331044 +oid sha256:eccb8a1979989132422bd72e96594f30b608a15d059317dbb137a8fec0d8f7e8 +size 241049 diff --git a/test/testoutput/gdas.t00z.ssmisu.tm00.nc b/test/testoutput/gdas.t00z.ssmisu.tm00.nc index 109375911..cb1e3d33f 100644 --- a/test/testoutput/gdas.t00z.ssmisu.tm00.nc +++ b/test/testoutput/gdas.t00z.ssmisu.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c27602691f92581d815a1ab1345eafa1dc3a35719840f5039c76c4a2ff17e06f -size 6194460 +oid sha256:599961c8e519956026aa75900889f594a1021b3f251b0bca98f5e9fd756e1921 +size 732450 diff --git a/test/testoutput/gdas.t12z.avcsam.tm00.nc b/test/testoutput/gdas.t12z.avcsam.tm00.nc index cc688eac2..b2b517da2 100644 --- a/test/testoutput/gdas.t12z.avcsam.tm00.nc +++ b/test/testoutput/gdas.t12z.avcsam.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e801c0405bfb28caa5d06b19fcb3c9c5a8e87dedd21fc4cb7e68e3d45f4554f6 -size 476448 +oid sha256:07bfbcf1c8e1f914e7644369d788c70f2881cf598c3f25eb4389a026e1e9aabd +size 178778 diff --git a/test/testoutput/gdas.t18z.1bmhs.tm00.nc b/test/testoutput/gdas.t18z.1bmhs.tm00.nc index 7f0ae2678..01601ad58 100644 --- a/test/testoutput/gdas.t18z.1bmhs.tm00.nc +++ b/test/testoutput/gdas.t18z.1bmhs.tm00.nc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d2b8dd1ec4ee2ff31278b7904f3dd62a357aa6394307c630f2dcffa9fc45a90 -size 797849 +oid sha256:9a224c68c74cf29939a0827c728f4c1d8292ee7ee791bd35ae4cc623aa5c9d99 +size 435383 From 3b5bc8155e91f069e27637bce61aa9f7567ba56f Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 29 Mar 2022 11:28:35 -0500 Subject: [PATCH 28/29] fix test filenames and such --- test/CMakeLists.txt | 6 +++--- test/testinput/bufr_avhrr.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 68af6cdab..cacb8fe73 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -198,7 +198,7 @@ if( iodaconv_bufr_ENABLED ) testoutput/gdas.t18z.1bmhs.tm00.15.seven.split.nc testoutput/gdas.t18z.1bmhs.tm00.15.7.filter_split.nc testoutput/gdas.t00z.airsev.tm00.nc - testoutput/gdas.t00z.1bamsua.tm00.bufr_d + testoutput/gdas.t00z.1bamsua.tm00.nc testoutput/gdas.t00z.avcsam.tm00.nc testoutput/gdas.t00z.atms.tm00.nc testoutput/gdas.t06z.adpsfc.tm00.nc @@ -889,7 +889,7 @@ if(iodaconv_bufr_ENABLED) gdas.t00z.1bamsua.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) - ecbuild_add_test( TARGET test_iodaconv_bufr_atmsioda + ecbuild_add_test( TARGET test_iodaconv_bufr_atms2ioda TYPE SCRIPT COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh @@ -948,7 +948,7 @@ if(iodaconv_bufr_ENABLED) COMMAND bash ARGS ${CMAKE_BINARY_DIR}/bin/iodaconv_comp.sh netcdf - "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_sssmis.yaml" + "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x testinput/bufr_ssmis.yaml" gdas.t00z.ssmisu.tm00.nc ${IODA_CONV_COMP_TOL_ZERO} DEPENDS bufr2ioda.x ) diff --git a/test/testinput/bufr_avhrr.yaml b/test/testinput/bufr_avhrr.yaml index 854919c33..1f8b3ccea 100644 --- a/test/testinput/bufr_avhrr.yaml +++ b/test/testinput/bufr_avhrr.yaml @@ -46,7 +46,7 @@ observations: ioda: backend: netcdf - obsdataout: "./testrun/gdas.t12z.avcsam.tm00.nc" + obsdataout: "./testrun/gdas.t00z.avcsam.tm00.nc" dimensions: - name: "Location" From 73d6fc3430ef867a487a66e3368b3d6d9de968d2 Mon Sep 17 00:00:00 2001 From: gthompsnJCSDA Date: Tue, 29 Mar 2022 14:13:48 -0500 Subject: [PATCH 29/29] add in a missing test ref file --- test/testoutput/gdas.t00z.avcsam.tm00.nc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test/testoutput/gdas.t00z.avcsam.tm00.nc diff --git a/test/testoutput/gdas.t00z.avcsam.tm00.nc b/test/testoutput/gdas.t00z.avcsam.tm00.nc new file mode 100644 index 000000000..fd78e96cd --- /dev/null +++ b/test/testoutput/gdas.t00z.avcsam.tm00.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9137c417faf5a03900c92d3625aac74104a8a0c3795b4e0b034324f4b58609ff +size 178778