more PR clean-up

Author: alicebarthel

components/omega/doc/userGuide/TendencyTerms.md

@@ -18,7 +18,7 @@ tendency terms are currently implemented:
 | TracerHighOrderHorzAdvOnCell | second order horizontal advection of thickness-weighted tracers
 | TracerDiffOnCell | horizontal diffusion of thickness-weighted tracers
 | TracerHyperDiffOnCell | biharmonic horizontal mixing of thickness-weighted tracers
-| SfcStressForcingOnEdge | forcing by wind stress, defined on edges
+| SfcStressForcingOnEdge | forcing by surface stress (e.g. wind), defined on edges
 | BottomDragOnEdge | bottom drag, defined on edges
 | SurfaceTracerRestoringOnCell | surface tracer restoring, defined on cells
 

components/omega/test/ocn/AuxiliaryVarsTest.cpp

@@ -65,9 +65,6 @@ struct TestSetupPlane {
    ErrorMeasures ExpectedDel2TracerErrors = {0.0033346711042859123,
                                              0.0029202923731303323};
 
-   ErrorMeasures ExpectedNormalStressErrors = {0.0033910709836867704,
-                                               0.0039954090464502795};
-
    KOKKOS_FUNCTION Real pseudoThickness(Real X, Real Y) const {
       return 2 + std::cos(TwoPi * X / Lx) * std::cos(TwoPi * Y / Ly);
    }
@@ -80,14 +77,6 @@ struct TestSetupPlane {
       return std::cos(TwoPi * X / Lx) * std::sin(TwoPi * Y / Ly);
    }
 
-   KOKKOS_FUNCTION Real sfcStressX(Real X, Real Y) const {
-      return std::cos(TwoPi * X / Lx) * std::sin(TwoPi * Y / Ly);
-   }
-
-   KOKKOS_FUNCTION Real sfcStressY(Real X, Real Y) const {
-      return std::sin(TwoPi * X / Lx) * std::cos(TwoPi * Y / Ly);
-   }
-
    KOKKOS_FUNCTION Real divergence(Real X, Real Y) const {
       return TwoPi * (1. / Lx + 1. / Ly) * std::cos(TwoPi * X / Lx) *
              std::cos(TwoPi * Y / Ly);
@@ -193,9 +182,6 @@ struct TestSetupSphere {
    ErrorMeasures ExpectedDel2TracerErrors = {0.0081206665417422382,
                                              0.004969575978774801};
 
-   ErrorMeasures ExpectedNormalStressErrors = {0.0038588958862868362,
-                                               0.003813760171030077};
-
    KOKKOS_FUNCTION Real pseudoThickness(Real Lon, Real Lat) const {
       return (2 + std::cos(Lon) * std::pow(std::cos(Lat), 4));
    }
@@ -208,14 +194,6 @@ struct TestSetupSphere {
       return -4 * std::sin(Lon) * std::cos(Lon) * std::pow(std::cos(Lat), 3) *
              std::sin(Lat);
    }
-   KOKKOS_FUNCTION Real sfcStressX(Real Lon, Real Lat) const {
-      return -4 * std::sin(Lon) * std::cos(Lon) * std::pow(std::cos(Lat), 3) *
-             std::sin(Lat);
-   }
-
-   KOKKOS_FUNCTION Real sfcStressY(Real Lon, Real Lat) const {
-      return -std::pow(std::sin(Lon), 2) * std::pow(std::cos(Lat), 3);
-   }
 
    KOKKOS_FUNCTION Real relativeVorticity(Real Lon, Real Lat) const {
       return -4 * std::pow(std::cos(Lon), 2) * std::pow(std::cos(Lat), 2) *