Move everything to the CML namespace

models/dynamics/actions/mass_body_detach_impulsive/include/mass_body_detach_impulsive.hh

@@ -29,6 +29,8 @@ class DynManager;
 class MassPoint;
 }
 
+namespace cml {
+
 // Causes the subject body to detach from its parent with a specified impulse.
 class MassBodyDetachImpulsive : public jeod::BodyAction {
   // Member data
@@ -74,4 +76,8 @@ class MassBodyDetachImpulsive : public jeod::BodyAction {
                                 const std::string & mass_point_name);
 };
 
+
+
+} // namespace cml
+
 #endif

models/dynamics/actions/mass_body_detach_impulsive/src/mass_body_detach_impulsive.cc

@@ -28,6 +28,8 @@ Library dependencies:
 
 #include <string>
 
+namespace cml {
+
 /*******************************************************************************
 Function: MassBodyDetachImpulsive::initialize
 Purpose: (Initialize a MassBodyDetach)
@@ -290,4 +292,6 @@ MassBodyDetachImpulsive::apply_impulse( jeod::DynBody     & dyn_body,
   root_body->set_attitude_rate( new_rate,
                                 root_body->composite_body);
   root_body->propagate_state();
-}
+}
+
+} // namespace cml

models/dynamics/integration/accumulated_absolute_deltas/include/accumulated_absolute_deltas.hh

@@ -34,6 +34,8 @@ PROGRAMMERS:
 
 #include "cml/models/utilities/subscriptions/include/subscriptions.hh"
 
+namespace cml {
+
 class AccumulatedAbsoluteDeltas : public SubscriptionBase
 {
  protected:
@@ -58,4 +60,8 @@ class AccumulatedAbsoluteDeltas : public SubscriptionBase
  protected:
   void activate() override;
 };
+
+
+} // namespace cml
+
 #endif

models/dynamics/integration/accumulated_absolute_deltas/src/accumulated_absolute_deltas.cc

@@ -18,6 +18,8 @@ LIBRARY DEPENDENCIES:
 #include "cml/models/utilities/cml_message/include/cml_message.hh"
 #include "cml/models/utilities/subscriptions/include/subscriptions.hh"
 
+namespace cml {
+
 /*****************************************************************************
 Constructor
 *****************************************************************************/
@@ -110,4 +112,6 @@ AccumulatedAbsoluteDeltas::update()
     accumulated_deltas[ii] += std::abs( variable[ii] - old_variable[ii]);
     old_variable[ii] = variable[ii];
   }
-}
+}
+
+} // namespace cml

models/dynamics/integration/scalar_integrable_object/include/scalar_integrable_object.hh

@@ -12,6 +12,8 @@ Library Dependency:
 #include "jeod/models/utils/integration/include/restartable_state_integrator.hh"
 #include "er7_utils/integration/core/include/integrable_object.hh"
 
+namespace cml {
+
 // These objects will automatically update the value of the variable you
 // connect it to.
 
@@ -48,4 +50,8 @@ private:
   double &value;      /* (--) Input value to be integrated. */
   double &derivative; /* (--) Time derivative of the value to be integrated. */
 };
+
+
+} // namespace cml
+
 #endif

models/dynamics/integration/scalar_integrable_object/src/scalar_integrable_object.cc

@@ -12,6 +12,8 @@
 #include "er7_utils/integration/core/include/integrator_constructor.hh"
 #include "er7_utils/integration/core/include/integrator_result.hh"
 
