Merge branch 'develop' into feature/variable_names_part4

MetOffice · Oct 8, 2024 · 05a2271 · 05a2271
2 parents 7df2fce + 43c63b1
commit 05a2271
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ The following YAML snippet demonstrates the use of `VarObsWriter`. <ObsGroup> st
   ObsDataIn:
     obsfile: observations.nc4
   simulate:
-    variables: [surface_pressure]
+    variables: [air_pressure_at_surface]
 - Filter: VarObs Writer
   # The filter will output an <ObsGroup>.varobs file
   # in the directory specified in the output_directory option.
@@ -94,7 +94,7 @@ And here is a YAML snippet demonstrating the use of `CxWriter`.
   ObsDataIn:
     obsfile: observations.nc4
   simulate:
-    variables: [surface_pressure]
+    variables: [air_pressure_at_surface]
 - Filter: Cx Writer
   # The filter will output an <ObsGroup>.cx file
   # in the directory specified in the output_directory option.

diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py
diff --git a/test/testinput/001_SurfaceCxField_Orog.nc4 b/test/testinput/001_SurfaceCxField_Orog.nc4
diff --git a/test/testinput/002_SurfaceCxField_pstar.nc4 b/test/testinput/002_SurfaceCxField_pstar.nc4
diff --git a/test/testinput/cx_globalnamelist_abiclr.nc4 b/test/testinput/cx_globalnamelist_abiclr.nc4
diff --git a/test/testinput/cx_globalnamelist_ahiclr.nc4 b/test/testinput/cx_globalnamelist_ahiclr.nc4
diff --git a/test/testinput/cx_globalnamelist_aircraft.nc4 b/test/testinput/cx_globalnamelist_aircraft.nc4
diff --git a/test/testinput/cx_globalnamelist_amsr.nc4 b/test/testinput/cx_globalnamelist_amsr.nc4
diff --git a/test/testinput/cx_globalnamelist_atms.nc4 b/test/testinput/cx_globalnamelist_atms.nc4
diff --git a/test/testinput/cx_globalnamelist_atovs.nc4 b/test/testinput/cx_globalnamelist_atovs.nc4
diff --git a/test/testinput/cx_globalnamelist_gmihigh.nc4 b/test/testinput/cx_globalnamelist_gmihigh.nc4
diff --git a/test/testinput/cx_globalnamelist_gmilow.nc4 b/test/testinput/cx_globalnamelist_gmilow.nc4
diff --git a/test/testinput/cx_globalnamelist_gnssro.nc4 b/test/testinput/cx_globalnamelist_gnssro.nc4
diff --git a/test/testinput/cx_globalnamelist_groundgps.nc4 b/test/testinput/cx_globalnamelist_groundgps.nc4
diff --git a/test/testinput/cx_globalnamelist_iasi.nc4 b/test/testinput/cx_globalnamelist_iasi.nc4
diff --git a/test/testinput/cx_globalnamelist_mwsfy3.nc4 b/test/testinput/cx_globalnamelist_mwsfy3.nc4
diff --git a/test/testinput/cx_globalnamelist_oceanwinds.nc4 b/test/testinput/cx_globalnamelist_oceanwinds.nc4
diff --git a/test/testinput/cx_globalnamelist_sattcwv.nc4 b/test/testinput/cx_globalnamelist_sattcwv.nc4
diff --git a/test/testinput/cx_globalnamelist_scatwind.nc4 b/test/testinput/cx_globalnamelist_scatwind.nc4
diff --git a/test/testinput/cx_globalnamelist_screen.nc4 b/test/testinput/cx_globalnamelist_screen.nc4
diff --git a/test/testinput/cx_globalnamelist_seviriclr.nc4 b/test/testinput/cx_globalnamelist_seviriclr.nc4
diff --git a/test/testinput/cx_globalnamelist_sonde.nc4 b/test/testinput/cx_globalnamelist_sonde.nc4
diff --git a/test/testinput/cx_globalnamelist_ssmis.nc4 b/test/testinput/cx_globalnamelist_ssmis.nc4
diff --git a/test/testinput/cx_globalnamelist_surface.nc4 b/test/testinput/cx_globalnamelist_surface.nc4
diff --git a/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4 b/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4
diff --git a/test/testinput/cx_ukvnamelist_radar_reflectivity.nc4 b/test/testinput/cx_ukvnamelist_radar_reflectivity.nc4
diff --git a/test/testinput/cx_ukvnamelist_seviriasr.nc4 b/test/testinput/cx_ukvnamelist_seviriasr.nc4
diff --git a/test/testinput/cx_ukvnamelist_seviriclr.nc4 b/test/testinput/cx_ukvnamelist_seviriclr.nc4
diff --git a/test/testinput/cx_ukvnamelist_sonde.nc4 b/test/testinput/cx_ukvnamelist_sonde.nc4
diff --git a/test/testinput/cx_ukvnamelist_surface.nc4 b/test/testinput/cx_ukvnamelist_surface.nc4
diff --git a/test/testinput/cx_ukvnamelist_surfacecloud.nc4 b/test/testinput/cx_ukvnamelist_surfacecloud.nc4