Skip to content

Commit

Permalink
Fix format
Browse files Browse the repository at this point in the history
  • Loading branch information
200km committed Jul 20, 2024
1 parent c9f20d4 commit 80cfe1f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/dynamics/orbit/encke_orbit_propagation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class EnckeOrbitPropagation : public Orbit, public math::OrdinaryDifferentialEqu
// reference orbit
math::Vector<3> reference_position_i_m_; //!< Reference orbit position in the inertial frame [m]
math::Vector<3> reference_velocity_i_m_s_; //!< Reference orbit velocity in the inertial frame [m/s]
orbit::KeplerOrbit reference_kepler_orbit; //!< Reference Kepler orbital element
orbit::KeplerOrbit reference_kepler_orbit; //!< Reference Kepler orbital element

// difference orbit
math::Vector<3> difference_position_i_m_; //!< Difference orbit position in the inertial frame [m]
Expand Down
7 changes: 4 additions & 3 deletions src/dynamics/orbit/relative_orbit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

RelativeOrbit::RelativeOrbit(const CelestialInformation* celestial_information, double gravity_constant_m3_s2, double time_step_s,
int reference_spacecraft_id, math::Vector<3> relative_position_lvlh_m, math::Vector<3> relative_velocity_lvlh_m_s,
RelativeOrbitUpdateMethod update_method, orbit::RelativeOrbitModel relative_dynamics_model_type, orbit::StmModel stm_model_type,
RelativeInformation* relative_information)
RelativeOrbitUpdateMethod update_method, orbit::RelativeOrbitModel relative_dynamics_model_type,
orbit::StmModel stm_model_type, RelativeInformation* relative_information)
: Orbit(celestial_information),
math::OrdinaryDifferentialEquation<6>(time_step_s),
gravity_constant_m3_s2_(gravity_constant_m3_s2),
Expand Down Expand Up @@ -80,7 +80,8 @@ void RelativeOrbit::CalculateSystemMatrix(orbit::RelativeOrbitModel relative_dyn
}
}

void RelativeOrbit::CalculateStm(orbit::StmModel stm_model_type, const Orbit* reference_sat_orbit, double gravity_constant_m3_s2, double elapsed_sec) {
void RelativeOrbit::CalculateStm(orbit::StmModel stm_model_type, const Orbit* reference_sat_orbit, double gravity_constant_m3_s2,
double elapsed_sec) {
switch (stm_model_type) {
case orbit::StmModel::kHcw: {
double reference_sat_orbit_radius = reference_sat_orbit->GetPosition_i_m().CalcNorm();
Expand Down
4 changes: 2 additions & 2 deletions src/dynamics/orbit/relative_orbit.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ class RelativeOrbit : public Orbit, public math::OrdinaryDifferentialEquation<6>
math::Vector<3> relative_position_lvlh_m_; //!< Relative position in the LVLH frame
math::Vector<3> relative_velocity_lvlh_m_s_; //!< Relative velocity in the LVLH frame

RelativeOrbitUpdateMethod update_method_; //!< Update method
RelativeOrbitUpdateMethod update_method_; //!< Update method
orbit::RelativeOrbitModel relative_dynamics_model_type_; //!< Relative dynamics model type
orbit::StmModel stm_model_type_; //!< State Transition Matrix model type
RelativeInformation* relative_information_; //!< Relative information
RelativeInformation* relative_information_; //!< Relative information

/**
* @fn InitializeState
Expand Down
4 changes: 2 additions & 2 deletions src/environment/global/gnss_satellites.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ class GnssSatellites : public ILoggable {
size_t reference_interpolation_id_ = 0; //!< Reference epoch ID of the interpolation
EpochTime current_epoch_time_; //!< The last updated time

std::vector<orbit::InterpolationOrbit> orbit_; //!< GNSS satellite orbit with interpolation
std::vector<math::Interpolation> clock_; //!< GNSS satellite clock offset with interpolation
std::vector<orbit::InterpolationOrbit> orbit_; //!< GNSS satellite orbit with interpolation
std::vector<math::Interpolation> clock_; //!< GNSS satellite clock offset with interpolation

// References
const EarthRotation& earth_rotation_; //!< Earth rotation
Expand Down

0 comments on commit 80cfe1f

Please sign in to comment.