+namespace cml {
+
 /*******************************************************************************
 Constructor
 *******************************************************************************/
@@ -74,3 +76,6 @@ er7_utils::IntegratorResult ScalarIntegrableObject::integrate(
 {
   return integrator.integrate(dyn_dt, target_stage, &derivative, &value);
 }
+
+
+} // namespace cml

models/dynamics/integration/vector3_integrable_object/include/restartable_vector3_1st_order_integrator.hh

@@ -20,6 +20,8 @@ PROGRAMMERS:
 #include "jeod/models/utils/memory/include/jeod_alloc.hh"
 #include "jeod/models/utils/integration/include/restartable_state_integrator_templates.hh"
 
+namespace cml {
+
 
 class RestartableVector3FirstOrderODEIntegrator : public jeod::SimpleCheckpointable {
   public:
@@ -138,4 +140,8 @@ Purpose:(Restore the integrator on restart.)
     */
     jeod::RestartableFirstOrderODEIntegrator<3> integrator_manager; //!< trick_io(**)
 };
+
+
+} // namespace cml
+
 #endif

models/dynamics/integration/vector3_integrable_object/include/vector3_integrable_object.hh

@@ -22,6 +22,8 @@ PROGRAMMERS:
 
 #include "restartable_vector3_1st_order_integrator.hh"
 
+namespace cml {
+
 
 class Vector3IntegrableObject : public SubscriptionBase,
                                 public er7_utils::IntegrableObject
@@ -76,4 +78,8 @@ class Vector3IntegrableObject : public SubscriptionBase,
     RestartableVector3FirstOrderODEIntegrator integrator; //!< trick_units(--)
 #endif
 };
+
+
+} // namespace cml
+
 #endif

models/dynamics/integration/vector3_integrable_object/src/vector3_integrable_object.cc

@@ -33,6 +33,8 @@ LIBRARY DEPENDENCIES:
 
 #include "../include/vector3_integrable_object.hh"
 
+namespace cml {
+
 
 /*****************************************************************************
 empty
@@ -282,3 +284,6 @@ Vector3IntegrableObject::integrate (
 {
   return integrator.integrate (dyn_dt, target_stage, deriv_ptr, variable);
 }
+
+
+} // namespace cml

models/dynamics/mass/dynamic_mass/include/dynamic_mass_body.hh

@@ -46,6 +46,8 @@ PROGRAMMERS:
 #include "dynamic_mass_body_properties.hh"
 #include "dynamic_mass_body_nominal_properties.hh"
 
+namespace cml {
+
 // Inherit directly from JEOD Mass Body
 class DynamicMassBody : public jeod::MassBody
 {
@@ -98,4 +100,8 @@ class DynamicMassBody : public jeod::MassBody
 };
 
 
+
+
+} // namespace cml
+
 #endif

models/dynamics/mass/dynamic_mass/include/dynamic_mass_body_interpolation.hh

@@ -46,6 +46,8 @@ PROGRAMMERS:
 #include "jeod/models/dynamics/mass/include/mass_properties.hh"
 #include "cml/models/utilities/table_interp_cpp/include/table_lookup_set.hh"
 
+namespace cml {
+
 
 class DynamicMassBodyInterpolation {
 public:
@@ -186,4 +188,8 @@ private:
         flag to indicate whether method initialize() has been called. */
 };
 
+
+
+} // namespace cml
+
 #endif

models/dynamics/mass/dynamic_mass/include/dynamic_mass_body_nominal_properties.hh

@@ -44,6 +44,8 @@ PROGRAMMERS:
 
 #include "jeod/models/dynamics/mass/include/mass_properties.hh"
 
+namespace cml {
+
 // NOTE - this class does not inherit from jeod::MassProperties because of the
 // extraneous capabilities that jeod::MassPoint (parent to jeod::MassProperties)
 // provides that this class will never need.  A cleaner interface is to just
@@ -67,4 +69,8 @@ public:
 };
 
 
+
+
+} // namespace cml
+
 #endif

models/dynamics/mass/dynamic_mass/include/dynamic_mass_body_properties.hh

@@ -43,6 +43,8 @@ PROGRAMMERS:
 
 #include "dynamic_mass_body_interpolation.hh"
 
