Merge branch 'develop' into feature/rename-variance

MetOffice · Sep 25, 2024 · 5170698 · 5170698
2 parents c8a34cd + 7afb6ef
commit 5170698
Show file tree

Hide file tree

Showing 29 changed files with 319 additions and 224 deletions.
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -8,14 +8,14 @@ ecbuild_add_test( TARGET test_orcajedi_coding_norms
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/cpplint.py
                   ARGS --recursive ${CMAKE_CURRENT_SOURCE_DIR}/../ )
 
-ecbuild_add_test( TARGET test_orcamodel_hofx_ice
+ecbuild_add_test( TARGET test_orcamodel_hofx_sic
                   OMP 1
-                  ARGS testinput/hofx_nc_ice.yaml
+                  ARGS testinput/hofx_nc_sic.yaml
                   COMMAND orcamodel_hofx.x )
 
-ecbuild_add_test( TARGET test_orcamodel_hofx3D_ice
+ecbuild_add_test( TARGET test_orcamodel_hofx3D_sic
                   OMP 1
-                  ARGS testinput/ostia_seaice_obs_hofx3d.yaml
+                  ARGS testinput/hofx3d_nc_sic.yaml
                   COMMAND orcamodel_hofx3D.x )
 
 ecbuild_add_test( TARGET test_orcamodel_hofx3D_sst
@@ -59,6 +59,18 @@ ecbuild_add_test( TARGET test_orcamodel_hofx3D_ssh_amm1
                   ARGS testinput/hofx3d_nc_ssh_amm1.yaml
                   COMMAND orcamodel_hofx3D.x )
 
+ecbuild_add_test( TARGET test_orcamodel_hofx_potm_amm1r
+                  OMP 1
+                  MPI 1
+                  ARGS testinput/hofx_nc_potm_amm1r.yaml
+                  COMMAND orcamodel_hofx.x )
+
+ecbuild_add_test( TARGET test_orcamodel_hofx3D_ssh_amm1r
+                  OMP 1
+                  MPI 1
+                  ARGS testinput/hofx3d_nc_ssh_amm1r.yaml
+                  COMMAND orcamodel_hofx3D.x )
+
 ecbuild_add_test( TARGET test_orcamodel_hofx_ssh_parallel_serial
                   OMP 1
                   MPI 2

diff --git a/src/tests/Data/CMakeLists.txt b/src/tests/Data/CMakeLists.txt
@@ -1,20 +1,19 @@
 
 list( APPEND orcajedi_test_data
-ostia_seaice_obs.odb
+hofx_sic_ostia_obs.odb
 hofx_sst_obs.nc
 eorca025_t_nemo.nc
 orca2_t_bkg_var.nc
 orca2_t_coords.nc
 orca2_t_nemo.nc
 orca1_t_nemo.nc
-ostia_seaice_obs.nc
+hofx_sic_ostia_obs.nc
 simple_nemo.nc
 create_orca2_t_bkg.nco
 create_orca2_t_bkg_var.nco
 hofx_sst_obs.cdl
 orca2_t_coords.cdl
-ostia_seaice_obs.cdl
-ostia_seaice_obs.csv
+hofx_sic_ostia_obs.csv
 simple_nemo.cdl
 hofx_two_vars_obs.nc
 hofx_potm_obs.nc
@@ -23,7 +22,10 @@ hofx_ssh_obs.nc
 amm1_coords.nc
 amm1_nemo.nc
 amm1_atlas_grid_spec.yaml
-amm_ssh_obs.nc
+amm1r_nemo.nc
+amm1r_atlas_grid_spec.yaml
+hofx_potm_amm1r_obs.nc
+hofx_ssh_amm_obs.nc
 )
 
 foreach(FILENAME ${orcajedi_test_data})

diff --git a/src/tests/Data/amm1_atlas_grid_spec.yaml b/src/tests/Data/amm1_atlas_grid_spec.yaml
@@ -1,3 +1,5 @@
+# (C) British Crown Copyright 2024 Met Office
+
 type : "regional"
 nx : 15
 ny : 19

diff --git a/src/tests/Data/amm1r_atlas_grid_spec.yaml b/src/tests/Data/amm1r_atlas_grid_spec.yaml
@@ -0,0 +1,21 @@
+# (C) British Crown Copyright 2024 Met Office
+
+type : "regional"
+nx : 15
+ny : 13
+north : 10.9
+south : -7.29
+west  : 8.79
+east  : -10.9
+y_numbering : +1
+
+projection :
+  type: "rotated_lonlat"
+  north_pole : [177, 37.5]
+
+check:
+   size: 195
+   lonlat(first)     : [9.262,44.463]
+   lonlat(last)      : [-26.022,61.654]
+   uid: 35244078cc9483703ac9be75be0314e4
+   bounding_box(n,w,s,e) : [63.401, -26.023, 44.066, 333.977]
diff --git a/src/tests/Data/amm1r_coords.nc b/src/tests/Data/amm1r_coords.nc
diff --git a/src/tests/Data/amm1r_nemo.nc b/src/tests/Data/amm1r_nemo.nc
diff --git a/src/tests/Data/hofx_potm_amm1r_obs.nc b/src/tests/Data/hofx_potm_amm1r_obs.nc
diff --git a/src/tests/Data/ostia_seaice_obs.csv → src/tests/Data/hofx_sic_ostia_obs.csv b/src/tests/Data/ostia_seaice_obs.csv → src/tests/Data/hofx_sic_ostia_obs.csv
diff --git a/src/tests/Data/ostia_seaice_obs.nc → src/tests/Data/hofx_sic_ostia_obs.nc b/src/tests/Data/ostia_seaice_obs.nc → src/tests/Data/hofx_sic_ostia_obs.nc
diff --git a/src/tests/Data/ostia_seaice_obs.odb → src/tests/Data/hofx_sic_ostia_obs.odb b/src/tests/Data/ostia_seaice_obs.odb → src/tests/Data/hofx_sic_ostia_obs.odb
diff --git a/src/tests/Data/amm_ssh_obs.nc → src/tests/Data/hofx_ssh_amm_obs.nc b/src/tests/Data/amm_ssh_obs.nc → src/tests/Data/hofx_ssh_amm_obs.nc
diff --git a/src/tests/Data/ostia_seaice_obs.cdl b/src/tests/Data/ostia_seaice_obs.cdl
diff --git a/src/tests/orca-jedi/test_increment.cc b/src/tests/orca-jedi/test_increment.cc
@@ -185,7 +185,8 @@ CASE("test increment") {
     increment1 *=2;
     atlas::FieldSet incfset = atlas::FieldSet();
     increment1.Increment::toFieldSet(incfset);
-    writeFieldsToFile("../testoutput/orca2_t_inc_fs_output.nc", geometry, datetime, incfset);
+    writeFieldsToFile("../testoutput/orca2_t_increment_fieldset_output.nc",
+        geometry, datetime, incfset);
   }
 }