add 'error' to names following review

Author: twsearle

examples/hofx3d_odb_prof_example.yaml

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

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 standard deviation
+      variable type: background error standard deviation
   grid name: eORCA12_T
   source mesh halo: 0
   number levels: 2

src/orca-jedi/geometry/GeometryParameters.h

@@ -26,8 +26,8 @@ class NemoFieldParameters : public oops::Parameters {
   oops::RequiredParameter<std::string> nemoName {"nemo field name", this};
   oops::RequiredParameter<std::string> modelSpace {"model space", this};
   oops::Parameter<std::string> variableType {"variable type",
-    "type of variable (default is 'background' other options are 'background variance' and"
-    "'background standard deviation' both are included for clarity, but both variables are"
+    "type of variable (default is 'background' other options are 'background error variance' and"
+    "'background error standard deviation' both are included for clarity, but both variables are"
     " read from the error file",
     "background",
     this};

src/orca-jedi/state/State.cc

@@ -83,9 +83,9 @@ State::State(const Geometry & geom,
     readFieldsFromFile(nemo_file_name, *geom_, validTime(), "background",
          stateFields_);
     nemo_file_name = params.errorFieldFile.value().value_or("");
-    readFieldsFromFile(nemo_file_name, *geom_, validTime(), "background standard deviation",
+    readFieldsFromFile(nemo_file_name, *geom_, validTime(), "background error standard deviation",
        stateFields_);
-    readFieldsFromFile(nemo_file_name, *geom_, validTime(), "background variance",
+    readFieldsFromFile(nemo_file_name, *geom_, validTime(), "background error variance",
        stateFields_);
   }
   geom_->log_status();

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 standard deviation");
+    .set("variable type", "background error standard deviation");
   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 standard deviation"));
+                                              "background error standard deviation"));
     EXPECT(!geometry.variable_in_variable_type("sea_ice_area_fraction_error",
                                                "background"));
     EXPECT(!geometry.variable_in_variable_type("sea_ice_area_fraction",
-                                               "background standard deviation"));
+                                               "background error standard deviation"));
   }
 
   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 standard deviation");
+      .set("variable type", "background error standard deviation");
     nemo_var_mappings[2].set("name", "sea_surface_foundation_temperature")
       .set("nemo field name", "votemper")
       .set("model space", "surface");

src/tests/orca-jedi/test_interpolator_parallel.cc

@@ -47,7 +47,7 @@ CASE("test serial interpolator") {
   nemo_var_mappings[1].set("name", "sea_surface_height_anomaly_error")
     .set("nemo field name", "ssh_tot_std")
     .set("model space", "surface")
-    .set("variable type", "background standard deviation");
+    .set("variable type", "background error standard deviation");
   nemo_var_mappings[2].set("name", "sea_surface_foundation_temperature")
     .set("nemo field name", "votemper")
     .set("model space", "surface");
@@ -194,7 +194,7 @@ CASE("test checkerboard interpolator") {
   nemo_var_mappings[1].set("name", "sea_surface_height_anomaly_error")
     .set("nemo field name", "ssh_tot_std")
     .set("model space", "surface")
-    .set("variable type", "background standard deviation");
+    .set("variable type", "background error standard deviation");
   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 standard deviation");
+    .set("variable type", "background error standard deviation");
   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 standard deviation
+      variable type: background error standard deviation
   grid name: ORCA2_T
   number levels: 3
 state :

src/tests/testinput/hofx3d_nc_prof_2vars.yaml

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

src/tests/testinput/hofx3d_nc_ssh_amm1.yaml

@@ -11,7 +11,7 @@ geometry :
     - name: sea_surface_height_anomaly_background_error
       nemo field name: sossheig
       model space: surface
-      variable type: background standard deviation
+      variable type: background error standard deviation
   grid name: Data/amm1_atlas_grid_spec.yaml
   number levels: 1
   partitioner: serial

src/tests/testinput/hofx3d_nc_sst.yaml

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

src/tests/testinput/hofx_nc_ice.yaml

@@ -18,7 +18,7 @@ geometry:
     - name: ice_area_fraction_background_error
       nemo field name: sic_tot_var
       model space: surface
-      variable type: background variance
+      variable type: background error variance
   grid name: ORCA2_T
   number levels: 2
 initial condition :

src/tests/testinput/hofx_nc_ssh.yaml

@@ -12,7 +12,7 @@ geometry :
     - name: sea_surface_height_anomaly_background_error
       nemo field name: ssh_tot_std
       model space: surface
-      variable type: background standard deviation
+      variable type: background error standard deviation
   grid name: ORCA2_T
   number levels: 1
   partitioner: serial

src/tests/testinput/hofx_nc_ssh_amm1.yaml

@@ -12,7 +12,7 @@ geometry :
     - name: sea_surface_height_anomaly_background_error
       nemo field name: sossheig
       model space: surface
-      variable type: background standard deviation
+      variable type: background error standard deviation
   grid name: Data/amm1_atlas_grid_spec.yaml
   number levels: 1
   partitioner: serial

src/tests/testinput/hofx_nc_ssh_checkerboard.yaml

@@ -10,7 +10,7 @@ geometry :
     - name: sea_surface_height_anomaly_background_error
       nemo field name: ssh_tot_std
       model space: surface
-      variable type: background standard deviation
+      variable type: background error standard deviation
   grid name: ORCA2_T
   number levels: 1
   partitioner: checkerboard

src/tests/testinput/hofx_nc_ssh_eorca025.yaml

@@ -12,7 +12,7 @@ geometry :
     - name: sea_surface_height_anomaly_background_error
       nemo field name: sossheig
       model space: surface
-      variable type: background standard deviation
+      variable type: background error standard deviation
   grid name: eORCA025_T
   number levels: 1
   partitioner: checkerboard

src/tests/testinput/hofx_nc_sst.yaml

@@ -15,11 +15,11 @@ geometry :
     - name: ice_area_fraction_background_error
       nemo field name: sic_tot_var
       model space: surface
-      variable type: background variance
+      variable type: background error variance
     - name: sea_surface_temperature_background_error
       nemo field name: t_tot_var
       model space: surface
-      variable type: background variance
+      variable type: background error variance
   grid name: ORCA2_T
   number levels: 1
 initial condition :

src/tests/testinput/hofx_odb_ice.yaml

@@ -18,7 +18,7 @@ geometry:
     - name: ice_area_fraction_background_error
       nemo field name: sic_tot_var
       model space: surface
-      variable type: background variance
+      variable type: background error variance
   grid name: ORCA2_T
   number levels: 2
 initial condition :

src/tests/testinput/ostia_seaice_obs_hofx3d.yaml

@@ -14,7 +14,7 @@ geometry :
     - name: ice_area_fraction_background_error
       nemo field name: sic_tot_var
       model space: surface
-      variable type: background variance
+      variable type: background error variance
   grid name: ORCA2_T
   number levels: 10
 state :