Merge pull request #41 from ecmwf-projects/WOUDC-fixes

Fix WOUDC according to the table in drive

cdsobs/cdm/tables.py

@@ -22,6 +22,7 @@
     "observations_table",
     "header_table",
     "uncertainty_table",
+    "sensor_configuration",
 ]
 
 

cdsobs/data/insitu-observations-woudc-ozone-total-column-and-profiles/service_definition.yml

@@ -9,27 +9,19 @@ sources:
       rename:
         duration: time_since_launch
         gp_height: geopotential_height
-        height: observation_height_above_station_surface
+        height: altitude
         instrument_model: sensor_id
         latitude: latitude|observations_table
-        level_code: level_code
+        location_latitude: latitude|header_table
+        location_longitude: longitude|header_table
         location_height: height_of_station_above_sea_level
-        location_latitude: latitude|station_configuration
-        location_longitude: longitude|station_configuration
         longitude: longitude|observations_table
         o3_partial_pressure: ozone_partial_pressure
-        ozone_reference_model: reference_model
-        ozone_reference_total_o3: ozone_reference_total_ozone
-        ozone_reference_utc_mean: ozone_reference_time_mean
-        platform_gaw_id: other_ids
+        ozone_reference_utc_mean: date_time
         platform_id: primary_station_id
         platform_type: platform_type
-        pump_motor_current: pump_motor_current
-        pump_motor_voltage: pump_motor_voltage
         radiosonde_model: sensor_model
         relative_humidity: relative_humidity
-        sample_temperature: sample_temperature
-        sonde_current: sonde_current
         temperature: air_temperature
         timestamp_datetime: report_timestamp
         to3: total_ozone_column
@@ -63,78 +55,45 @@ sources:
         description: Geographical latitude (for example from GPS).
         dtype: float32
         units: decimal degrees
-      latitude|station_configuration:
+      latitude|header_table:
         description: Latitude of the instrument.
         dtype: float32
         units: decimal degrees
-      level_code:
-        description: Code for the level type.
-        dtype: float32
       longitude|observations_table:
         description: Geographical longitude (for example from GPS).
         dtype: float32
         units: decimal degrees
-      longitude|station_configuration:
+      longitude|header_table:
         description: Longitude of the instrument.
         dtype: float32
         units: decimal degrees
-      observation_height_above_station_surface:
-        description: Geographical height (for example from GPS).
-        dtype: float32
-        units: m
-      other_ids:
-        description: Three-letter GAW ID as issued by GAWSIS, if available (recommended).
-        dtype: object
       ozone_partial_pressure:
         description: Level partial pressure of ozone in Pascals.
         dtype: float32
         units: Pa
-      ozone_reference_time_mean:
+      date_time:
         description: The mean time of observations.
         dtype: float32
         units: decimal hours, UTC
-      ozone_reference_total_ozone:
-        description: Daily value of total column ozone amount defined as the "best representative value" in the order of Direct Sun (DS), Zenith Cloud (ZS) and Focused Moon (FM).
-        dtype: float32
-        units: Dobson-units
       platform_type:
         description: Type of observing platform.
         dtype: object
       primary_station_id:
         description: Unique station or flight ID assigned by the WOUDC to each registered platform.
         dtype: object
-      pump_motor_current:
-        description: Electrical current measured through the pump motor.
-        dtype: float32
-        units: Ampere
-      pump_motor_voltage:
-        description: Applied voltage measured across the pump motor.
-        dtype: float32
-        units: Volt
-      reference_model:
-        description: Model ID where applicable.
-        dtype: object
       relative_humidity:
         description: Percentage of water vapour relative to the saturation amount.
         dtype: float32
         units: '%'
       report_timestamp:
         description: Timestamp with time zone.
         dtype: datetime64[ns]
-      sample_temperature:
-        description: Temperature where sample is measured in Kelvin.
-        dtype: float32
-        units: Kelvin
       sensor_id:
         description: Model ID where applicable.
         dtype: object
       sensor_model:
         description: Radiosonde model.
         dtype: object
-      sonde_current:
-        description: Measured ozonesonde cell current with no corrections applied.
-        dtype: float32
-        units: Ampere
       time_since_launch:
         description: Elapsed flight time since released as primary variable.
         dtype: float32
@@ -151,18 +110,21 @@ sources:
         description: Wind speed in meters per second.
         dtype: float32
         units: m s^-1
+      altitude:
+        description: Geometric altitude above sea level calculated from air pressure and GPS altitude
+        dtype: float32
+        units: m
     header_columns:
     - platform_type
     - primary_station_id
-    - other_ids
     - sensor_id
-    - longitude|station_configuration
-    - latitude|station_configuration
-    - height_of_station_above_sea_level
+    - longitude|header_table
+    - latitude|header_table
+    - altitude
     - sensor_model
+    - sensor_id
     - reference_model
-    - ozone_reference_total_ozone
-    - ozone_reference_time_mean
+    - date_time
     - report_timestamp
     header_table: woudc_ozonesonde_header
     join_ids:
