improve test filename consistency

Author: twsearle

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

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
@@ -26,7 +25,7 @@ amm1_atlas_grid_spec.yaml
 amm1r_nemo.nc
 amm1r_atlas_grid_spec.yaml
 hofx_potm_amm1r_obs.nc
-amm_ssh_obs.nc
+hofx_ssh_amm_obs.nc
 )
 
 foreach(FILENAME ${orcajedi_test_data})

src/tests/Data/ostia_seaice_obs.csv src/tests/Data/hofx_sic_ostia_obs.csv

@@ -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);
   }
 }
 

src/tests/Data/ostia_seaice_obs.nc src/tests/Data/hofx_sic_ostia_obs.nc

@@ -1,22 +1,22 @@
 # (C) British Crown Copyright 2024 Met Office
 
 list( APPEND orcajedi_test_input
-  ostia_seaice_obs_hofx3d.yaml
-  hofx_odb_ice.yaml
-  hofx_nc_ice.yaml
+  hofx_odb_sic.yaml
+  hofx_nc_sic.yaml
   hofx_nc_sst.yaml
   hofx_nc_ssh.yaml
   hofx_nc_ssh_checkerboard.yaml
   hofx_nc_ssh_eorca025.yaml
   hofx_nc_ssh_amm1.yaml
   hofx_nc_potm_amm1r.yaml
+  hofx3d_nc_sic.yaml 
   hofx3d_nc_sst.yaml
   hofx3d_nc_potm.yaml
   hofx3d_nc_prof_2vars.yaml
   hofx3d_nc_ssh_amm1.yaml
   hofx3d_nc_ssh_amm1r.yaml
-  odb_ice_query.yaml
-  odb_ice_mapping.yaml
+  odb_sic_query.yaml
+  odb_sic_mapping.yaml
   test_name_map.yaml
 )
 

src/tests/Data/ostia_seaice_obs.odb src/tests/Data/hofx_sic_ostia_obs.odb

@@ -32,11 +32,11 @@ observations:
       obsdatain:
         engine:
           type: H5File
-          obsfile: Data/ostia_seaice_obs.nc
+          obsfile: Data/hofx_sic_ostia_obs.nc
       obsdataout:
         engine:
           type: H5File
-          obsfile: testoutput/test_ostia_seaice_obs_hofx3d_jopa.nc
+          obsfile: testoutput/test_hofx3d_nc_sic_jopa_out.nc
       simulated variables: [seaIceFraction]
     get values:
       atlas-interpolator:
@@ -62,4 +62,4 @@ observations:
       prob density bad obs: 1.0
       PGE threshold: 0.5
 test:
-  reference filename: testoutput/test_ostia_seaice_obs_hofx3d.ref
+  reference filename: testoutput/test_hofx3d_nc_sic.ref

src/tests/Data/amm_ssh_obs.nc src/tests/Data/hofx_ssh_amm_obs.nc

@@ -30,7 +30,7 @@ observations:
       obsdatain:
         engine:
           type: H5File
-          obsfile: Data/amm_ssh_obs.nc
+          obsfile: Data/hofx_ssh_amm_obs.nc
       simulated variables: [seaSurfaceHeightAnomaly]
     get values:
       atlas-interpolator:

src/tests/Data/ostia_seaice_obs.cdl

@@ -30,7 +30,7 @@ observations:
       obsdatain:
         engine:
           type: H5File
-          obsfile: Data/amm_ssh_obs.nc
+          obsfile: Data/hofx_ssh_amm_obs.nc
       simulated variables: [seaSurfaceHeightAnomaly]
       obsdataout:
         engine:

src/tests/orca-jedi/test_increment.cc

@@ -46,11 +46,11 @@ observations:
       obsdatain:
         engine:
           type: H5File
-          obsfile: Data/ostia_seaice_obs.nc
+          obsfile: Data/hofx_sic_ostia_obs.nc
       obsdataout:
         engine:
           type: H5File
-          obsfile: testoutput/test_hofx_nc_ice_jopa.nc
+          obsfile: testoutput/test_hofx_nc_sic_jopa.nc
       simulated variables: [seaIceFraction]
     get values:
       time interpolation: linear
@@ -152,4 +152,4 @@ observations:
         flag: BayBgCheckReject
       - name: reject
 test:
-  reference filename: testoutput/test_hofx_nc_ice.ref
+  reference filename: testoutput/test_hofx_nc_sic.ref

src/tests/testinput/CMakeLists.txt

@@ -43,7 +43,7 @@ observations:
       obsdatain:
         engine:
           type: H5File
-          obsfile: Data/amm_ssh_obs.nc
+          obsfile: Data/hofx_ssh_amm_obs.nc
       obsdataout:
         engine:
           type: H5File

src/tests/testinput/ostia_seaice_obs_hofx3d.yaml src/tests/testinput/hofx3d_nc_sic.yaml

@@ -50,9 +50,9 @@ observations:
       obsdatain:
         engine:
           type: ODB
-          obsfile: orca-jedi/src/tests/Data/ostia_seaice_obs.odb
-          mapping file: orca-jedi/src/tests/testinput/odb_ice_mapping.yaml
-          query file: orca-jedi/src/tests/testinput/odb_ice_query.yaml
+          obsfile: orca-jedi/src/tests/Data/hofx_sic_ostia_obs.odb
+          mapping file: orca-jedi/src/tests/testinput/odb_sic_mapping.yaml
+          query file: orca-jedi/src/tests/testinput/odb_sic_query.yaml
       obsdataout:
         engine:
           type: H5File

src/tests/testinput/hofx3d_nc_ssh_amm1.yaml

@@ -1,12 +1,12 @@
 
 list( APPEND orcajedi_test_output
-  test_ostia_seaice_obs_hofx3d.ref
-  test_hofx_nc_ice.ref
+  test_hofx_nc_sic.ref
   test_hofx_nc_sst.ref
   test_hofx_nc_ssh.ref
   test_hofx_nc_ssh_eorca025.ref
   test_hofx_nc_ssh_amm1.ref
   test_hofx_nc_potm_amm1r.ref
+  test_hofx3d_nc_sic.ref
   test_hofx3d_nc_sst.ref
   test_hofx3d_nc_potm.ref
   test_hofx3d_nc_prof_2vars.ref