Merge branch 'develop' into feature/geocloud

MetOffice · Jan 3, 2025 · efc6d23 · efc6d23
2 parents 8f8eb2e + abd7c20
commit efc6d23
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Varfields.md b/Varfields.md
@@ -12,7 +12,7 @@
 | 5 | `VarField_v` | `v10(:)` or `v(:,:)` | northward wind | `ObsValue/windNorthward` (`ObsValue/windNorthwardAt10M` for u10) | |
 | 6 | `VarField_logvis` | `logvis(:)` | Base 10 log of horizontal visibility (m) | `ObsValue/horizonalVisibility` | |
 | 7 | `VarField_tcwv` | `TCWV(:)` | total column water vapour | `ObsValue/precipitableWater` | |
-| 8 | `VarField_windspeed` | `WindSpeed(:)` | 10 metre windspeed | `ObsValue/WindSpeed` | |
+| 8 | `VarField_windspeed` | `WindSpeed(:)` | 10 metre windspeed | `BiasCorrObsValue/windSpeed` | |
 | 9 | `VarField_lwp` | | | | Implement |
 | 10 | `VarField_britemp` | `CorBriTemp(:,:)` | bias-corrected brightness temperatures | `BiasCorrObsValue/brightnessTemperature` | |
 | 11 | `VarField_tskin` | `Tskin(:)` | skin temperature | `OneDVar/skinTemperature` | |

diff --git a/src/opsinputs/opsinputs_varobswriter_mod.F90 b/src/opsinputs/opsinputs_varobswriter_mod.F90
@@ -869,7 +869,7 @@ subroutine opsinputs_varobswriter_populateobservations( &
       if (Ob % Header % ObsGroup == ObsGroupOceanWinds) then
         call opsinputs_fill_fillelementtypefromsimulatedvariable(&
         Ob % Header % WindSpeed, "WindSpeed", Ob % Header % NumObsLocal, Ob % WindSpeed, &
-        ObsSpace, Flags, ObsErrors, "windSpeed", "ObsValue")
+        ObsSpace, Flags, ObsErrors, "windSpeed", "BiasCorrObsValue")
       end if
     case (VarField_lwp)
       ! TODO(someone): handle this varfield

diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py
@@ -703,7 +703,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename):
     output_1d_simulated_var_to_netcdf('windNorthwardAt10M',           'testinput/005_VarField_v_ScatwindChosen.nc4', with_bias=True)
     output_simulated_var_profiles_to_netcdf('windNorthward',          'testinput/005_VarField_v_Sonde.nc4')
     output_1d_simulated_var_to_netcdf('precipitableWater',            'testinput/007_VarField_tcwv.nc4')
-    output_1d_simulated_var_to_netcdf('windSpeed',                    'testinput/008_VarField_WindSpeed.nc4')
+    output_1d_simulated_var_to_netcdf('windSpeed',                    'testinput/008_VarField_WindSpeed.nc4', with_bias=True)
     output_1d_simulated_var_to_netcdf('horizontalVisibility',         'testinput/009_VarField_horizontalVisibility.nc4')
     output_2d_simulated_var_to_netcdf('brightnessTemperature',      'testinput/010_VarField_britemp.nc4', with_bias=True)
     output_1d_normal_var_to_netcdf   ('skinTemperature', 'OneDVar', 'testinput/011_VarField_tskin.nc4')

diff --git a/test/testinput/008_VarField_WindSpeed.nc4 b/test/testinput/008_VarField_WindSpeed.nc4
diff --git a/test/testinput/008_VarField_WindSpeed.yaml b/test/testinput/008_VarField_WindSpeed.yaml
@@ -34,7 +34,7 @@ observations:
       expected_main_table_columns:
         # Only observations 1, 2 and 4 are passed; observation 3 is rejected by the domain check
         field:    ["8", "8", "8"]
-        ob value: ["1.10000", "-1073741824.00000", "1.40000"]
+        ob value: ["1.20000", "-1073741824.00000", "1.30000"]
         ob error: ["0.20000", "-1073741824.00000", "0.80000"]
         lat:      ["21.00000", "22.00000", "24.00000"]
         lon:      ["31.00000", "32.00000", "34.00000"]