+namespace cml {
+
 /*****************************************************************************
 DynamicMassBodyPropertiesInterface
 Purpose:( This is the typical interface that external models will use to 
@@ -106,4 +108,8 @@ public:
    void disperse_mass_properties();
 };
 
+
+
+} // namespace cml
+
 #endif

models/dynamics/mass/dynamic_mass/include/dynamic_mass_group.hh

@@ -57,6 +57,8 @@ namespace jeod {
 class MassBody;
 }
 
+namespace cml {
+
 class DynamicMassGroup : public SubscriptionBase {
  public:
   // Inputs:
@@ -133,4 +135,8 @@ class DynamicMassGroup : public SubscriptionBase {
   void add_mass_to_group_internal( DynamicMassBody *mass,
                                    bool send_err_msg);
 };
+
+
+} // namespace cml
+
 #endif

models/dynamics/mass/dynamic_mass/include/dynamic_mass_string.hh

@@ -30,6 +30,8 @@ PROGRAMMERS:
 #include <list>
 #include <cstddef>
 
+namespace cml {
+
 class DynamicMassString  : public DynamicMassBodyPropertiesInterface
 {
 public:
@@ -82,4 +84,8 @@ public:
 
    void set_string_in_group() {string_in_group = true;}
 };
+
+
+} // namespace cml
+
 #endif

models/dynamics/mass/dynamic_mass/src/dynamic_mass_body.cc

@@ -37,6 +37,8 @@
 #include "../include/dynamic_mass_body_properties.hh"
 #include "../include/dynamic_mass_body_interpolation.hh"
 
+namespace cml {
+
 /********************************************************************************
 Method: DynamicMassBody
 Purpose: (Constructor)
@@ -393,4 +395,6 @@ DynamicMassBody::revert_dry_mass_config()
   dynamic_properties.consumable_mass = dry_mass_revert__consumable_mass;
   dry_mass_revert__available = false;
   update_mass_internal();
-}
+}
+
+} // namespace cml

models/dynamics/mass/dynamic_mass/src/dynamic_mass_body_interpolation.cc

@@ -22,6 +22,8 @@ LIBRARY DEPENDENCIES:
 
 #include "../include/dynamic_mass_body_interpolation.hh"
 
+namespace cml {
+
 /********************************************************************************
 Method: Constructor
 ********************************************************************************/
@@ -411,4 +413,6 @@ DynamicMassBodyInterpolation::warn_no_interp(const char* const table_name)
      "Remember to switch the flag to true to use these data.\n"
      "Data remain available for use, but the interpolation will not execute\n"
      "until the control flag is set to true.\n");
-}
+}
+
+} // namespace cml

models/dynamics/mass/dynamic_mass/src/dynamic_mass_body_properties.cc

@@ -19,6 +19,8 @@
 #include "../include/dynamic_mass_body_nominal_properties.hh"
 #include <cstddef>
 
+namespace cml {
+
 
 /*****************************************************************************
 Constructors
@@ -85,4 +87,6 @@ DynamicMassBodyProperties::disperse_mass_properties ()
       interpolation.poi_dep_yz.bias_data(poi_bias[2], kk);
     }
   }
-}
+}
+
+} // namespace cml

models/dynamics/mass/dynamic_mass/src/dynamic_mass_group.cc

@@ -23,6 +23,8 @@ LIBRARY DEPENDENCIES:
 #include "../include/dynamic_mass_group.hh"
 #include "../include/dynamic_mass_string.hh"
 
+namespace cml {
+
 /*******************************************************************************
 Method: DynamicMassGroup
 Purpose: (Constructor)
@@ -518,4 +520,6 @@ DynamicMassGroup::add_mass_to_group_internal(
       mass->initialize_dyn_mass();
     }
   }
-}
+}
+
+} // namespace cml

models/dynamics/mass/dynamic_mass/src/dynamic_mass_string.cc

@@ -30,6 +30,8 @@
 #include <algorithm>
 #include <numeric>
 
+namespace cml {
+
 /*****************************************************************************
 initialize
 Purpose:(Copies the body_collection to available_bodies)
@@ -215,4 +217,6 @@ DynamicMassString::update()
   };
   consumable_mass = std::accumulate(available_bodies.begin(), available_bodies.end(), 0.0, add_consumable_mass);
   mass_consumed += mass_consumed_step;
-}
+}
+
+} // namespace cml

models/dynamics/mass/mass_body_dispersed_init/include/mass_body_composite_dispersions.hh

@@ -39,6 +39,8 @@ namespace jeod {
 class DynManager;
 }
 
+namespace cml {
+
 /*******************************************************************************
 MassBodyCompositeDispersions
 PURPOSE:(Manages dispersions to be applied to the composite-properties.
@@ -114,4 +116,8 @@ private:
   void comp_to_core_updates();
   void process_dispersions();
 };
-#endif
+
+
+} // namespace cml
+
+#endif