Correct 2m variable names in spoc, ufo, and yaml files.

parm/jcb-gdas/observation_chronicle/atmosphere/prepbufr_adpsfc.yaml

@@ -11,7 +11,7 @@ window_option: max
 # these are the stations rejected in the GSI, for being coastal. 
 stations_to_reject:
   All: []
-  airTemperature: [
+  airTemperatureAt2M: [
   '01001', '01002', '01003', '01006', '01007', '01008', '01009', '01010', '01011', '01013',
   '01016', '01017', '01020', '01024', '01028', '01033', '01039', '01044', '01052', '01055',
   '01062', '01068', '01078', '01083', '01092', '01098', '01099', '01102', '01107', '01108',

parm/jcb-gdas/observations/atmosphere/prepbufr_adpsfc.yaml.j2

@@ -15,8 +15,8 @@
         obsfile: "{{atmosphere_obsdataout_path}}/{{atmosphere_obsdataout_prefix}}{{observation_from_jcb}}{{atmosphere_obsdataout_suffix}}"
     io pool:
       max pool size: 1
-    simulated variables: [stationPressure, airTemperature]
-    observed variables: [stationPressure, airTemperature]
+    simulated variables: [stationPressure, airTemperatureAt2M]
+    observed variables: [stationPressure, airTemperatureAt2M]
 
   # Observation Operator
   # -------------------
@@ -30,22 +30,22 @@
       geovar_geomz: geopotential_height
       variables:
       - name: stationPressure
-    # to-do: replace airTemperature with airTemperatureAt2m, and use identity
-    - name: VertInterp
-      vertical coordinate: air_pressure
-      observation vertical coordinate: pressure
-      observation vertical coordinate group: MetaData
-      interpolation method: log-linear
+    - name: Identity
       variables:
-      - name: airTemperature
+      - name: airTemperatureAt2M
 
   # Linear Observation Operator
   # ---------------------------
   linear obs operator:
-    name: Identity
-    variables:
-    - name: stationPressure
-    - name: airTemperature
+    name: Composite
+    components:
+    - name: Identity
+      variables:
+      - name: stationPressure
+    - name: Identity
+      variables:
+      - name: airTemperatureAt2M
+        alias: air_temperature
 
   # Observation Prior Filters (QC)
   # ------------------------------
@@ -253,7 +253,7 @@
   #- filter: Perform Action
   #  udescriptor: "obs_type_check"
   #  where:
-  #  - variable: ObsValue/airTemperature
+  #  - variable: ObsValue/airTemperatureAt2M
   #    value: is_not_valid
   #  action:
   #    name: reduce obs space
@@ -263,18 +263,18 @@
   - filter: RejectList
     udescriptor: "obs_type_check"
     filter variables:
-    - name: airTemperature
+    - name: airTemperatureAt2M
     where:
     - variable:
-        name: ObsType/airTemperature
+        name: ObsType/airTemperatureAt2M
       is_not_in: [181]
   - filter: RejectList
     filter variables:
-    - name: airTemperature
+    - name: airTemperatureAt2M
     where:
     - variable:
         name: MetaData/stationIdentification
-      is_in: {{ get_conventional_rejected_stations(observation_from_jcb, 'airTemperature') }}
+      is_in: {{ get_conventional_rejected_stations(observation_from_jcb, 'airTemperatureAt2M') }}
 
   # Observation Post Filters (QC)
   # -----------------------------