further fixes std -> var

Author: twsearle

examples/hofx_nc_ice_mpi.yaml

@@ -15,7 +15,7 @@ geometry:
     - name: ice_area_fraction_background_error
       nemo field name: seaice_tot_var
       model space: surface
-      variable type: background error standard deviation
+      variable type: background error variance
   grid name: eORCA12_T
   source mesh halo: 0
   number levels: 2

src/tests/orca-jedi/test_geometry.cc

@@ -32,7 +32,7 @@ CASE("test basic geometry") {
   nemo_var_mappings[1].set("name", "sea_ice_area_fraction_error")
     .set("nemo field name", "sic_tot_var")
     .set("model space", "surface")
-    .set("variable type", "background error standard deviation");
+    .set("variable type", "background error variance");
   nemo_var_mappings[2].set("name", "sea_surface_foundation_temperature")
     .set("nemo field name", "votemper")
     .set("model space", "surface");
@@ -52,11 +52,11 @@ CASE("test basic geometry") {
     EXPECT(geometry.variable_in_variable_type("sea_ice_area_fraction",
                                               "background"));
     EXPECT(geometry.variable_in_variable_type("sea_ice_area_fraction_error",
-                                              "background error standard deviation"));
+                                              "background error variance"));
     EXPECT(!geometry.variable_in_variable_type("sea_ice_area_fraction_error",
                                                "background"));
     EXPECT(!geometry.variable_in_variable_type("sea_ice_area_fraction",
-                                               "background error standard deviation"));
+                                               "background error variance"));
   }
 
   SECTION("test geometry variable sizes") {

src/tests/orca-jedi/test_interpolator.cc

@@ -65,7 +65,7 @@ CASE("test  interpolator") {
     nemo_var_mappings[1].set("name", "sea_ice_area_fraction_error")
       .set("nemo field name", "sic_tot_var")
       .set("model space", "surface")
-      .set("variable type", "background error standard deviation");
+      .set("variable type", "background error variance");
     nemo_var_mappings[2].set("name", "sea_surface_foundation_temperature")
       .set("nemo field name", "votemper")
       .set("model space", "surface");

src/tests/orca-jedi/test_state.cc

@@ -39,7 +39,7 @@ CASE("test basic state") {
     .set("field precision", "double")
     .set("nemo field name", "sic_tot_var")
     .set("model space", "surface")
-    .set("variable type", "background error standard deviation");
+    .set("variable type", "background error variance");
   nemo_var_mappings[2].set("name", "sea_surface_foundation_temperature")
     .set("field precision", "double")
     .set("nemo field name", "votemper")

src/tests/testinput/hofx3d_nc_potm.yaml

@@ -11,7 +11,7 @@ geometry :
     - name: sea_water_potential_temperature_background_error
       nemo field name: t_tot_var
       model space: volume
-      variable type: background error standard deviation
+      variable type: background error variance
   grid name: ORCA2_T
   number levels: 3
 state :

src/tests/testinput/hofx3d_nc_prof_2vars.yaml

@@ -18,7 +18,7 @@ geometry :
     - name: salinity_background_error
       nemo field name: t_tot_var
       model space: volume
-      variable type: background error standard deviation
+      variable type: background error variance
   grid name: ORCA2_T
   number levels: 3
 state :

src/tests/testinput/hofx3d_nc_sst.yaml

@@ -15,7 +15,7 @@ geometry :
     - name: sea_surface_temperature_background_error
       nemo field name: t_tot_var
       model space: surface
-      variable type: background error standard deviation
+      variable type: background error variance
   grid name: ORCA2_T
   number levels: 1
 state :