Add gravity namespace

ut-issl · Jul 20, 2024 · aba36b1 · aba36b1
1 parent f4866fe
commit aba36b1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/src/disturbances/geopotential.cpp b/src/disturbances/geopotential.cpp
@@ -43,7 +43,7 @@ Geopotential::Geopotential(const int degree, const std::string file_path, const
     }
   }
   // Initialize GravityPotential
-  geopotential_ = GravityPotential(degree, c_, s_);
+  geopotential_ = gravity::GravityPotential(degree, c_, s_);
 }
 
 bool Geopotential::ReadCoefficientsEgm96(std::string file_name) {

diff --git a/src/disturbances/geopotential.hpp b/src/disturbances/geopotential.hpp
@@ -60,7 +60,7 @@ class Geopotential : public Disturbance {
   virtual std::string GetLogValue() const;
 
  private:
-  GravityPotential geopotential_;
+  gravity::GravityPotential geopotential_;
   size_t degree_;                       //!< Maximum degree setting to calculate the geo-potential
   std::vector<std::vector<double>> c_;  //!< Cosine coefficients
   std::vector<std::vector<double>> s_;  //!< Sine coefficients

diff --git a/src/disturbances/lunar_gravity_field.cpp b/src/disturbances/lunar_gravity_field.cpp
@@ -46,7 +46,7 @@ LunarGravityField::LunarGravityField(const int degree, const std::string file_pa
     }
   }
   // Initialize GravityPotential
-  lunar_potential_ = GravityPotential(degree, c_, s_, gravity_constants_km3_s2_ * 1e9, reference_radius_km_ * 1e3);
+  lunar_potential_ = gravity::GravityPotential(degree, c_, s_, gravity_constants_km3_s2_ * 1e9, reference_radius_km_ * 1e3);
 }
 
 bool LunarGravityField::ReadCoefficientsGrgm1200a(std::string file_name) {

diff --git a/src/disturbances/lunar_gravity_field.hpp b/src/disturbances/lunar_gravity_field.hpp
@@ -62,7 +62,7 @@ class LunarGravityField : public Disturbance {
   virtual std::string GetLogValue() const;
 
  private:
-  GravityPotential lunar_potential_;
+  gravity::GravityPotential lunar_potential_;
   double reference_radius_km_;
   double gravity_constants_km3_s2_;
   size_t degree_;                       //!< Maximum degree setting to calculate the geo-potential

diff --git a/src/math_physics/gravity/gravity_potential.cpp b/src/math_physics/gravity/gravity_potential.cpp
@@ -10,6 +10,8 @@
 #include <fstream>
 #include <iostream>
 
+namespace gravity {
+
 GravityPotential::GravityPotential(const size_t degree, const std::vector<std::vector<double>> cosine_coefficients,
                                    const std::vector<std::vector<double>> sine_coefficients, const double gravity_constants_m3_s2,
                                    const double center_body_radius_m)
@@ -275,3 +277,5 @@ void GravityPotential::v_w_nm_update(double *v_nm, double *w_nm, const double v_
   *w_nm = c_normalize * (c1 * z_tmp * w_prev - c2 * c2_normalize * re_tmp * w_prev2);
   return;
 }
+
+}  // namespace gravity
diff --git a/src/math_physics/gravity/gravity_potential.hpp b/src/math_physics/gravity/gravity_potential.hpp
@@ -12,6 +12,8 @@
 #include "../math/matrix.hpp"
 #include "../math/vector.hpp"
 
+namespace gravity {
+
 /**
  * @class GravityPotential
  * @brief Class to calculate gravity potential
@@ -83,4 +85,6 @@ class GravityPotential {
   void v_w_nm_update(double *v_nm, double *w_nm, const double v_prev, const double w_prev, const double v_prev2, const double w_prev2);
 };
 
+}  // namespace gravity
+
 #endif  // S2E_LIBRARY_GRAVITY_GRAVITY_POTENTIAL_HPP_
diff --git a/src/math_physics/gravity/test_gravity_potential.cpp b/src/math_physics/gravity/test_gravity_potential.cpp
@@ -6,6 +6,8 @@
 
 #include "gravity_potential.hpp"
 
+using namespace gravity;
+
 /**
  * @brief Test for Acceleration calculation
  */