Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit dd4f15c

Browse files
DominicDirkxDominicDirkx
committed
Removed deprecated enum entries
1 parent 2504f60 commit dd4f15c

File tree

51 files changed

+208
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+208
-210
lines changed

‎examples/tudat/satellite_propagation/new/SingleSatelliteThrust.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class SingleSatelliteThrust {
8585
// Define point mass gravity accelerations of system bodies.
8686
for (auto body : spice_bodies) {
8787
this->_base_accelerations_vehicle[body].push_back(
88-
std::make_shared<AccelerationSettings>(central_gravity));
88+
std::make_shared<AccelerationSettings>(point_mass_gravity));
8989
}
9090

9191

‎include/tudat/astro/basic_astro/accelerationModelTypes.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,11 @@ enum AvailableAcceleration
4646
{
4747
undefined_acceleration,
4848
point_mass_gravity,
49-
central_gravity = point_mass_gravity, // deprecated
5049
aerodynamic,
5150
cannon_ball_radiation_pressure,
5251
spherical_harmonic_gravity,
5352
mutual_spherical_harmonic_gravity,
5453
third_body_point_mass_gravity,
55-
third_body_central_gravity = third_body_point_mass_gravity, // deprecated
5654
third_body_spherical_harmonic_gravity,
5755
third_body_mutual_spherical_harmonic_gravity,
5856
thrust_acceleration,
@@ -139,7 +137,7 @@ bool isAccelerationFromThirdBody( const AvailableAcceleration accelerationType )
139137
// Function to get the third-body counterpart of a direct gravitational acceleration type
140138
/*
141139
* Function to get the third-body counterpart of a direct gravitational acceleration type, e.g. a third_body_central_gravity
142-
* for a central_gravity input. Function throws an exception is input is not direct gravitational
140+
* for a point_mass_gravity input. Function throws an exception is input is not direct gravitational
143141
* \param accelerationType Acceleration type for which the third-body counterpart is to be determined.
144142
* \return Third-body counterpart of accelerationType.
145143
*/

‎include/tudat/astro/orbit_determination/acceleration_partials/thirdBodyGravityPartial.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ basic_astrodynamics::AvailableAcceleration getAccelerationTypeOfThirdBodyGravity
4444
// Check type of direct partial derivative.
4545
if( std::dynamic_pointer_cast< CentralGravitationPartial >( directGravityPartial ) != nullptr )
4646
{
47-
accelerationType = third_body_central_gravity;
47+
accelerationType = third_body_point_mass_gravity;
4848
}
4949
else if( std::dynamic_pointer_cast< SphericalHarmonicsGravityPartial >( directGravityPartial ) != nullptr )
5050
{

‎include/tudat/interface/json/propagation/acceleration.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace basic_astrodynamics
2525
/*!
2626
* Map of `AvailableAcceleration`s string representations.
2727
*
28-
* There is a naming inconsistency between "pointMassGravity" and `central_gravity`,
28+
* There is a naming inconsistency between "pointMassGravity" and `point_mass_gravity`,
2929
* and between "thirdBodyPointMassGravity" and `third_body_central_gravity`.
3030
*
3131
* The values "thirdBodyPointMassGravity", "thirdBodySphericalHarmonicGravity" and

‎include/tudat/simulation/estimation_setup/createAccelerationPartials.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ std::shared_ptr< acceleration_partials::AccelerationPartial > createAnalyticalAc
8383
AvailableAcceleration accelerationType = getAccelerationModelType( accelerationModel );
8484
switch( accelerationType )
8585
{
86-
case central_gravity:
86+
case point_mass_gravity:
8787

8888
// Check if identifier is consistent with type.
8989
if( std::dynamic_pointer_cast< CentralGravitationalAccelerationModel3d >( accelerationModel ) == nullptr )
9090
{
91-
throw std::runtime_error( "Acceleration class type does not match acceleration type (central_gravity) "
91+
throw std::runtime_error( "Acceleration class type does not match acceleration type (point_mass_gravity) "
9292
"when making acceleration partial." );
9393
}
9494
else
@@ -149,7 +149,7 @@ std::shared_ptr< acceleration_partials::AccelerationPartial > createAnalyticalAc
149149
}
150150
break;
151151
}
152-
case third_body_central_gravity:
152+
case third_body_point_mass_gravity:
153153
// Check if identifier is consistent with type.
154154
if( std::dynamic_pointer_cast< ThirdBodyCentralGravityAcceleration >( accelerationModel ) == nullptr )
155155
{

‎include/tudat/simulation/estimation_setup/orbitDeterminationTestCases.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ std::pair< std::shared_ptr< PodOutput< StateScalarType, TimeType > >, Eigen::Vec
8080
// Set accelerations between bodies that are to be taken into account.
8181
SelectedAccelerationMap accelerationMap;
8282
std::map< std::string, std::vector< std::shared_ptr< AccelerationSettings > > > accelerationsOfEarth;
83-
accelerationsOfEarth[ "Sun" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
84-
accelerationsOfEarth[ "Moon" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
85-
accelerationsOfEarth[ "Mars" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
86-
accelerationsOfEarth[ "Jupiter" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
87-
accelerationsOfEarth[ "Saturn" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
83+
accelerationsOfEarth[ "Sun" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
84+
accelerationsOfEarth[ "Moon" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
85+
accelerationsOfEarth[ "Mars" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
86+
accelerationsOfEarth[ "Jupiter" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
87+
accelerationsOfEarth[ "Saturn" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
8888

8989
accelerationMap[ "Earth" ] = accelerationsOfEarth;
9090

@@ -411,11 +411,11 @@ Eigen::VectorXd executeEarthOrbiterParameterEstimation(
411411
std::map< std::string, std::vector< std::shared_ptr< AccelerationSettings > > > accelerationsOfVehicle;
412412
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< SphericalHarmonicAccelerationSettings >( 8, 8 ) );
413413
accelerationsOfVehicle[ "Sun" ].push_back( std::make_shared< AccelerationSettings >(
414-
basic_astrodynamics::central_gravity ) );
414+
basic_astrodynamics::point_mass_gravity ) );
415415
accelerationsOfVehicle[ "Moon" ].push_back( std::make_shared< AccelerationSettings >(
416-
basic_astrodynamics::central_gravity ) );
416+
basic_astrodynamics::point_mass_gravity ) );
417417
accelerationsOfVehicle[ "Mars" ].push_back( std::make_shared< AccelerationSettings >(
418-
basic_astrodynamics::central_gravity ) );
418+
basic_astrodynamics::point_mass_gravity ) );
419419
accelerationsOfVehicle[ "Sun" ].push_back( std::make_shared< AccelerationSettings >(
420420
basic_astrodynamics::cannon_ball_radiation_pressure ) );
421421
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >(
@@ -704,7 +704,7 @@ std::pair< Eigen::VectorXd, bool > executeEarthOrbiterBiasEstimation(
704704
// Set accelerations on Vehicle that are to be taken into account.
705705
SelectedAccelerationMap accelerationMap;
706706
std::map< std::string, std::vector< std::shared_ptr< AccelerationSettings > > > accelerationsOfVehicle;
707-
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
707+
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
708708
accelerationMap[ "Vehicle" ] = accelerationsOfVehicle;
709709

710710
// Set bodies for which initial state is to be estimated and integrated.

‎include/tudat/simulation/propagation_setup/propagationOutput.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ std::pair< std::function< Eigen::VectorXd( ) >, int > getVectorDependentVariable
443443
std::string errorMessage = "Error when getting acceleration between bodies " +
444444
accelerationDependentVariableSettings->associatedBody_ + " and " +
445445
accelerationDependentVariableSettings->secondaryBody_ + " of type " +
446-
std::to_string(
446+
getAccelerationModelName(
447447
accelerationDependentVariableSettings->accelerationModelType_ ) +
448448
", no such acceleration found";
449449
throw std::runtime_error( errorMessage );

‎src/astro/basic_astro/accelerationModelTypes.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ std::string getAccelerationModelName( const AvailableAcceleration accelerationTy
2323
std::string accelerationName;
2424
switch( accelerationType )
2525
{
26-
case central_gravity:
26+
case point_mass_gravity:
2727
accelerationName = "central gravity ";
2828
break;
2929
case aerodynamic:
@@ -38,7 +38,7 @@ std::string getAccelerationModelName( const AvailableAcceleration accelerationTy
3838
case mutual_spherical_harmonic_gravity:
3939
accelerationName = "mutual spherical harmonic gravity ";
4040
break;
41-
case third_body_central_gravity:
41+
case third_body_point_mass_gravity:
4242
accelerationName = "third-body central gravity ";
4343
break;
4444
case third_body_spherical_harmonic_gravity:
@@ -99,7 +99,7 @@ AvailableAcceleration getAccelerationModelType(
9999
if( std::dynamic_pointer_cast< CentralGravitationalAccelerationModel3d >(
100100
accelerationModel ) != nullptr )
101101
{
102-
accelerationType = central_gravity;
102+
accelerationType = point_mass_gravity;
103103
}
104104
else if( std::dynamic_pointer_cast< CannonBallRadiationPressureAcceleration >(
105105
accelerationModel ) != nullptr )
@@ -109,7 +109,7 @@ AvailableAcceleration getAccelerationModelType(
109109
else if( std::dynamic_pointer_cast< ThirdBodyCentralGravityAcceleration >(
110110
accelerationModel ) != nullptr )
111111
{
112-
accelerationType = third_body_central_gravity;
112+
accelerationType = third_body_point_mass_gravity;
113113
}
114114
else if( std::dynamic_pointer_cast< ThirdBodySphericalHarmonicsGravitationalAccelerationModel >(
115115
accelerationModel ) != nullptr )
@@ -235,7 +235,7 @@ std::vector< std::shared_ptr< AccelerationModel3d > > getAccelerationModelsOfTyp
235235
bool isAccelerationDirectGravitational( const AvailableAcceleration accelerationType )
236236
{
237237
bool accelerationIsDirectGravity = 0;
238-
if( ( accelerationType == central_gravity ) ||
238+
if( ( accelerationType == point_mass_gravity ) ||
239239
( accelerationType == spherical_harmonic_gravity ) ||
240240
( accelerationType == mutual_spherical_harmonic_gravity ) )
241241
{
@@ -270,9 +270,9 @@ AvailableAcceleration getAssociatedThirdBodyAcceleration( const AvailableAcceler
270270
std::to_string( accelerationType ) + " is not a direct gravity acceleration";
271271
throw std::runtime_error( errorMessage );
272272
}
273-
else if( accelerationType == central_gravity )
273+
else if( accelerationType == point_mass_gravity )
274274
{
275-
thirdBodyAccelerationType = third_body_central_gravity;
275+
thirdBodyAccelerationType = third_body_point_mass_gravity;
276276
}
277277
else if( accelerationType == spherical_harmonic_gravity )
278278
{

‎src/astro/orbit_determination/acceleration_partials/centralGravityAccelerationPartial.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ CentralGravitationPartial::CentralGravitationPartial(
6262
const std::shared_ptr< gravitation::CentralGravitationalAccelerationModel3d > gravitationalAcceleration,
6363
const std::string acceleratedBody,
6464
const std::string acceleratingBody ):
65-
AccelerationPartial( acceleratedBody, acceleratingBody, basic_astrodynamics::central_gravity )
65+
AccelerationPartial( acceleratedBody, acceleratingBody, basic_astrodynamics::point_mass_gravity )
6666
{
6767
accelerationUpdateFunction_ =
6868
std::bind( &basic_astrodynamics::AccelerationModel< Eigen::Vector3d>::updateMembers, gravitationalAcceleration, std::placeholders::_1 );

‎src/astro/propagators/nBodyStateDerivative.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ std::vector< std::function< double( ) > > removeCentralGravityAccelerations(
5656
AvailableAcceleration currentAccelerationType = getAccelerationModelType( listOfAccelerations[ j ] );
5757

5858
// If central gravity, set as central acceleration candidate.
59-
if( currentAccelerationType == central_gravity )
59+
if( currentAccelerationType == point_mass_gravity )
6060
{
6161
numberOfCandidates++;
6262
lastCandidate = j;
@@ -67,7 +67,7 @@ std::vector< std::function< double( ) > > removeCentralGravityAccelerations(
6767
numberOfCandidates++;
6868
lastCandidate = j;
6969
}
70-
else if( ( currentAccelerationType == third_body_central_gravity ) ||
70+
else if( ( currentAccelerationType == third_body_point_mass_gravity ) ||
7171
( currentAccelerationType == third_body_spherical_harmonic_gravity ) )
7272
{
7373
std::string errorMessage =

‎src/simulation/propagation_setup/createAccelerationModels.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ std::shared_ptr< basic_astrodynamics::AccelerationModel< Eigen::Vector3d > > cre
6565
std::shared_ptr< basic_astrodynamics::AccelerationModel< Eigen::Vector3d > > accelerationModel;
6666
switch( accelerationSettings->accelerationType_ )
6767
{
68-
case central_gravity:
68+
case point_mass_gravity:
6969
accelerationModel = createCentralGravityAcceleratioModel(
7070
bodyUndergoingAcceleration,
7171
bodyExertingAcceleration,
@@ -115,7 +115,7 @@ std::shared_ptr< basic_astrodynamics::AccelerationModel< Eigen::Vector3d > > cre
115115
std::shared_ptr< basic_astrodynamics::AccelerationModel< Eigen::Vector3d > > accelerationModel;
116116
switch( accelerationSettings->accelerationType_ )
117117
{
118-
case central_gravity:
118+
case point_mass_gravity:
119119
accelerationModel = std::make_shared< ThirdBodyCentralGravityAcceleration >(
120120
std::dynamic_pointer_cast< CentralGravitationalAccelerationModel3d >(
121121
createDirectGravitationalAcceleration(
@@ -173,7 +173,7 @@ std::shared_ptr< AccelerationModel< Eigen::Vector3d > > createGravitationalAccel
173173
{
174174

175175
std::shared_ptr< AccelerationModel< Eigen::Vector3d > > accelerationModelPointer;
176-
if( accelerationSettings->accelerationType_ != central_gravity &&
176+
if( accelerationSettings->accelerationType_ != point_mass_gravity &&
177177
accelerationSettings->accelerationType_ != spherical_harmonic_gravity &&
178178
accelerationSettings->accelerationType_ != mutual_spherical_harmonic_gravity )
179179
{
@@ -1327,7 +1327,7 @@ std::shared_ptr< AccelerationModel< Eigen::Vector3d > > createAccelerationModel(
13271327
// Switch to call correct acceleration model type factory function.
13281328
switch( accelerationSettings->accelerationType_ )
13291329
{
1330-
case central_gravity:
1330+
case point_mass_gravity:
13311331
accelerationModelPointer = createGravitationalAccelerationModel(
13321332
bodyUndergoingAcceleration, bodyExertingAcceleration, accelerationSettings,
13331333
nameOfBodyUndergoingAcceleration, nameOfBodyExertingAcceleration,

‎src/simulation/propagation_setup/createEnvironmentUpdater.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ createTranslationalEquationsOfMotionEnvironmentUpdaterSettings(
307307
// Check acceleration model type and change environment update list accordingly.
308308
switch( currentAccelerationModelType )
309309
{
310-
case central_gravity:
310+
case point_mass_gravity:
311311
break;
312-
case third_body_central_gravity:
312+
case third_body_point_mass_gravity:
313313
{
314314
std::shared_ptr< gravitation::ThirdBodyCentralGravityAcceleration >
315315
thirdBodyAcceleration = std::dynamic_pointer_cast<

‎src/simulation/propagation_setup/propagationCR3BPFullProblem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ basic_astrodynamics::AccelerationMap setupAccelerationMapCR3BP(
124124

125125
std::map< std::string, std::vector< std::shared_ptr< simulation_setup::AccelerationSettings > > > bodyToPropagateAccelerations;
126126
bodyToPropagateAccelerations[ namePrimaryBody ].push_back( std::make_shared< simulation_setup::AccelerationSettings >(
127-
basic_astrodynamics::central_gravity ) );
127+
basic_astrodynamics::point_mass_gravity ) );
128128
bodyToPropagateAccelerations[ nameSecondaryBody ].push_back( std::make_shared< simulation_setup::AccelerationSettings >(
129-
basic_astrodynamics::central_gravity ) );
129+
basic_astrodynamics::point_mass_gravity ) );
130130
simulation_setup::SelectedAccelerationMap accelerationMap;
131131
accelerationMap[ nameBodyToPropagate ] = bodyToPropagateAccelerations;
132132

‎src/simulation/propagation_setup/propagationLowThrustProblem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ basic_astrodynamics::AccelerationMap retrieveLowThrustAccelerationMap(
8787
// Acceleration from the central body.
8888
std::map< std::string, std::vector< std::shared_ptr< simulation_setup::AccelerationSettings > > > accelerationSettingsMap;
8989
accelerationSettingsMap[ centralBody ].push_back( std::make_shared< simulation_setup::AccelerationSettings >(
90-
basic_astrodynamics::central_gravity ) );
90+
basic_astrodynamics::point_mass_gravity ) );
9191
accelerationSettingsMap[ bodyToPropagate ].push_back(
9292
getLowThrustLegAccelerationSettings(
9393
lowThrustLeg, bodies, bodyToPropagate, specificImpulseFunction, lowThrustLegInitialTime ) );

‎tests/src/astro/aerodynamics/unitTestAerodynamicMomentAndAerodynamicForce.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ void testAerodynamicForceDirection( const bool includeThrustForce,
383383

384384
// Define acceleration model settings.
385385
std::map< std::string, std::vector< std::shared_ptr< AccelerationSettings > > > accelerationsOfVehicle;
386-
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
386+
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
387387

388388
if( swapCreationOrder )
389389
{

‎tests/src/astro/aerodynamics/unitTestControlSurfaceIncrements.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,9 @@ BOOST_AUTO_TEST_CASE( testControlSurfaceIncrementInterfaceInPropagation )
269269

270270
// Define acceleration model settings.
271271
std::map< std::string, std::vector< std::shared_ptr< AccelerationSettings > > > accelerationsOfApollo;
272-
accelerationsOfApollo[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
272+
accelerationsOfApollo[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
273273
accelerationsOfApollo[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( aerodynamic ) );
274-
accelerationsOfApollo[ "Moon" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
274+
accelerationsOfApollo[ "Moon" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
275275
accelerationMap[ "Apollo" ] = accelerationsOfApollo;
276276

277277
bodiesToPropagate.push_back( "Apollo" );

‎tests/src/astro/aerodynamics/unitTestWindModel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE( testWindModelInPropagation )
109109
std::vector< std::string > bodiesToPropagate;
110110
std::vector< std::string > centralBodies;
111111
std::map< std::string, std::vector< std::shared_ptr< AccelerationSettings > > > accelerationsOfVehicle;
112-
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( central_gravity ) );
112+
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
113113
accelerationsOfVehicle[ "Earth" ].push_back( std::make_shared< AccelerationSettings >( aerodynamic ) );
114114
accelerationMap[ "Vehicle" ] = accelerationsOfVehicle;
115115
bodiesToPropagate.push_back( "Vehicle" );

0 commit comments

Comments
 (0)