@@ -176,6 +138,7 @@ sources:
     - geopotential_height
     - relative_humidity
     - total_ozone_column
+    - pressure
     mandatory_columns:
     - platform_type
     - primary_station_id
@@ -200,78 +163,51 @@ sources:
     - longitude|observations_table
     - observation_height_above_station_surface
     space_columns:
-      x: longitude|station_configuration
-      y: latitude|station_configuration
+      x: longitude|header_table
+      y: latitude|header_table
+      z: pressure
   TotalOzone:
     cdm_mapping:
       melt_columns: {}
       rename:
         column_o3: total_ozone_column
         column_so2: column_sulphur_dioxide
-        daily_date: daily_timestamp
         instrument_model: sensor_id
         location_height: height_of_station_above_sea_level
-        location_latitude: latitude|station_configuration
-        location_longitude: longitude|station_configuration
-        m_mu: harmonic_mean_relative_slant_path
-        monthly_npts: monthly_npts
+        location_latitude: latitude|header_table
+        location_longitude: longitude|header_table
+        monthly_npts: monthly_total_ozone_column_number_of_points
         n_obs: number_of_observations
-        obs_code: obs_code
-        platform_gaw_id: other_ids
         platform_id: primary_station_id
-        std_dev_o3: total_ozone_column_standard_deviation
+        std_dev_o3: standard_deviation_ozone
         timestamp_datetime_first_day: report_timestamp
         utc_begin: time_begin
         utc_end: time_end
         utc_mean: time_mean
-        wl_code: wl_code
-      unit_changes:
-        column_sulphur_dioxide:
-          names:
-            Dobson-units: Dobson-units
-          offset: 0
-          scale: 1
-        total_ozone_column:
-          names:
-            Dobson-units: Dobson-units
-          offset: 0
-          scale: 1
     data_table: woudc_totalozone_value
     descriptions:
       column_sulphur_dioxide:
         description: The daily total column sulphur dioxide (SO2) amount calculated as the mean of the individual SO2 amounts from the same observation used for the O3 amount.
         dtype: float32
         units: Dobson-units
-      daily_timestamp:
-        description: Date of the observations.
-        dtype: datetime64[ns]
-      harmonic_mean_relative_slant_path:
-        description: The harmonic mean of the relative slant path through the ozone layer at 22Km for each of the observations used to compute the daily value.
-        dtype: float32
       height_of_station_above_sea_level:
         description: Height is defined as the altitude, elevation, or height of the defined platform + instrument above sea level.
         dtype: float32
         units: meters above sea level
-      latitude|station_configuration:
+      latitude|header_table:
         description: Latitude of the measurement station (used when differs from the one of the instrument).
         dtype: float32
         units: decimal degrees
-      longitude|station_configuration:
+      longitude|header_table:
         description: Longitude of the measurement station (used when differs from the one of the instrument).
         dtype: float32
         units: decimal degrees
-      monthly_npts:
+      monthly_total_ozone_column_number_of_points:
         description: The number of points (typically this is the number of daily averages) used to estimate the monthly mean ozone value.
         dtype: float32
       number_of_observations:
         description: Number of observations used to calculate the total column ozone value.
         dtype: float32
-      obs_code:
-        description: Code to designate the type of total ozone measurement.
-        dtype: object
-      other_ids:
-        description: Three-letter GAW ID as issued by GAWSIS, if available (recommended).
-        dtype: object
       platform_type:
         description: Type of observing platform.
         dtype: object
@@ -301,19 +237,15 @@ sources:
         description: Daily value of total column ozone amount defined as the 'best representative value' in order of Direct Sun (DS), Zenith Cloud (ZS) and Focused Moon (FM).
         dtype: float32
         units: Dobson-units
-      total_ozone_column_standard_deviation:
+      standard_deviation_ozone:
         description: Estimated population standard deviation of the total column ozone measurements used for the daily value.
         dtype: float32
-      wl_code:
-        description: Code to designate the wavelength pair(s) used for total ozone measurement.
-        dtype: float32
     header_columns:
     - platform_type
     - primary_station_id
-    - other_ids
     - sensor_id
-    - longitude|station_configuration
-    - latitude|station_configuration
+    - longitude|header_table
+    - latitude|header_table
     - height_of_station_above_sea_level
     - monthly_npts
     - report_timestamp
@@ -324,23 +256,22 @@ sources:
     main_variables:
     - total_ozone_column
     - column_sulphur_dioxide
+    - standard_deviation_ozone
     mandatory_columns:
     - platform_type
     - primary_station_id
-    - other_ids
     - sensor_id
     - monthly_npts
     - longitude
     - latitude
     - height_of_station_above_sea_level
     - daily_timestamp
-    - wl_code
     - obs_code
     - time_begin
     - time_end
     - time_mean
     - number_of_observations
     - harmonic_mean_relative_slant_path
     space_columns:
-      x: longitude|station_configuration
-      y: latitude|station_configuration
+      x: longitude|header_table
+      y: latitude|header_table