Merge pull request #5299 from bobmyhill/where

"where not" -> "were not"

contrib/world_builder/CHANGELOG.md

@@ -61,7 +61,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Fixed 
 - Using slabs and faults beyond the -180 to 180 range gave issues. These are now fixed and it now works and is tested for the -380 to 380 range. \[Menno Fraters; 2021-10-22; [#338](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/338), [#340](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/340) and [#342](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/342)\]
-- The ridge coordinates for the mass conservative slab temperature model where not converted to radians internally. \[Menno Fraters; 2021-10-27; [#352](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/352)\]
+- The ridge coordinates for the mass conservative slab temperature model were not converted to radians internally. \[Menno Fraters; 2021-10-27; [#352](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/352)\]
 - Fixed the taper of temperature at the slab tip for the bottom part of the slab, and fixed issue with negative temperatures above slab when there is an existing overririding plate temperature. \[Magali Billen; 2021-11-02; [#353](https:https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/353)
 - The input dip point defined for subduction plate and fault models is now in degrees (as opposed radians) consistent with the system for coordinates. \[Arushi Saxena; 2022-10-07; [#448](github.com/GeodynamicWorldBuilder/WorldBuilder/pull/448)\]
 

doc/modules/to-2.4.0.h

@@ -234,7 +234,7 @@
  * (Juliane Dannberg, 2022/01/28)
  *
  * <li> Fixed: The compressible terms for the DC Stokes and Newton solvers
- * where not correctly assembled. This is fixed now, and tests comparing
+ * were not correctly assembled. This is fixed now, and tests comparing
  * the Stokes and DC Stokes solver have been added.
  * <br>
  * (Menno Fraters, 2022/01/26)

tests/drucker_prager_derivatives_2d.cc

@@ -217,7 +217,7 @@ void f(const aspect::SimulatorAccess<dim> &simulator_access,
 
   if (Error)
     {
-      std::cout << "Some parts of the test where not successful." << std::endl;
+      std::cout << "Some parts of the test were not successful." << std::endl;
     }
   else
     {

tests/drucker_prager_derivatives_2d/screen-output

@@ -28,7 +28,7 @@ strain-rate: point = 2, component = 2, Finite difference = -2.49047e+31, Analyti
 strain-rate: point = 3, component = 2, Finite difference = -9.86089e+36, Analytical derivative = -9.99827e+36
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 strain-rate: point = 4, component = 2, Finite difference = -2.26757e+33, Analytical derivative = -2.26757e+33
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 Number of active cells: 100 (on 1 levels)
 Number of degrees of freedom: 1,444 (882+121+441)
 

tests/drucker_prager_derivatives_3d.cc

@@ -232,7 +232,7 @@ void f(const aspect::SimulatorAccess<dim> &simulator_access,
 
   if (Error)
     {
-      std::cout << "Some parts of the test where not successful." << std::endl;
+      std::cout << "Some parts of the test were not successful." << std::endl;
     }
   else
     {

tests/drucker_prager_derivatives_3d/screen-output

@@ -46,7 +46,7 @@ strain-rate: point = 2, component = 5, Finite difference = -4.75773e+30, Analyti
 strain-rate: point = 3, component = 5, Finite difference = -6.0261e+36, Analytical derivative = -5.83232e+36
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 strain-rate: point = 4, component = 5, Finite difference = -4.50101e+32, Analytical derivative = -4.50101e+32
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 Number of active cells: 100 (on 1 levels)
 Number of degrees of freedom: 5,534 (3,969+242+1,323)
 

tests/simple_nonlinear.cc

@@ -215,7 +215,7 @@ int f(double parameter)
 
   if (Error)
     {
-      std::cout << "Some parts of the test where not successful." << std::endl;
+      std::cout << "Some parts of the test were not successful." << std::endl;
     }
   else
     {

tests/simple_nonlinear/screen-output

@@ -19,7 +19,7 @@ strain-rate: component = 2, point = 1, Finite difference = 5.16403e+29, Analytic
 strain-rate: component = 2, point = 2, Finite difference = -2.09143e+29, Analytical derivative = -2.09143e+29
 strain-rate: component = 2, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 2, point = 4, Finite difference = -4.52403e+29, Analytical derivative = -4.52403e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -2 with dimension 2
 strain-rate: component = 0, point = 0, Finite difference = 3.4588e+30, Analytical derivative = 3.4588e+30
@@ -39,7 +39,7 @@ strain-rate: component = 2, point = 1, Finite difference = 8.43757e+29, Analytic
 strain-rate: component = 2, point = 2, Finite difference = -3.04888e+29, Analytical derivative = -3.04888e+29
 strain-rate: component = 2, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 2, point = 4, Finite difference = -4.52403e+29, Analytical derivative = -4.52403e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -1.5 with dimension 2
 strain-rate: component = 0, point = 0, Finite difference = 3.4588e+30, Analytical derivative = 3.4588e+30
@@ -59,7 +59,7 @@ strain-rate: component = 2, point = 1, Finite difference = 8.69267e+29, Analytic
 strain-rate: component = 2, point = 2, Finite difference = -3.22252e+29, Analytical derivative = -3.22252e+29
 strain-rate: component = 2, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 2, point = 4, Finite difference = -4.52403e+29, Analytical derivative = -4.52403e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -1 with dimension 2
 strain-rate: component = 0, point = 0, Finite difference = 3.4588e+30, Analytical derivative = 3.4588e+30
@@ -79,7 +79,7 @@ strain-rate: component = 2, point = 1, Finite difference = 8.94221e+29, Analytic
 strain-rate: component = 2, point = 2, Finite difference = -3.46459e+29, Analytical derivative = -3.46459e+29
 strain-rate: component = 2, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 2, point = 4, Finite difference = -4.52403e+29, Analytical derivative = -4.52403e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 0 with dimension 2
 strain-rate: component = 0, point = 0, Finite difference = 3.4588e+30, Analytical derivative = 3.4588e+30
@@ -117,7 +117,7 @@ strain-rate: component = 2, point = 1, Finite difference = 9.7694e+29, Analytica
 strain-rate: component = 2, point = 2, Finite difference = -5.35532e+29, Analytical derivative = -5.35532e+29
 strain-rate: component = 2, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 2, point = 4, Finite difference = -4.52403e+29, Analytical derivative = -4.52403e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 2 with dimension 2
 strain-rate: component = 0, point = 0, Finite difference = 3.4588e+30, Analytical derivative = 3.4588e+30
@@ -137,7 +137,7 @@ strain-rate: component = 2, point = 1, Finite difference = 1.00532e+30, Analytic
 strain-rate: component = 2, point = 2, Finite difference = -6.43015e+29, Analytical derivative = -6.43015e+29
 strain-rate: component = 2, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 2, point = 4, Finite difference = -4.52403e+29, Analytical derivative = -4.52403e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 1000 with dimension 2
 strain-rate: component = 0, point = 0, Finite difference = 3.4588e+30, Analytical derivative = 3.4588e+30
@@ -157,7 +157,7 @@ strain-rate: component = 2, point = 1, Finite difference = 1.11256e+30, Analytic
 strain-rate: component = 2, point = 2, Finite difference = -9.70755e+29, Analytical derivative = -9.70755e+29
 strain-rate: component = 2, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 2, point = 4, Finite difference = -4.52403e+29, Analytical derivative = -4.52403e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -1000 with dimension 3
 strain-rate: component = 0, point = 0, Finite difference = 2.91193e+30, Analytical derivative = 2.91193e+30
@@ -193,7 +193,7 @@ strain-rate: component = 5, point = 1, Finite difference = 1.24957e+29, Analytic
 strain-rate: component = 5, point = 2, Finite difference = -4.84454e+28, Analytical derivative = -4.84454e+28
 strain-rate: component = 5, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 5, point = 4, Finite difference = -1.0456e+29, Analytical derivative = -1.0456e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -2 with dimension 3
 strain-rate: component = 0, point = 0, Finite difference = 2.91193e+30, Analytical derivative = 2.91193e+30
@@ -229,7 +229,7 @@ strain-rate: component = 5, point = 1, Finite difference = 2.04169e+29, Analytic
 strain-rate: component = 5, point = 2, Finite difference = -7.06235e+28, Analytical derivative = -7.06235e+28
 strain-rate: component = 5, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 5, point = 4, Finite difference = -1.0456e+29, Analytical derivative = -1.0456e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -1.5 with dimension 3
 strain-rate: component = 0, point = 0, Finite difference = 2.91193e+30, Analytical derivative = 2.91193e+30
@@ -265,7 +265,7 @@ strain-rate: component = 5, point = 1, Finite difference = 2.10342e+29, Analytic
 strain-rate: component = 5, point = 2, Finite difference = -7.46457e+28, Analytical derivative = -7.46457e+28
 strain-rate: component = 5, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 5, point = 4, Finite difference = -1.0456e+29, Analytical derivative = -1.0456e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -1 with dimension 3
 strain-rate: component = 0, point = 0, Finite difference = 2.91193e+30, Analytical derivative = 2.91193e+30
@@ -301,7 +301,7 @@ strain-rate: component = 5, point = 1, Finite difference = 2.1638e+29, Analytica
 strain-rate: component = 5, point = 2, Finite difference = -8.02531e+28, Analytical derivative = -8.02531e+28
 strain-rate: component = 5, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 5, point = 4, Finite difference = -1.0456e+29, Analytical derivative = -1.0456e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 0 with dimension 3
 strain-rate: component = 0, point = 0, Finite difference = 2.91193e+30, Analytical derivative = 2.91193e+30
@@ -370,7 +370,7 @@ strain-rate: component = 5, point = 1, Finite difference = 2.36396e+29, Analytic
 strain-rate: component = 5, point = 2, Finite difference = -1.24049e+29, Analytical derivative = -1.24049e+29
 strain-rate: component = 5, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 5, point = 4, Finite difference = -1.0456e+29, Analytical derivative = -1.0456e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 2 with dimension 3
 strain-rate: component = 0, point = 0, Finite difference = 2.91193e+30, Analytical derivative = 2.91193e+30
@@ -406,7 +406,7 @@ strain-rate: component = 5, point = 1, Finite difference = 2.43264e+29, Analytic
 strain-rate: component = 5, point = 2, Finite difference = -1.48947e+29, Analytical derivative = -1.48947e+29
 strain-rate: component = 5, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 5, point = 4, Finite difference = -1.0456e+29, Analytical derivative = -1.0456e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 1000 with dimension 3
 strain-rate: component = 0, point = 0, Finite difference = 2.91193e+30, Analytical derivative = 2.91193e+30
@@ -442,4 +442,4 @@ strain-rate: component = 5, point = 1, Finite difference = 2.69212e+29, Analytic
 strain-rate: component = 5, point = 2, Finite difference = -2.24864e+29, Analytical derivative = -2.24864e+29
 strain-rate: component = 5, point = 3, Finite difference = 0, Analytical derivative = 0
 strain-rate: component = 5, point = 4, Finite difference = -1.0456e+29, Analytical derivative = -1.0456e+29
-Some parts of the test where not successful.
+Some parts of the test were not successful.

tests/spiegelman_material.cc

@@ -276,7 +276,7 @@ int f(double parameter)
 
   if (Error)
     {
-      std::cout << "Some parts of the test where not successful." << std::endl;
+      std::cout << "Some parts of the test were not successful." << std::endl;
     }
   else
     {

tests/spiegelman_material/screen-output

@@ -26,7 +26,7 @@ oneone on quadrature point 2: Finite difference = -2.26873e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -2
 pressure on quadrature point 0: Finite difference = 3.45536e+10. Analytical derivative = 3.45536e+10
@@ -53,7 +53,7 @@ oneone on quadrature point 2: Finite difference = -2.26866e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -1.5
 pressure on quadrature point 0: Finite difference = 3.45536e+10. Analytical derivative = 3.45536e+10
@@ -80,7 +80,7 @@ oneone on quadrature point 2: Finite difference = -2.26873e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = -1
 pressure on quadrature point 0: Finite difference = 3.45536e+10. Analytical derivative = 3.45536e+10
@@ -107,7 +107,7 @@ oneone on quadrature point 2: Finite difference = -2.26879e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 0
 pressure on quadrature point 0: Finite difference = 3.45536e+10. Analytical derivative = 3.45536e+10
@@ -136,7 +136,7 @@ oneone on quadrature point 2: Finite difference = -2.27338e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 1
 pressure on quadrature point 0: Finite difference = 3.45536e+10. Analytical derivative = 3.45536e+10
@@ -163,7 +163,7 @@ oneone on quadrature point 2: Finite difference = -2.26873e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 2
 pressure on quadrature point 0: Finite difference = 3.45536e+10. Analytical derivative = 3.45536e+10
@@ -190,7 +190,7 @@ oneone on quadrature point 2: Finite difference = -2.26873e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Test for p = 1000
 pressure on quadrature point 0: Finite difference = 3.45536e+10. Analytical derivative = 3.45536e+10
@@ -217,4 +217,4 @@ oneone on quadrature point 2: Finite difference = -2.26873e+29. Analytical deriv
 oneone on quadrature point 3: Finite difference = 0. Analytical derivative = -7.06495e+32
    Error: The derivative of the viscosity to the strain rate is too different from the analytical value.
 oneone on quadrature point 4: Finite difference = 0. Analytical derivative = 0
-Some parts of the test where not successful.
+Some parts of the test were not successful.

tests/visco_plastic_derivatives_2d.cc

@@ -227,7 +227,7 @@ void f(const aspect::SimulatorAccess<dim> &simulator_access,
 
   if (Error)
     {
-      std::cout << "Some parts of the test where not successful." << std::endl;
+      std::cout << "Some parts of the test were not successful." << std::endl;
     }
   else
     {

tests/visco_plastic_derivatives_3d.cc

@@ -242,7 +242,7 @@ void f(const aspect::SimulatorAccess<dim> &simulator_access,
 
   if (Error)
     {
-      std::cout << "Some parts of the test where not successful." << std::endl;
+      std::cout << "Some parts of the test were not successful." << std::endl;
     }
   else
     {

tests/visco_plastic_derivatives_3d/screen-output

@@ -80,7 +80,7 @@ strain-rate: point = 1, component = 5, Finite difference = 4.56937e+27, Analytic
 strain-rate: point = 2, component = 5, Finite difference = -3.20297e+27, Analytical derivative = -3.20297e+27
 strain-rate: point = 3, component = 5, Finite difference = 0, Analytical derivative = 0
 strain-rate: point = 4, component = 5, Finite difference = -1.72133e+32, Analytical derivative = -1.72133e+32
-Some parts of the test where not successful.
+Some parts of the test were not successful.
 
 Testing ViscoPlastic derivatives against analytical derivatives for averaging parameter arithmetic
 pressure: point = 0, Finite difference = 0, Analytical derivative = 0