rebases and adds more constant replacements

Author: katsmith133

components/omega/src/ocn/GlobalConstants.h

@@ -12,15 +12,16 @@
 //===----------------------------------------------------------------------===//
 
 #include "DataTypes.h"
+#include <cmath>
 
 namespace OMEGA {
 
 // Earth constants
-constexpr Real Gravity = 9.80616; // Acceleration due to gravity ~ m/s^2
-constexpr Real Pi      = 3.14159265358979323846; // Pi
-constexpr Real TwoPi   = 2.0 * Pi;               // 2*Pi
-constexpr Real CDay    = 86400.0; // Seconds in a calendar day ~ sec
-constexpr Real SDay    = 86164.0; // Seconds in a sidereal day ~ sec
+constexpr Real Gravity = 9.80616;    // Acceleration due to gravity ~ m/s^2
+constexpr Real Pi      = M_PI;       // Pi
+constexpr Real TwoPi   = 2.0 * M_PI; // 2*Pi
+constexpr Real CDay    = 86400.0;    // Seconds in a calendar day ~ sec
+constexpr Real SDay    = 86164.0;    // Seconds in a sidereal day ~ sec
 constexpr Real Omega =
     2.0 * Pi / SDay;               // Angular velocity of the Earth ~ rad/sec
 constexpr Real REarth = 6.37122e6; // Mean radius of the Earth ~ m

components/omega/src/ocn/VertCoord.cpp

@@ -10,6 +10,7 @@
 #include "VertCoord.h"
 #include "Dimension.h"
 #include "Field.h"
+#include "GlobalConstants.h"
 #include "IO.h"
 #include "IOStream.h"
 #include "OmegaKokkos.h"
@@ -656,8 +657,6 @@ void VertCoord::computePressure(
     const Array1DReal &SurfacePressure // [in] surface pressure
 ) {
 
-   Real Gravity = 9.80616_Real; // gravitationl acceleration
-
    OMEGA_SCOPE(LocRho0, Rho0);
    OMEGA_SCOPE(LocMinLayerCell, MinLayerCell);
    OMEGA_SCOPE(LocMaxLayerCell, MaxLayerCell);
@@ -745,8 +744,6 @@ void VertCoord::computeGeopotential(
     const Array1DReal &SelfAttractionLoading // [in] self attraction and loading
 ) {
 
-   Real Gravity = 9.80616_Real; // gravitationl acceleration
-
    OMEGA_SCOPE(LocMinLayerCell, MinLayerCell);
    OMEGA_SCOPE(LocMaxLayerCell, MaxLayerCell);
    OMEGA_SCOPE(LocGeopotMid, GeopotentialMid);
@@ -784,8 +781,6 @@ void VertCoord::computeGeopotential(
 // reductions and a parallel_for over the active layers within a column.
 void VertCoord::computeTargetThickness() {
 
-   Real Gravity = 9.80616_Real; // gravitationl acceleration
-
    OMEGA_SCOPE(LocRho0, Rho0);
    OMEGA_SCOPE(LocMinLayerCell, MinLayerCell);
    OMEGA_SCOPE(LocMaxLayerCell, MaxLayerCell);

components/omega/test/ocn/AuxiliaryStateTest.cpp

@@ -4,6 +4,7 @@
 #include "Decomp.h"
 #include "Dimension.h"
 #include "Field.h"
+#include "GlobalConstants.h"
 #include "Halo.h"
 #include "HorzMesh.h"
 #include "IO.h"
@@ -23,7 +24,7 @@
 using namespace OMEGA;
 
 struct TestSetup {
-   Real Radius = 6371220;
+   Real Radius = REarth;
 
    KOKKOS_FUNCTION Real layerThickness(Real Lon, Real Lat) const {
       return (2 + std::cos(Lon) * std::pow(std::cos(Lat), 4));

components/omega/test/ocn/AuxiliaryVarsTest.cpp

@@ -3,6 +3,7 @@
 #include "Decomp.h"
 #include "Dimension.h"
 #include "Field.h"
+#include "GlobalConstants.h"
 #include "Halo.h"
 #include "HorzMesh.h"
 #include "IO.h"
@@ -26,7 +27,6 @@
 using namespace OMEGA;
 
 struct TestSetupPlane {
-   Real Pi = M_PI;
 
    Real Lx = 1;
    Real Ly = std::sqrt(3) / 2;
@@ -156,7 +156,7 @@ struct TestSetupPlane {
 
 struct TestSetupSphere {
 
-   Real Radius = 6371220;
+   Real Radius = REarth;
 
    ErrorMeasures ExpectedKineticEnergyErrors = {0.0143579382532765844,
                                                 0.00681096618897046764};

components/omega/test/ocn/HorzOperatorsTest.cpp

@@ -3,6 +3,7 @@
 #include "DataTypes.h"
 #include "Decomp.h"
 #include "Dimension.h"
+#include "GlobalConstants.h"
 #include "Halo.h"
 #include "HorzMesh.h"
 #include "IO.h"
@@ -22,7 +23,6 @@ using namespace OMEGA;
 // operator tests together with exact values of operators for computing errors
 // and expected error values
 struct TestSetupPlane {
-   Real Pi = M_PI;
 
    // lengths of periodic planar mesh
    // TODO: get this from the horizontal mesh once it supports periodic planar
@@ -79,7 +79,7 @@ struct TestSetupPlane {
 struct TestSetupSphere1 {
    // radius of spherical mesh
    // TODO: get this from the mesh
-   Real Radius = 6371220;
+   Real Radius = REarth;
 
    ErrorMeasures ExpectedDivErrors         = {0.013659577398978353,
                                               0.00367052484586382743};
@@ -129,7 +129,7 @@ struct TestSetupSphere1 {
 struct TestSetupSphere2 {
    // radius of spherical mesh
    // TODO: get this from the mesh
-   Real Radius = 6371220;
+   Real Radius = REarth;
 
    ErrorMeasures ExpectedDivErrors         = {1.37734693033362766e-10,
                                               0.000484370621558727582};

components/omega/test/ocn/TendenciesTest.cpp

@@ -6,6 +6,7 @@
 #include "Dimension.h"
 #include "Error.h"
 #include "Field.h"
+#include "GlobalConstants.h"
 #include "Halo.h"
 #include "HorzMesh.h"
 #include "IO.h"
@@ -24,7 +25,7 @@
 using namespace OMEGA;
 
 struct TestSetup {
-   Real Radius = 6371220;
+   Real Radius = REarth;
 
    KOKKOS_FUNCTION Real layerThickness(Real Lon, Real Lat) const {
       return (2 + std::cos(Lon) * std::pow(std::cos(Lat), 4));

components/omega/test/ocn/TendencyTermsTest.cpp

@@ -36,7 +36,6 @@
 using namespace OMEGA;
 
 struct TestSetupPlane {
-   Real Pi = M_PI;
 
    Real Lx = 1;
    Real Ly = std::sqrt(3) / 2;
@@ -182,9 +181,7 @@ struct TestSetupPlane {
 struct TestSetupSphere {
    // radius of spherical mesh
    // TODO: get this from the mesh
-   Real Radius = 6371220;
-
-   Real Pi = M_PI;
+   Real Radius = REarth;
 
    ErrorMeasures ExpectedDivErrors         = {0.0136595773989796766,
                                               0.00367052484586384131};

components/omega/test/ocn/VertCoordTest.cpp

@@ -12,6 +12,7 @@
 #include "Decomp.h"
 #include "Dimension.h"
 #include "Error.h"
+#include "GlobalConstants.h"
 #include "Halo.h"
 #include "HorzMesh.h"
 #include "IO.h"
@@ -107,8 +108,7 @@ int main(int argc, char *argv[]) {
 
       /// Initialize layer thickness and surface pressure so that resulting
       /// interface pressure is the number of layers above plus one
-      Real Gravity = 9.80616_Real;
-      Real Rho0    = DefVertCoord->Rho0;
+      Real Rho0 = DefVertCoord->Rho0;
       parallelFor(
           {NCellsAll}, KOKKOS_LAMBDA(int ICell) {
              SurfacePressure(ICell) = 1.0_Real;