Merge branch 'feature/surfacecloud_fabien-mo' into feature/surfacecloud

MetOffice · Aug 15, 2023 · 810f960 · 810f960
2 parents b56d74a + 72f337f
commit 810f960
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py
@@ -768,9 +768,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename):
 
     # SurfaceCloud - UKV
     output_full_varobs_to_netcdf(['MetaData/latitude',
-                                  'MetaData/longitude',
-                                  'ObsValue/stationPressure'],
-                                 ['DerivedObsValue/cloudAmount', 'DerivedObsError/cloudAmount'],
+                                  'MetaData/longitude'],
+                                 ['ObsValue/cloud_layer', 'DerivedObsValue/cloudAmount', 'DerivedObsError/cloudAmount'],
                                  [],
                                  'testinput/varobs_ukvnamelist_surfacecloud.nc4')
 

diff --git a/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 b/test/testinput/varobs_ukvnamelist_surfacecloud.nc4
diff --git a/test/testinput/varobswriter_ukvnamelist_surfacecloud.yaml b/test/testinput/varobswriter_ukvnamelist_surfacecloud.yaml
@@ -8,9 +8,10 @@ observations:
         engine:
           type: H5File
           obsfile: Data/varobs_ukvnamelist_surfacecloud.nc4
-      simulated variables: [stationPressure]
-      observed variables: [stationPressure]
-      derived variables: [cloudAmount]
+      simulated variables: [cloud_layer, cloudAmount]
+      observed variables: []
+      derived variables: [cloud_layer, cloudAmount]
+      channels: 1-3
     obs filters:
     # Set the flag of observations with missing values to "pass": we want to check if these
     # values are encoded correctly in the VarObsFile.
@@ -39,10 +40,10 @@ observations:
                 15,15,15,
                 15,15,15,
                 15,15,15]
-        ob value: ["1.30000","1.20000","1.10000",
-                   "2.30000","-1073741824.00000","2.10000",
-                   "3.30000","3.20000","3.10000",
-                   "4.30000","4.20000","4.10000"]
+        ob value: ["11.30000","11.20000","11.10000",
+                   "12.30000","-1073741824.00000","12.10000",
+                   "13.30000","13.20000","13.10000",
+                   "14.30000","14.20000","14.10000"]
         lat: ["7.10000","7.10000","7.10000",
               "-1073741824.00000","-1073741824.00000","-1073741824.00000",
               "7.30000","7.30000","7.30000",