Align variables

feature/19
Daniel Warner 2018-08-27 11:35:55 +01:00 committed by Daniel Warner
parent a8aa5946d9
commit 7b08f419d2
1 changed files with 37 additions and 15 deletions

View File

@ -171,9 +171,15 @@ void SGP4::Initialise()
{ {
deepspace_consts_.gsto = elements_.Epoch().ToGreenwichSiderealTime(); deepspace_consts_.gsto = elements_.Epoch().ToGreenwichSiderealTime();
DeepSpaceInitialise(eosq, common_consts_.sinio, common_consts_.cosio, betao, DeepSpaceInitialise(eosq,
theta2, betao2, common_consts_.sinio,
common_consts_.xmdot, common_consts_.omgdot, common_consts_.xnodot); common_consts_.cosio,
betao,
theta2,
betao2,
common_consts_.xmdot,
common_consts_.omgdot,
common_consts_.xnodot);
} }
else else
{ {
@ -337,12 +343,20 @@ Eci SGP4::FindPositionSDP4(double tsince) const
/* /*
* using calculated values, find position and velocity * using calculated values, find position and velocity
*/ */
return CalculateFinalPositionVelocity(tsince, e, return CalculateFinalPositionVelocity(tsince,
a, omega, xl, xnode, e,
xincl, perturbed_xlcof, perturbed_aycof, a,
perturbed_x3thm1, perturbed_x1mth2, perturbed_x7thm1, omega,
perturbed_cosio, perturbed_sinio); xl,
xnode,
xincl,
perturbed_xlcof,
perturbed_aycof,
perturbed_x3thm1,
perturbed_x1mth2,
perturbed_x7thm1,
perturbed_cosio,
perturbed_sinio);
} }
Eci SGP4::FindPositionSGP4(double tsince) const Eci SGP4::FindPositionSGP4(double tsince) const
@ -423,12 +437,20 @@ Eci SGP4::FindPositionSGP4(double tsince) const
* using calculated values, find position and velocity * using calculated values, find position and velocity
* we can pass in constants from Initialise() as these dont change * we can pass in constants from Initialise() as these dont change
*/ */
return CalculateFinalPositionVelocity(tsince, e, return CalculateFinalPositionVelocity(tsince,
a, omega, xl, xnode, e,
xincl, common_consts_.xlcof, common_consts_.aycof, a,
common_consts_.x3thm1, common_consts_.x1mth2, common_consts_.x7thm1, omega,
common_consts_.cosio, common_consts_.sinio); xl,
xnode,
xincl,
common_consts_.xlcof,
common_consts_.aycof,
common_consts_.x3thm1,
common_consts_.x1mth2,
common_consts_.x7thm1,
common_consts_.cosio,
common_consts_.sinio);
} }
Eci SGP4::CalculateFinalPositionVelocity( Eci SGP4::CalculateFinalPositionVelocity(