diff --git a/.gitignore b/.gitignore index f08f7250e6..15b5dfd717 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ install_manifest.txt *.exe *.out *.app +*.sh # # Build and doxygen related diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/testApolloCapsuleCoefficients.h b/Tudat/Astrodynamics/Aerodynamics/UnitTests/testApolloCapsuleCoefficients.h index 27a6b4e0e0..e30b823235 100644 --- a/Tudat/Astrodynamics/Aerodynamics/UnitTests/testApolloCapsuleCoefficients.h +++ b/Tudat/Astrodynamics/Aerodynamics/UnitTests/testApolloCapsuleCoefficients.h @@ -12,7 +12,6 @@ namespace unit_tests using basic_mathematics::Vector6d; using mathematical_constants::PI; -using std::vector; using namespace aerodynamics; boost::shared_ptr< HypersonicLocalInclinationAnalysis > getApolloCoefficientInterface( ) @@ -23,9 +22,9 @@ boost::shared_ptr< HypersonicLocalInclinationAnalysis > getApolloCoefficientInte = boost::make_shared< geometric_shapes::Capsule >( 4.694, 1.956, 2.662, -1.0 * 33.0 * PI / 180.0, 0.196 ); - vector< int > numberOfLines; - vector< int > numberOfPoints; - vector< bool > invertOrders; + std::vector< int > numberOfLines; + std::vector< int > numberOfPoints; + std::vector< bool > invertOrders; numberOfLines.resize( 4 ); numberOfPoints.resize( 4 ); invertOrders.resize( 4 ); @@ -84,7 +83,7 @@ boost::shared_ptr< HypersonicLocalInclinationAnalysis > getApolloCoefficientInte 3.9116, momentReference ); } -} +} // namespace unit_tests -} +} // namespace tudat #endif // TUDAT_TESTAPOLLOCAPSULECOEFFICIENTS_H diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicMomentAndAerodynamicForce.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicMomentAndAerodynamicForce.cpp index c73c7378d4..9e01d83ade 100644 --- a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicMomentAndAerodynamicForce.cpp +++ b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicMomentAndAerodynamicForce.cpp @@ -380,7 +380,6 @@ void testAerodynamicForceDirection( const bool includeThrustForce, } for( unsigned int i = 4; i < maximumIndex; i++ ) { - std::cout<<"Run: "< > defaultBodySettings = getDefaultBodySettings( boost::assign::list_of( "Earth" ), -1.0E6, 1.0E6 ); diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestCoefficientGenerator.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestCoefficientGenerator.cpp index df4baf26a4..7dc826e048 100644 --- a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestCoefficientGenerator.cpp +++ b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestCoefficientGenerator.cpp @@ -67,7 +67,6 @@ namespace unit_tests using basic_mathematics::Vector6d; using mathematical_constants::PI; -using std::vector; using namespace aerodynamics; @@ -92,9 +91,9 @@ BOOST_AUTO_TEST_CASE( testAerodynamicCoefficientGenerator ) = boost::make_shared< geometric_shapes::SphereSegment >( 1.0 ); // Set vehicle in analysis with 10,000 panels. - vector< int > numberOfLines( 1, 31 ); - vector< int > numberOfPoints( 1, 31 ); - vector< bool > invertOrder( 1, false ); + std::vector< int > numberOfLines( 1, 31 ); + std::vector< int > numberOfPoints( 1, 31 ); + std::vector< bool > invertOrder( 1, false ); // Create analysis object. std::vector< std::vector< double > > independentVariableDataPoints; @@ -283,9 +282,9 @@ boost::shared_ptr< HypersonicLocalInclinationAnalysis > getApolloCoefficientInte = boost::make_shared< geometric_shapes::Capsule >( 4.694, 1.956, 2.662, -1.0 * 33.0 * PI / 180.0, 0.196 ); - vector< int > numberOfLines( 4 ); - vector< int > numberOfPoints( 4 ); - vector< bool > invertOrders( 4 ); + std::vector< int > numberOfLines( 4 ); + std::vector< int > numberOfPoints( 4 ); + std::vector< bool > invertOrders( 4 ); // Set number of analysis points. numberOfLines[ 0 ] = 31; diff --git a/Tudat/Astrodynamics/Aerodynamics/aerodynamicAcceleration.h b/Tudat/Astrodynamics/Aerodynamics/aerodynamicAcceleration.h index 0318289e37..4873c4bc9d 100644 --- a/Tudat/Astrodynamics/Aerodynamics/aerodynamicAcceleration.h +++ b/Tudat/Astrodynamics/Aerodynamics/aerodynamicAcceleration.h @@ -184,7 +184,6 @@ class AerodynamicAcceleration : public basic_astrodynamics::AccelerationModel< E return computeAerodynamicAcceleration( 0.5 * currentDensity_ * currentAirspeed_ * currentAirspeed_, currentReferenceArea_, currentForceCoefficients_, currentMass_ ); - } //! Update member variables used by the aerodynamic acceleration model. diff --git a/Tudat/Astrodynamics/Aerodynamics/aerodynamicCoefficientInterface.h b/Tudat/Astrodynamics/Aerodynamics/aerodynamicCoefficientInterface.h index ee00aaf652..bd405ffa99 100644 --- a/Tudat/Astrodynamics/Aerodynamics/aerodynamicCoefficientInterface.h +++ b/Tudat/Astrodynamics/Aerodynamics/aerodynamicCoefficientInterface.h @@ -41,7 +41,6 @@ #ifndef TUDAT_AERODYNAMIC_COEFFICIENT_INTERFACE_H #define TUDAT_AERODYNAMIC_COEFFICIENT_INTERFACE_H -#include #include #include diff --git a/Tudat/Astrodynamics/Aerodynamics/aerodynamicGuidance.h b/Tudat/Astrodynamics/Aerodynamics/aerodynamicGuidance.h index fda9ddac6b..6b0679f272 100644 --- a/Tudat/Astrodynamics/Aerodynamics/aerodynamicGuidance.h +++ b/Tudat/Astrodynamics/Aerodynamics/aerodynamicGuidance.h @@ -75,8 +75,8 @@ class AerodynamicGuidance }; -} +} // namespace aerodynamics -} +} // namespace tudat #endif // TUDAT_ENTRYGUIDANCE_H diff --git a/Tudat/Astrodynamics/Aerodynamics/aerodynamics.cpp b/Tudat/Astrodynamics/Aerodynamics/aerodynamics.cpp index d34f3e8316..1aea0af7e1 100644 --- a/Tudat/Astrodynamics/Aerodynamics/aerodynamics.cpp +++ b/Tudat/Astrodynamics/Aerodynamics/aerodynamics.cpp @@ -500,7 +500,6 @@ double computeShockDeflectionAngle( double shockAngle, double machNumber, return atan( tangentOfDeflectionAngle_ ); } - //! Function to compute the speed of sound in a gas double computeSpeedOfSound( const double temperature, const double ratioOfSpecificHeats, const double specificGasConstant ) diff --git a/Tudat/Astrodynamics/Aerodynamics/flightConditions.cpp b/Tudat/Astrodynamics/Aerodynamics/flightConditions.cpp index 660318fa20..5438071bf4 100644 --- a/Tudat/Astrodynamics/Aerodynamics/flightConditions.cpp +++ b/Tudat/Astrodynamics/Aerodynamics/flightConditions.cpp @@ -8,8 +8,6 @@ * http://tudat.tudelft.nl/LICENSE. */ -#include - #include #include #include @@ -183,6 +181,26 @@ void FlightConditions::updateAerodynamicCoefficientInput( ) } } +//! Function to set the angle of attack to trimmed conditions. +boost::shared_ptr< TrimOrientationCalculator > setTrimmedConditions( + const boost::shared_ptr< FlightConditions > flightConditions ) +{ + // Create trim object. + boost::shared_ptr< TrimOrientationCalculator > trimOrientation = + boost::make_shared< TrimOrientationCalculator >( + flightConditions->getAerodynamicCoefficientInterface( ) ); + + // Create angle-of-attack function from trim object. + boost::function< std::vector< double >( ) > untrimmedIndependentVariablesFunction = + boost::bind( &FlightConditions::getAerodynamicCoefficientIndependentVariables, + flightConditions ); + flightConditions->getAerodynamicAngleCalculator( )->setOrientationAngleFunctions( + boost::bind( &TrimOrientationCalculator::findTrimAngleOfAttackFromFunction, trimOrientation, + untrimmedIndependentVariablesFunction ) ); + + return trimOrientation; } -} +} // namespace aerodynamics + +} // namespace tudat diff --git a/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.cpp b/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.cpp index 368eeb7928..b2096dae22 100644 --- a/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.cpp +++ b/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.cpp @@ -67,8 +67,6 @@ namespace tudat namespace aerodynamics { -using std::string; -using std::endl; using basic_mathematics::Vector6d; using mathematical_constants::PI; diff --git a/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.h b/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.h index d6d62aa22e..faeb504d3e 100644 --- a/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.h +++ b/Tudat/Astrodynamics/Aerodynamics/hypersonicLocalInclinationAnalysis.h @@ -52,7 +52,6 @@ #ifndef TUDAT_HYPERSONIC_LOCAL_INCLINATION_ANALYSIS_H #define TUDAT_HYPERSONIC_LOCAL_INCLINATION_ANALYSIS_H -#include #include #include #include diff --git a/Tudat/Astrodynamics/Aerodynamics/nrlmsise00Atmosphere.cpp b/Tudat/Astrodynamics/Aerodynamics/nrlmsise00Atmosphere.cpp index 75f36c6748..11bb0eb70c 100644 --- a/Tudat/Astrodynamics/Aerodynamics/nrlmsise00Atmosphere.cpp +++ b/Tudat/Astrodynamics/Aerodynamics/nrlmsise00Atmosphere.cpp @@ -7,7 +7,6 @@ * a copy of the license with this file. If not, please or visit: * http://tudat.tudelft.nl/LICENSE. */ -#include #include "Tudat/Astrodynamics/Aerodynamics/nrlmsise00Atmosphere.h" #include "Tudat/Mathematics/BasicMathematics/mathematicalConstants.h" diff --git a/Tudat/Astrodynamics/Aerodynamics/nrlmsise00InputFunctions.cpp b/Tudat/Astrodynamics/Aerodynamics/nrlmsise00InputFunctions.cpp index 6afcf43992..79def45abb 100644 --- a/Tudat/Astrodynamics/Aerodynamics/nrlmsise00InputFunctions.cpp +++ b/Tudat/Astrodynamics/Aerodynamics/nrlmsise00InputFunctions.cpp @@ -8,8 +8,6 @@ * http://tudat.tudelft.nl/LICENSE. */ -#include - #include #include "Tudat/Astrodynamics/Aerodynamics/nrlmsise00Atmosphere.h" diff --git a/Tudat/Astrodynamics/Aerodynamics/trimOrientation.h b/Tudat/Astrodynamics/Aerodynamics/trimOrientation.h index 9e8c75d68c..1700e50c8f 100644 --- a/Tudat/Astrodynamics/Aerodynamics/trimOrientation.h +++ b/Tudat/Astrodynamics/Aerodynamics/trimOrientation.h @@ -105,8 +105,8 @@ class TrimOrientationCalculator int variableIndex_; }; -} +} // namespace aerodynamics -} +} // namespace tudat #endif // TUDAT_TRIMORIENTATION_H diff --git a/Tudat/Astrodynamics/BasicAstrodynamics/UnitTests/testAccelerationModels.h b/Tudat/Astrodynamics/BasicAstrodynamics/UnitTests/testAccelerationModels.h index 8d3ea545e1..c367763540 100644 --- a/Tudat/Astrodynamics/BasicAstrodynamics/UnitTests/testAccelerationModels.h +++ b/Tudat/Astrodynamics/BasicAstrodynamics/UnitTests/testAccelerationModels.h @@ -266,7 +266,7 @@ class AnotherDerivedAccelerationModel TimeDataType time; }; -} // namespace tudat } // namespace unit_tests +} // namespace tudat #endif // TUDAT_TEST_ACCELERATION_MODELS_H diff --git a/Tudat/Astrodynamics/BasicAstrodynamics/accelerationModel.h b/Tudat/Astrodynamics/BasicAstrodynamics/accelerationModel.h index 48d7192aff..441b7db6fa 100644 --- a/Tudat/Astrodynamics/BasicAstrodynamics/accelerationModel.h +++ b/Tudat/Astrodynamics/BasicAstrodynamics/accelerationModel.h @@ -45,6 +45,7 @@ #ifndef TUDAT_ACCELERATION_MODEL_H #define TUDAT_ACCELERATION_MODEL_H +#include #include #include diff --git a/Tudat/Astrodynamics/BasicAstrodynamics/geodeticCoordinateConversions.cpp b/Tudat/Astrodynamics/BasicAstrodynamics/geodeticCoordinateConversions.cpp index 01d917fda3..4d00900bae 100644 --- a/Tudat/Astrodynamics/BasicAstrodynamics/geodeticCoordinateConversions.cpp +++ b/Tudat/Astrodynamics/BasicAstrodynamics/geodeticCoordinateConversions.cpp @@ -34,6 +34,7 @@ * */ +#include #include #include "Tudat/Mathematics/BasicMathematics/coordinateConversions.h" diff --git a/Tudat/Astrodynamics/BasicAstrodynamics/massRateModel.h b/Tudat/Astrodynamics/BasicAstrodynamics/massRateModel.h index 5cb77d083e..3784b4645f 100644 --- a/Tudat/Astrodynamics/BasicAstrodynamics/massRateModel.h +++ b/Tudat/Astrodynamics/BasicAstrodynamics/massRateModel.h @@ -13,7 +13,6 @@ #include #include -#include #include #include diff --git a/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.cpp b/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.cpp index 2f377cf78d..2c6ac97959 100644 --- a/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.cpp +++ b/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.cpp @@ -8,7 +8,7 @@ * http://tudat.tudelft.nl/LICENSE. */ -#include +#include #include #include "Tudat/Mathematics/BasicMathematics/mathematicalConstants.h" diff --git a/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.h b/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.h index f218abfbb2..04b3244131 100644 --- a/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.h +++ b/Tudat/Astrodynamics/BasicAstrodynamics/sphericalStateConversions.h @@ -79,9 +79,9 @@ basic_mathematics::Vector6d convertCartesianToSphericalOrbitalState( basic_mathematics::Vector6d convertSphericalOrbitalToCartesianState( const basic_mathematics::Vector6d& sphericalOrbitalState ); -} // namespace tudat - } // namespace orbital_element_conversions +} // namespace tudat + #endif // TUDAT_SPHERICALSTATECONVERSIONS_H diff --git a/Tudat/Astrodynamics/BasicAstrodynamics/unifiedStateModelElementConversions.h b/Tudat/Astrodynamics/BasicAstrodynamics/unifiedStateModelElementConversions.h index 618b3094ab..f66d400a35 100644 --- a/Tudat/Astrodynamics/BasicAstrodynamics/unifiedStateModelElementConversions.h +++ b/Tudat/Astrodynamics/BasicAstrodynamics/unifiedStateModelElementConversions.h @@ -93,7 +93,7 @@ basic_mathematics::Vector6d convertUnifiedStateModelToKeplerianElements( const Eigen::Matrix< double, 7, 1 >& unifiedStateModelElements, const double centralBodyGravitationalParameter ); -} // close namespace orbital_element_conversion +} // namespace orbital_element_conversions } // close tudat diff --git a/Tudat/Astrodynamics/CMakeLists.txt b/Tudat/Astrodynamics/CMakeLists.txt index 228c291e8f..5f6a5a87b8 100755 --- a/Tudat/Astrodynamics/CMakeLists.txt +++ b/Tudat/Astrodynamics/CMakeLists.txt @@ -34,6 +34,7 @@ # # Notes # + # Define the main sub-directories. set(AERODYNAMICSDIR "${ASTRODYNAMICSDIR}/Aerodynamics") set(BASICASTRODYNAMICSDIR "${ASTRODYNAMICSDIR}/BasicAstrodynamics") diff --git a/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsCircularCoplanar.cpp b/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsCircularCoplanar.cpp index 3e336c0780..8023f7179c 100644 --- a/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsCircularCoplanar.cpp +++ b/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsCircularCoplanar.cpp @@ -37,6 +37,7 @@ * */ +#include #include #include "Tudat/Astrodynamics/BasicAstrodynamics/unitConversions.h" diff --git a/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsDataContainer.h b/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsDataContainer.h index 5286f95cc4..84925f419d 100644 --- a/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsDataContainer.h +++ b/Tudat/Astrodynamics/Ephemerides/approximatePlanetPositionsDataContainer.h @@ -93,48 +93,47 @@ struct ApproximatePlanetPositionsDataContainer ApproximatePlanetPositionsDataContainer& approximatePlanetPositionsDataContainer ) { - using std::endl; - stream << "This is an ApproximatePlanetPositionsDataContainer object. " << endl; + stream << "This is an ApproximatePlanetPositionsDataContainer object. " << std::endl; stream << "The data corresponds to the table entry for " - << approximatePlanetPositionsDataContainer.planetName_ << endl; + << approximatePlanetPositionsDataContainer.planetName_ << std::endl; stream << "The semi-major axis in AU is set to: " - << approximatePlanetPositionsDataContainer.semiMajorAxis_ << endl; + << approximatePlanetPositionsDataContainer.semiMajorAxis_ << std::endl; stream << "The eccentricity in radians is set to: " - << approximatePlanetPositionsDataContainer.eccentricity_ << endl; + << approximatePlanetPositionsDataContainer.eccentricity_ << std::endl; stream << "The inclination in degrees is set to: " - << approximatePlanetPositionsDataContainer.inclination_ << endl; + << approximatePlanetPositionsDataContainer.inclination_ << std::endl; stream << "The mean longitude in degrees is set to: " - << approximatePlanetPositionsDataContainer.meanLongitude_ << endl; + << approximatePlanetPositionsDataContainer.meanLongitude_ << std::endl; stream << "The longitude of perihelion in degrees is set to: " - << approximatePlanetPositionsDataContainer.longitudeOfPerihelion_ << endl; + << approximatePlanetPositionsDataContainer.longitudeOfPerihelion_ << std::endl; stream << "The longitude of the ascending node in degrees is set to: " - << approximatePlanetPositionsDataContainer.longitudeOfAscendingNode_<< endl; + << approximatePlanetPositionsDataContainer.longitudeOfAscendingNode_<< std::endl; stream << "The rate of change of semi-major axis AU per century is set to: " - << approximatePlanetPositionsDataContainer.rateOfChangeOfSemiMajorAxis_ << endl; + << approximatePlanetPositionsDataContainer.rateOfChangeOfSemiMajorAxis_ << std::endl; stream << "The rate of change of eccentricity in radians per century is set to: " - << approximatePlanetPositionsDataContainer.rateOfChangeOfEccentricity_ << endl; + << approximatePlanetPositionsDataContainer.rateOfChangeOfEccentricity_ << std::endl; stream << "The rate of change of inclination in degrees per century is set to: " - << approximatePlanetPositionsDataContainer.rateOfChangeOfInclination_ << endl; + << approximatePlanetPositionsDataContainer.rateOfChangeOfInclination_ << std::endl; stream << "The rate of change of mean longitude in degrees per century is set to: " - << approximatePlanetPositionsDataContainer.rateOfChangeOfMeanLongitude_ << endl; + << approximatePlanetPositionsDataContainer.rateOfChangeOfMeanLongitude_ << std::endl; stream << "The rate of change of longitude of perihelion in degrees per century is set to: " - << approximatePlanetPositionsDataContainer.rateOfChangeOfLongitudeOfPerihelion_ << endl; + << approximatePlanetPositionsDataContainer.rateOfChangeOfLongitudeOfPerihelion_ << std::endl; stream << "The rate of change of longitude of ascending node in degrees per century is set " << "to: " << approximatePlanetPositionsDataContainer - .rateOfChangeOfLongitudeOfAscendingNode_ << endl; + .rateOfChangeOfLongitudeOfAscendingNode_ << std::endl; // Check if additional terms are defined for outer planets. if ( approximatePlanetPositionsDataContainer.additionalTermB_ != -0.0 ) { stream << "The additional term B is set to: " - << approximatePlanetPositionsDataContainer.additionalTermB_ << endl; + << approximatePlanetPositionsDataContainer.additionalTermB_ << std::endl; stream << "The additional term C is set to: " - << approximatePlanetPositionsDataContainer.additionalTermC_ << endl; + << approximatePlanetPositionsDataContainer.additionalTermC_ << std::endl; stream << "The additional term S is set to: " - << approximatePlanetPositionsDataContainer.additionalTermS_ << endl; + << approximatePlanetPositionsDataContainer.additionalTermS_ << std::endl; stream << "The additional term F is set to: " - << approximatePlanetPositionsDataContainer .additionalTermF_ << endl; + << approximatePlanetPositionsDataContainer .additionalTermF_ << std::endl; } // Return stream. diff --git a/Tudat/Astrodynamics/Ephemerides/ephemeris.cpp b/Tudat/Astrodynamics/Ephemerides/ephemeris.cpp index d950d329fe..3326399289 100644 --- a/Tudat/Astrodynamics/Ephemerides/ephemeris.cpp +++ b/Tudat/Astrodynamics/Ephemerides/ephemeris.cpp @@ -7,9 +7,6 @@ * a copy of the license with this file. If not, please or visit: * http://tudat.tudelft.nl/LICENSE. */ - -#include - #include "Tudat/Astrodynamics/Ephemerides/ephemeris.h" namespace tudat diff --git a/Tudat/Astrodynamics/Ephemerides/rotationalEphemeris.h b/Tudat/Astrodynamics/Ephemerides/rotationalEphemeris.h index 20ee1b0404..b064e15a58 100644 --- a/Tudat/Astrodynamics/Ephemerides/rotationalEphemeris.h +++ b/Tudat/Astrodynamics/Ephemerides/rotationalEphemeris.h @@ -369,7 +369,7 @@ Eigen::Matrix< StateScalarType, 6, 1 > transformStateToGlobalFrame( } -} // namespace tudat } // namespace ephemerides +} // namespace tudat #endif // TUDAT_ROTATIONAL_EPHEMERIS_H diff --git a/Tudat/Astrodynamics/Ephemerides/simpleRotationalEphemeris.h b/Tudat/Astrodynamics/Ephemerides/simpleRotationalEphemeris.h index 833f3279d2..8a73301cbb 100644 --- a/Tudat/Astrodynamics/Ephemerides/simpleRotationalEphemeris.h +++ b/Tudat/Astrodynamics/Ephemerides/simpleRotationalEphemeris.h @@ -214,7 +214,7 @@ class SimpleRotationalEphemeris : public RotationalEphemeris * \return Rotation rate [rad/s]. */ double getRotationRate( ) { return rotationRate_; } -\ + //! Function to reset the rotation rate of the body. /*! * Function to reset the rotation rate of the body. @@ -281,7 +281,7 @@ class SimpleRotationalEphemeris : public RotationalEphemeris Eigen::Matrix3d auxiliaryMatrix_; }; -} // namespace tudat } // namespace ephemerides +} // namespace tudat #endif // TUDAT_SIMPLE_ROTATIONAL_EPHEMERIS_H diff --git a/Tudat/Astrodynamics/Gravitation/basicSolidBodyTideGravityFieldVariations.h b/Tudat/Astrodynamics/Gravitation/basicSolidBodyTideGravityFieldVariations.h index b6e4284a4c..30f04f17b0 100644 --- a/Tudat/Astrodynamics/Gravitation/basicSolidBodyTideGravityFieldVariations.h +++ b/Tudat/Astrodynamics/Gravitation/basicSolidBodyTideGravityFieldVariations.h @@ -8,8 +8,8 @@ * http://tudat.tudelft.nl/LICENSE. */ -#ifndef BASICSOLIDBODYTIDEGRAVITYFIELDVARIATIONS_H -#define BASICSOLIDBODYTIDEGRAVITYFIELDVARIATIONS_H +#ifndef TUDAT_BASICSOLIDBODYTIDEGRAVITYFIELDVARIATIONS_H +#define TUDAT_BASICSOLIDBODYTIDEGRAVITYFIELDVARIATIONS_H #include #include @@ -557,7 +557,7 @@ class BasicSolidBodyTideGravityFieldVariations: public GravityFieldVariations }; -} +} // namespace gravitation -} -#endif // BASICSOLIDBODYTIDEGRAVITYFIELDVARIATIONS_H +} // namespace tudat +#endif // TUDAT_BASICSOLIDBODYTIDEGRAVITYFIELDVARIATIONS_H diff --git a/Tudat/Astrodynamics/Gravitation/centralGravityModel.h b/Tudat/Astrodynamics/Gravitation/centralGravityModel.h index c0a8ce77ba..f08a424251 100644 --- a/Tudat/Astrodynamics/Gravitation/centralGravityModel.h +++ b/Tudat/Astrodynamics/Gravitation/centralGravityModel.h @@ -202,7 +202,7 @@ class CentralGravitationalAccelerationModel const double aGravitationalParameter, const typename Base::StateFunction positionOfBodyExertingAccelerationFunction = boost::lambda::constant( StateMatrix::Zero( ) ), - const bool isMutualAttractionUsed = 0 ) + const bool isMutualAttractionUsed = false ) : Base( positionOfBodySubjectToAccelerationFunction, boost::lambda::constant( aGravitationalParameter ), positionOfBodyExertingAccelerationFunction, @@ -236,7 +236,7 @@ class CentralGravitationalAccelerationModel const boost::function< double( ) > aGravitationalParameterFunction, const typename Base::StateFunction positionOfBodyExertingAccelerationFunction = boost::lambda::constant( StateMatrix::Zero( ) ), - const bool isMutualAttractionUsed = 0 ) + const bool isMutualAttractionUsed = false ) : Base( positionOfBodySubjectToAccelerationFunction, aGravitationalParameterFunction, positionOfBodyExertingAccelerationFunction, diff --git a/Tudat/Astrodynamics/Gravitation/centralJ2GravityModel.h b/Tudat/Astrodynamics/Gravitation/centralJ2GravityModel.h index f97e7e28e3..ae7d1856ac 100644 --- a/Tudat/Astrodynamics/Gravitation/centralJ2GravityModel.h +++ b/Tudat/Astrodynamics/Gravitation/centralJ2GravityModel.h @@ -137,7 +137,7 @@ class CentralJ2GravitationalAccelerationModel = boost::lambda::constant( Eigen::Vector3d::Zero( ) ) ) : Base( positionOfBodySubjectToAccelerationFunction, aGravitationalParameter, - positionOfBodyExertingAccelerationFunction, 0 ), + positionOfBodyExertingAccelerationFunction, false ), equatorialRadius( anEquatorialRadius ), j2GravityCoefficient( aJ2GravityCoefficient ) { diff --git a/Tudat/Astrodynamics/Gravitation/centralJ2J3GravityModel.h b/Tudat/Astrodynamics/Gravitation/centralJ2J3GravityModel.h index 49dc922c9b..956fc968cf 100644 --- a/Tudat/Astrodynamics/Gravitation/centralJ2J3GravityModel.h +++ b/Tudat/Astrodynamics/Gravitation/centralJ2J3GravityModel.h @@ -142,7 +142,7 @@ class CentralJ2J3GravitationalAccelerationModel = boost::lambda::constant( Eigen::Vector3d::Zero( ) ) ) : Base( positionOfBodySubjectToAccelerationFunction, aGravitationalParameter, - positionOfBodyExertingAccelerationFunction, 0 ), + positionOfBodyExertingAccelerationFunction, false ), equatorialRadius( anEquatorialRadius ), j2GravityCoefficient( aJ2GravityCoefficient ), j3GravityCoefficient( aJ3GravityCoefficient ) diff --git a/Tudat/Astrodynamics/Gravitation/centralJ2J3J4GravityModel.h b/Tudat/Astrodynamics/Gravitation/centralJ2J3J4GravityModel.h index 804155b421..e11e4e65a2 100644 --- a/Tudat/Astrodynamics/Gravitation/centralJ2J3J4GravityModel.h +++ b/Tudat/Astrodynamics/Gravitation/centralJ2J3J4GravityModel.h @@ -191,7 +191,7 @@ class CentralJ2J3J4GravitationalAccelerationModel = boost::lambda::constant( Eigen::Vector3d::Zero( ) ) ) : Base( positionOfBodySubjectToAccelerationFunction, aGravitationalParameter, - positionOfBodyExertingAccelerationFunction, 0 ), + positionOfBodyExertingAccelerationFunction, false ), equatorialRadius( anEquatorialRadius ), j2GravityCoefficient( aJ2GravityCoefficient ), j3GravityCoefficient( aJ3GravityCoefficient ), diff --git a/Tudat/Astrodynamics/Gravitation/mutualSphericalHarmonicGravityModel.h b/Tudat/Astrodynamics/Gravitation/mutualSphericalHarmonicGravityModel.h index 96b5d7fca6..225f8cabd0 100644 --- a/Tudat/Astrodynamics/Gravitation/mutualSphericalHarmonicGravityModel.h +++ b/Tudat/Astrodynamics/Gravitation/mutualSphericalHarmonicGravityModel.h @@ -1,5 +1,15 @@ -#ifndef MUTUALSPHERICALHARMONICGRAVITYMODEL_H -#define MUTUALSPHERICALHARMONICGRAVITYMODEL_H +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved + * + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. + */ + +#ifndef TUDAT_MUTUALSPHERICALHARMONICGRAVITYMODEL_H +#define TUDAT_MUTUALSPHERICALHARMONICGRAVITYMODEL_H #include @@ -250,8 +260,8 @@ class MutualSphericalHarmonicsGravitationalAccelerationModel }; -} +} // namespace gravitation -} +} // namespace tudat -#endif // MUTUALSPHERICALHARMONICGRAVITYMODEL_H +#endif // TUDAT_MUTUALSPHERICALHARMONICGRAVITYMODEL_H diff --git a/Tudat/Astrodynamics/Gravitation/sphericalHarmonicsGravityModel.h b/Tudat/Astrodynamics/Gravitation/sphericalHarmonicsGravityModel.h index 03cdd77ac8..0c76337a36 100644 --- a/Tudat/Astrodynamics/Gravitation/sphericalHarmonicsGravityModel.h +++ b/Tudat/Astrodynamics/Gravitation/sphericalHarmonicsGravityModel.h @@ -44,8 +44,6 @@ #ifndef TUDAT_SPHERICAL_HARMONICS_GRAVITY_MODEL_H #define TUDAT_SPHERICAL_HARMONICS_GRAVITY_MODEL_H -#include - #include #include #include diff --git a/Tudat/Astrodynamics/MissionSegments/lambertRoutines.h b/Tudat/Astrodynamics/MissionSegments/lambertRoutines.h index f5e46b25b7..3a0e4f0256 100644 --- a/Tudat/Astrodynamics/MissionSegments/lambertRoutines.h +++ b/Tudat/Astrodynamics/MissionSegments/lambertRoutines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2015, Del ft University of Technology +/* Copyright (c) 2010-2015, Delft University of Technology * All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are diff --git a/Tudat/Astrodynamics/MissionSegments/zeroRevolutionLambertTargeterIzzo.h b/Tudat/Astrodynamics/MissionSegments/zeroRevolutionLambertTargeterIzzo.h index 822b15b502..2242ef0f49 100644 --- a/Tudat/Astrodynamics/MissionSegments/zeroRevolutionLambertTargeterIzzo.h +++ b/Tudat/Astrodynamics/MissionSegments/zeroRevolutionLambertTargeterIzzo.h @@ -46,8 +46,8 @@ * */ -#ifndef ZERO_REVOLUTION_LAMBERT_TARGETER_IZZO_H -#define ZERO_REVOLUTION_LAMBERT_TARGETER_IZZO_H +#ifndef TUDAT_ZERO_REVOLUTION_LAMBERT_TARGETER_IZZO_H +#define TUDAT_ZERO_REVOLUTION_LAMBERT_TARGETER_IZZO_H #include // For Vector3d @@ -323,4 +323,4 @@ class ZeroRevolutionLambertTargeterIzzo : public LambertTargeter } // namespace mission_segments } // namespace tudat -#endif // ZERO_REVOLUTION_LAMBERT_TARGETER_IZZO_H +#endif // TUDAT_ZERO_REVOLUTION_LAMBERT_TARGETER_IZZO_H diff --git a/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.cpp b/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.cpp index 760b1c8d3a..bd3d97a90f 100644 --- a/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.cpp +++ b/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.cpp @@ -8,8 +8,6 @@ * http://tudat.tudelft.nl/LICENSE. */ -#include - #include "Tudat/Astrodynamics/BasicAstrodynamics/physicalConstants.h" #include "Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.h" diff --git a/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.h b/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.h index d43cde489b..ed23d89617 100644 --- a/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.h +++ b/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/firstOrderRelativisticLightTimeCorrection.h @@ -13,7 +13,6 @@ #include #include -#include #include #include @@ -193,7 +192,7 @@ class FirstOrderLightTimeCorrectionCalculator: public LightTimeCorrection double currentTotalLightTimeCorrection_; }; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_FIRSTORDERRELATIVISTICLIGHTTIMECORRECTION_H diff --git a/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/lightTimeCorrection.h b/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/lightTimeCorrection.h index beec49ba55..ae56333290 100644 --- a/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/lightTimeCorrection.h +++ b/Tudat/Astrodynamics/ObservationModels/ObservableCorrections/lightTimeCorrection.h @@ -82,8 +82,8 @@ class LightTimeCorrection }; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_LIGHTTIMECORRECTION_H diff --git a/Tudat/Astrodynamics/ObservationModels/angularPositionObservationModel.h b/Tudat/Astrodynamics/ObservationModels/angularPositionObservationModel.h index dc9822d3eb..335393a92f 100644 --- a/Tudat/Astrodynamics/ObservationModels/angularPositionObservationModel.h +++ b/Tudat/Astrodynamics/ObservationModels/angularPositionObservationModel.h @@ -148,8 +148,8 @@ class AngularPositionObservationModel: public ObservationModel< 2, ObservationSc boost::shared_ptr< observation_models::LightTimeCalculator< ObservationScalarType, TimeType, StateScalarType > > lightTimeCalculator_; }; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_ANGULARPOSITIONOBSERVATIONMODEL_H diff --git a/Tudat/Astrodynamics/ObservationModels/linkTypeDefs.h b/Tudat/Astrodynamics/ObservationModels/linkTypeDefs.h index 6b8a84b3be..4548e3abfe 100644 --- a/Tudat/Astrodynamics/ObservationModels/linkTypeDefs.h +++ b/Tudat/Astrodynamics/ObservationModels/linkTypeDefs.h @@ -39,8 +39,8 @@ typedef std::pair< std::string, std::string > LinkEndId; //! Typedef for list of link ends, with associated role, used for a single observation (model). typedef std::map< LinkEndType, LinkEndId > LinkEnds; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_LINKTYPEDEFS_H diff --git a/Tudat/Astrodynamics/ObservationModels/observableTypes.cpp b/Tudat/Astrodynamics/ObservationModels/observableTypes.cpp index 470b4d4be3..969e20353e 100644 --- a/Tudat/Astrodynamics/ObservationModels/observableTypes.cpp +++ b/Tudat/Astrodynamics/ObservationModels/observableTypes.cpp @@ -8,8 +8,6 @@ * http://tudat.tudelft.nl/LICENSE. */ -#include - #include #include "Tudat/Astrodynamics/ObservationModels/observableTypes.h" diff --git a/Tudat/Astrodynamics/ObservationModels/observableTypes.h b/Tudat/Astrodynamics/ObservationModels/observableTypes.h index 74a400a4ae..d7ea126767 100644 --- a/Tudat/Astrodynamics/ObservationModels/observableTypes.h +++ b/Tudat/Astrodynamics/ObservationModels/observableTypes.h @@ -48,8 +48,8 @@ std::string getObservableName( const ObservableType observableType ); ObservableType getObservableType( const std::string& observableName ); -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_OBSERVABLETYPES_H diff --git a/Tudat/Astrodynamics/ObservationModels/observationBias.h b/Tudat/Astrodynamics/ObservationModels/observationBias.h index b339c24e91..723192a654 100644 --- a/Tudat/Astrodynamics/ObservationModels/observationBias.h +++ b/Tudat/Astrodynamics/ObservationModels/observationBias.h @@ -11,7 +11,6 @@ #ifndef TUDAT_OBSERVATIONBIAS_H #define TUDAT_OBSERVATIONBIAS_H -#include #include #include @@ -112,8 +111,8 @@ class ConstantObservationBias: public ObservationBias< ObservationSize > }; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_OBSERVATIONMODEL_H diff --git a/Tudat/Astrodynamics/ObservationModels/observationModel.h b/Tudat/Astrodynamics/ObservationModels/observationModel.h index a91d34c7a6..a847b2b083 100644 --- a/Tudat/Astrodynamics/ObservationModels/observationModel.h +++ b/Tudat/Astrodynamics/ObservationModels/observationModel.h @@ -248,7 +248,7 @@ class ObservationModel }; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_OBSERVATIONMODEL_H diff --git a/Tudat/Astrodynamics/ObservationModels/oneWayRangeObservationModel.h b/Tudat/Astrodynamics/ObservationModels/oneWayRangeObservationModel.h index 8372d2ce88..52f2ae92ef 100644 --- a/Tudat/Astrodynamics/ObservationModels/oneWayRangeObservationModel.h +++ b/Tudat/Astrodynamics/ObservationModels/oneWayRangeObservationModel.h @@ -187,8 +187,8 @@ class OneWayRangeObservationModel: public ObservationModel< 1, ObservationScalar }; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_ONEWAYRANGEOBSERVATIONMODEL_H diff --git a/Tudat/Astrodynamics/ObservationModels/positionObservationModel.h b/Tudat/Astrodynamics/ObservationModels/positionObservationModel.h index d0b0799d8c..d84a6557f4 100644 --- a/Tudat/Astrodynamics/ObservationModels/positionObservationModel.h +++ b/Tudat/Astrodynamics/ObservationModels/positionObservationModel.h @@ -8,8 +8,8 @@ * http://tudat.tudelft.nl/LICENSE. */ -#ifndef POSITIONOBSERVATIONMODEL_H -#define POSITIONOBSERVATIONMODEL_H +#ifndef TUDAT_POSITIONOBSERVATIONMODEL_H +#define TUDAT_POSITIONOBSERVATIONMODEL_H #include #include @@ -116,8 +116,8 @@ class PositionObservationModel: public ObservationModel< 3, ObservationScalarTyp boost::function< Eigen::Matrix< ObservationScalarType, 6, 1 >( const TimeType& ) > stateFunction_; }; -} +} // namespace observation_models -} +} // namespace tudat -#endif // POSITIONOBSERVATIONMODEL_H +#endif // TUDAT_POSITIONOBSERVATIONMODEL_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/CMakeLists.txt b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/CMakeLists.txt index ace23dba05..94ebab9fdb 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/CMakeLists.txt +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/CMakeLists.txt @@ -1,46 +1,18 @@ -# \file CMakeLists.txt - # This is the CMake file for the MissionSegments sub-directory. + # Copyright (c) 2010-2016, Delft University of Technology + # All rigths reserved # - # Path : /Astrodynamics/MissionSegments/ - # Version : 3 - # Check status : Checked - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Author : K. Kumar - # Affiliation : Delft University of Technology - # E-mail address : K.Kumar@tudelft.nl - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Date created : 20 August, 2011 - # Last modified : 26 October, 2011 - # - # References - # - # Notes - # - # Copyright (c) 2010-2011 Delft University of Technology. - # - # This software is protected by national and international copyright. - # Any unauthorized use, reproduction or modification is unlawful and - # will be prosecuted. Commercial and non-private application of the - # software in any form is strictly prohibited unless otherwise granted - # by the authors. - # - # The code is provided without any warranty; without even the implied - # warranty of merchantibility or fitness for a particular purpose. + # This file is part of the Tudat. Redistribution and use in source and + # binary forms, with or without modification, are permitted exclusively + # under the terms of the Modified BSD license. You should have received + # a copy of the license with this file. If not, please or visit: + # http://tudat.tudelft.nl/LICENSE. # # Changelog # YYMMDD Author Comment # 110820 S.M. Persson File created. # 111025 K. Kumar Adapted file to work with Revision 194. # 111026 K. Kumar Adapted file so all headers show in project tree in Qt Creator. - #/ + # # Set the source files. set(ACCELERATION_PARTIALS_SOURCES diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestAccelerationPartials.cpp b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestAccelerationPartials.cpp index 55cad44bb6..36ba7ad14d 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestAccelerationPartials.cpp +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestAccelerationPartials.cpp @@ -121,15 +121,15 @@ BOOST_AUTO_TEST_CASE( testCentralGravityPartials ) // Declare perturbations in position for numerical partial/ Eigen::Vector3d positionPerturbation; - positionPerturbation<< 10000.0, 10000.0, 10000.0; + positionPerturbation << 10000.0, 10000.0, 10000.0; Eigen::Vector3d velocityPerturbation; - velocityPerturbation<< 1.0, 1.0, 1.0; + velocityPerturbation << 1.0, 1.0, 1.0; // Create state access/modification functions for bodies. boost::function< void( basic_mathematics::Vector6d ) > earthStateSetFunction = - boost::bind( &Body::setState, earth, _1 ); + boost::bind( &Body::setState, earth, _1 ); boost::function< void( basic_mathematics::Vector6d ) > sunStateSetFunction = - boost::bind( &Body::setState, sun, _1 ); + boost::bind( &Body::setState, sun, _1 ); boost::function< basic_mathematics::Vector6d ( ) > earthStateGetFunction = boost::bind( &Body::getState, earth ); boost::function< basic_mathematics::Vector6d ( ) > sunStateGetFunction = @@ -189,9 +189,9 @@ BOOST_AUTO_TEST_CASE( testRadiationPressureAccelerationPartials ) // Create links to set and get state functions of bodies. boost::function< void( basic_mathematics::Vector6d ) > sunStateSetFunction = - boost::bind( &Body::setState, sun, _1 ); + boost::bind( &Body::setState, sun, _1 ); boost::function< void( basic_mathematics::Vector6d ) > vehicleStateSetFunction = - boost::bind( &Body::setState, vehicle, _1 ); + boost::bind( &Body::setState, vehicle, _1 ); boost::function< basic_mathematics::Vector6d( ) > sunStateGetFunction = boost::bind( &Body::getState, sun ); boost::function< basic_mathematics::Vector6d( ) > vehicleStateGetFunction = @@ -247,9 +247,9 @@ BOOST_AUTO_TEST_CASE( testRadiationPressureAccelerationPartials ) // Declare perturbations in position for numerical partial/ Eigen::Vector3d positionPerturbation; - positionPerturbation<< 10000.0, 10000.0, 10000.0; + positionPerturbation << 10000.0, 10000.0, 10000.0; Eigen::Vector3d velocityPerturbation; - velocityPerturbation<< 1.0, 1.0, 1.0; + velocityPerturbation << 1.0, 1.0, 1.0; // Calculate numerical partials. boost::function< void( ) > updateFunction = @@ -368,17 +368,17 @@ BOOST_AUTO_TEST_CASE( testThirdBodyGravityPartials ) // Declare perturbations in position for numerical partial/ Eigen::Vector3d positionPerturbation; - positionPerturbation<< 10000.0, 10000.0, 10000.0; + positionPerturbation << 10000.0, 10000.0, 10000.0; Eigen::Vector3d velocityPerturbation; - velocityPerturbation<< 1.0, 1.0, 1.0; + velocityPerturbation << 1.0, 1.0, 1.0; // Create state access/modification functions for bodies. boost::function< void( basic_mathematics::Vector6d ) > moonStateSetFunction = - boost::bind( &Body::setState, moon, _1 ); + boost::bind( &Body::setState, moon, _1 ); boost::function< void( basic_mathematics::Vector6d ) > sunStateSetFunction = - boost::bind( &Body::setState, sun, _1 ); + boost::bind( &Body::setState, sun, _1 ); boost::function< void( basic_mathematics::Vector6d ) > earthStateSetFunction = - boost::bind( &Body::setState, earth, _1 ); + boost::bind( &Body::setState, earth, _1 ); // Calculate numerical partials. testPartialWrtMoonPosition = calculateAccelerationWrtStatePartials( diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestSphericalHarmonicPartials.cpp b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestSphericalHarmonicPartials.cpp index 8ff8280f66..fa373e3c79 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestSphericalHarmonicPartials.cpp +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/UnitTests/unitTestSphericalHarmonicPartials.cpp @@ -1,19 +1,11 @@ -/* Copyright (c) 2010-2012 Delft University of Technology./ - * - * This software is protected by national and international copyright. - * Any unauthorized use, reproduction or modification is unlawful and - * will be prosecuted. Commercial and non-private application of the - * software in any form is strictly prohibited unless otherwise granted - * by the authors. - * - * The code is provided without any warranty; without even the implied - * warranty of merchantibility or fitness for a particular purpose. - * - * Changelog - * YYMMDD Author Comment - * - * References +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved * + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. */ #define BOOST_TEST_MAIN @@ -69,7 +61,6 @@ BOOST_AUTO_TEST_CASE( testSphericalHarmonicPartials ) // Short-cuts. using namespace gravitation; - const double gravitationalParameter = 3.986004418e14; const double planetaryRadius = 6378137.0; diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/accelerationPartial.h b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/accelerationPartial.h index e18ff9c571..9a3a88115b 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/accelerationPartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/accelerationPartial.h @@ -368,8 +368,8 @@ class AccelerationPartial: public orbit_determination::StateDerivativePartial }; -} +} // namespace acceleration_partials -} +} // namespace tudat #endif // TUDAT_ACCELERATIONPARTIALS_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/centralGravityAccelerationPartial.h b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/centralGravityAccelerationPartial.h index 3eb3b8ee81..df9cdbc4d9 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/centralGravityAccelerationPartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/centralGravityAccelerationPartial.h @@ -11,8 +11,6 @@ #ifndef TUDAT_CENTRALGRAVITYACCELERATIONPARTIALS_H #define TUDAT_CENTRALGRAVITYACCELERATIONPARTIALS_H -#include - #include "Tudat/Astrodynamics/Gravitation/centralGravityModel.h" #include "Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/accelerationPartial.h" @@ -245,8 +243,8 @@ class CentralGravitationPartial: public AccelerationPartial }; -} +} // namespace acceleration_partials -} +} // namespace tudat #endif // TUDAT_CENTRALGRAVITYACCELERATIONPARTIALS_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/numericalAccelerationPartial.h b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/numericalAccelerationPartial.h index 183418a1a0..d6738950d5 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/numericalAccelerationPartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/numericalAccelerationPartial.h @@ -8,8 +8,8 @@ * http://tudat.tudelft.nl/LICENSE. */ -#ifndef NUMERICALACCELERATIONPARTIAL_H -#define NUMERICALACCELERATIONPARTIAL_H +#ifndef TUDAT_NUMERICALACCELERATIONPARTIAL_H +#define TUDAT_NUMERICALACCELERATIONPARTIAL_H #include @@ -104,8 +104,8 @@ Eigen::Matrix< double, 3, Eigen::Dynamic > calculateAccelerationWrtParameterPart boost::function< void( const double ) > timeDependentUpdateDependentVariables = emptyTimeFunction ); -} +} // namespace acceleration_partials -} +} // namespace tudat -#endif // NUMERICALACCELERATIONPARTIAL_H +#endif // TUDAT_NUMERICALACCELERATIONPARTIAL_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.cpp b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.cpp index 7d074f17c1..2aa07a2256 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.cpp +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.cpp @@ -8,8 +8,6 @@ * http://tudat.tudelft.nl/LICENSE. */ -#include - #include "Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/radiationPressureCoefficient.h" #include "Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.h" diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.h b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.h index e6a6538617..d11c8c4756 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/radiationPressureAccelerationPartial.h @@ -239,8 +239,8 @@ class CannonBallRadiationPressurePartial: public AccelerationPartial Eigen::Matrix3d currentPartialWrtPosition_; }; -} +} // namespace acceleration_partials -} +} // namespace tudat #endif // TUDAT_RADIATIONPRESSUREACCELERATIONPARTIAL_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicAccelerationPartial.h b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicAccelerationPartial.h index c88a9e98eb..469d5dd5c8 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicAccelerationPartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicAccelerationPartial.h @@ -363,8 +363,8 @@ class SphericalHarmonicsGravityPartial: public AccelerationPartial }; -} +} // namespace acceleration_partials -} +} // namespace tudat #endif // TUDAT_SPHERICALHARMONICACCELERATIONPARTIAL_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicPartialFunctions.h b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicPartialFunctions.h index 5ff053bbc7..b5e2425a0a 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicPartialFunctions.h +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/sphericalHarmonicPartialFunctions.h @@ -251,8 +251,8 @@ void calculateSphericalHarmonicGravityWrtSCoefficients( const Eigen::Matrix3d& bodyFixedToIntegrationFrame, Eigen::MatrixXd& partialsMatrix ); -} +} // namespace acceleration_partials -} +} // namespace tudat #endif // TUDAT_SPHERICALHARMONICPARTIALFUNCTIONS_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/thirdBodyGravityPartial.h b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/thirdBodyGravityPartial.h index 1b7b6eed3d..85a7dd8365 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/thirdBodyGravityPartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/AccelerationPartials/thirdBodyGravityPartial.h @@ -467,14 +467,14 @@ class ThirdBodyGravityPartial: public AccelerationPartial protected: - //!! Function to reset the constituent DirectGravityPartial objects to the current time. + //! Function to reset the constituent DirectGravityPartial objects to the current time. void resetTimeOfMemberObjects( ) { partialOfDirectGravityOnBodyUndergoingAcceleration_->resetTime( currentTime_ ); partialOfDirectGravityOnCentralBody_->resetTime( currentTime_ ); } - //!! Function to update the parameter partials of the constituent DirectGravityPartial objects. + //! Function to update the parameter partials of the constituent DirectGravityPartial objects. void updateParameterPartialsOfMemberObjects( ) { partialOfDirectGravityOnBodyUndergoingAcceleration_->updateParameterPartials( ); @@ -493,9 +493,9 @@ class ThirdBodyGravityPartial: public AccelerationPartial }; -} +} // namespace acceleration_partials -} +} // namespace tudat #endif // TUDAT_THIRDBODYGRAVITYPARTIAL_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/CMakeLists.txt b/Tudat/Astrodynamics/OrbitDetermination/CMakeLists.txt index eb81211aed..7ad5bce8c1 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/CMakeLists.txt +++ b/Tudat/Astrodynamics/OrbitDetermination/CMakeLists.txt @@ -1,46 +1,18 @@ -# \file CMakeLists.txt - # This is the CMake file for the MissionSegments sub-directory. + # Copyright (c) 2010-2016, Delft University of Technology + # All rigths reserved # - # Path : /Astrodynamics/MissionSegments/ - # Version : 3 - # Check status : Checked - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Author : K. Kumar - # Affiliation : Delft University of Technology - # E-mail address : K.Kumar@tudelft.nl - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Date created : 20 August, 2011 - # Last modified : 26 October, 2011 - # - # References - # - # Notes - # - # Copyright (c) 2010-2011 Delft University of Technology. - # - # This software is protected by national and international copyright. - # Any unauthorized use, reproduction or modification is unlawful and - # will be prosecuted. Commercial and non-private application of the - # software in any form is strictly prohibited unless otherwise granted - # by the authors. - # - # The code is provided without any warranty; without even the implied - # warranty of merchantibility or fitness for a particular purpose. + # This file is part of the Tudat. Redistribution and use in source and + # binary forms, with or without modification, are permitted exclusively + # under the terms of the Modified BSD license. You should have received + # a copy of the license with this file. If not, please or visit: + # http://tudat.tudelft.nl/LICENSE. # # Changelog # YYMMDD Author Comment # 110820 S.M. Persson File created. # 111025 K. Kumar Adapted file to work with Revision 194. # 111026 K. Kumar Adapted file so all headers show in project tree in Qt Creator. - #/ + # set(ACCELERATIONPARTIALSDIR "${ORBITDETERMINATIONDIR}/AccelerationPartials") set(ESTIMATABLEPARAMETERSDIR "${ORBITDETERMINATIONDIR}/EstimatableParameters") diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/CMakeLists.txt b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/CMakeLists.txt index bdaa959b98..020f1959af 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/CMakeLists.txt +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/CMakeLists.txt @@ -1,51 +1,22 @@ -# \file CMakeLists.txt - # This is the CMake file for the MissionSegments sub-directory. + # Copyright (c) 2010-2016, Delft University of Technology + # All rigths reserved # - # Path : /Astrodynamics/MissionSegments/ - # Version : 3 - # Check status : Checked - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Author : K. Kumar - # Affiliation : Delft University of Technology - # E-mail address : K.Kumar@tudelft.nl - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Date created : 20 August, 2011 - # Last modified : 26 October, 2011 - # - # References - # - # Notes - # - # Copyright (c) 2010-2011 Delft University of Technology. - # - # This software is protected by national and international copyright. - # Any unauthorized use, reproduction or modification is unlawful and - # will be prosecuted. Commercial and non-private application of the - # software in any form is strictly prohibited unless otherwise granted - # by the authors. - # - # The code is provided without any warranty; without even the implied - # warranty of merchantibility or fitness for a particular purpose. + # This file is part of the Tudat. Redistribution and use in source and + # binary forms, with or without modification, are permitted exclusively + # under the terms of the Modified BSD license. You should have received + # a copy of the license with this file. If not, please or visit: + # http://tudat.tudelft.nl/LICENSE. # # Changelog # YYMMDD Author Comment # 110820 S.M. Persson File created. # 111025 K. Kumar Adapted file to work with Revision 194. # 111026 K. Kumar Adapted file so all headers show in project tree in Qt Creator. - #/ + # # Set the source files. set(ESTIMATABLE_PARAMETERS_SOURCES "${SRCROOT}${ESTIMATABLEPARAMETERSDIR}/estimatableParameter.cpp" - "${SRCROOT}${ESTIMATABLEPARAMETERSDIR}/initialTranslationalState.cpp" "${SRCROOT}${ESTIMATABLEPARAMETERSDIR}/sphericalHarmonicSineCoefficients.cpp" "${SRCROOT}${ESTIMATABLEPARAMETERSDIR}/sphericalHarmonicCosineCoefficients.cpp" ) diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationRate.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationRate.h index a7678e8658..461556786a 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationRate.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationRate.h @@ -82,8 +82,8 @@ class RotationRate: public EstimatableParameter< double > boost::shared_ptr< ephemerides::SimpleRotationalEphemeris > rotationModel_; }; -} +} // namespace estimatable_parameters -} +} // namespace tudat #endif // TUDAT_CONSTANTROTATIONRATE_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationalOrientation.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationalOrientation.h index 8083135293..a12a586ec9 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationalOrientation.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/constantRotationalOrientation.h @@ -15,8 +15,6 @@ #include "Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/estimatableParameter.h" #include "Tudat/Astrodynamics/Ephemerides/simpleRotationalEphemeris.h" -using std::string; - namespace tudat { @@ -88,8 +86,8 @@ class ConstantRotationalOrientation: public EstimatableParameter< Eigen::VectorX boost::shared_ptr< ephemerides::SimpleRotationalEphemeris > rotationModel_; }; -} +} // namespace estimatable_parameters -} +} // namespace tudat #endif // TUDAT_CONSTANTROTATIONALORIENTATION_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/estimatableParameter.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/estimatableParameter.h index c5246710d6..ea4d1a5c7e 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/estimatableParameter.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/estimatableParameter.h @@ -537,8 +537,8 @@ Eigen::Matrix< InitialStateParameterType, Eigen::Dynamic, 1 > getInitialStateVec return initialStateVector.block( 0, 0, vectorSize, 1 ); } -} +} // namespace estimatable_parameters -} +} // namespace tudat #endif // TUDAT_ESTIMATABLEPARAMETERS_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/gravitationalParameter.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/gravitationalParameter.h index 5ba19c906d..de5da0be94 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/gravitationalParameter.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/gravitationalParameter.h @@ -14,8 +14,6 @@ #include "Tudat/Astrodynamics/Gravitation/gravityFieldModel.h" #include "Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/estimatableParameter.h" -using std::string; - namespace tudat { @@ -81,9 +79,9 @@ class GravitationalParameter: public EstimatableParameter< double > }; -} +} // namespace estimatable_parameters -} +} // namespace tudat #endif // TUDAT_GRAVITATIONALPARAMETER_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/initialTranslationalState.cpp b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/initialTranslationalState.cpp deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/initialTranslationalState.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/initialTranslationalState.h index f70f7cfb83..1bdbd2f294 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/initialTranslationalState.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/initialTranslationalState.h @@ -94,6 +94,12 @@ class InitialTranslationalStateParameter: public EstimatableParameter< Eigen::Ma }; +//! Function to retrieve the size of the estimatable parameter set. +/*! + * Function to retrieve the size of the estimatable parameter set. + * \param estimatableParameterSet Set of estimatable parameters. + * \return Size of parameter set. + */ template< typename InitialStateParameterType = double > int getSingleArcParameterSetSize( boost::shared_ptr< EstimatableParameterSet< InitialStateParameterType > > estimatableParameterSet ) @@ -113,6 +119,12 @@ int getSingleArcParameterSetSize( return totalParameterSetSize; } +//! Function to retrieve the size of the dynamical state. +/*! + * Function to retrieve the size of the dynamical state. + * \param estimatableParameterSet Set of estimatable parameters. + * \return Size of the initial dynamical state. + */ template< typename InitialStateParameterType = double > int getSingleArcInitialDynamicalStateParameterSetSize( boost::shared_ptr< EstimatableParameterSet< InitialStateParameterType > > estimatableParameterSet ) @@ -122,8 +134,8 @@ int getSingleArcInitialDynamicalStateParameterSetSize( } -} +} // namespace estimatable_parameters -} +} // namespace tudat #endif // TUDAT_INITIALTRANSLATIONALSTATE_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/radiationPressureCoefficient.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/radiationPressureCoefficient.h index a721aca531..f09bfca33e 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/radiationPressureCoefficient.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/radiationPressureCoefficient.h @@ -78,8 +78,8 @@ class RadiationPressureCoefficient: public EstimatableParameter< double > boost::shared_ptr< electro_magnetism::RadiationPressureInterface > radiationPressureInterface_; }; -} +} // namespace estimatable_parameters -} +} // namespace tudat #endif // TUDAT_RADIATIONPRESSURECOEFFICIENT_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicCosineCoefficients.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicCosineCoefficients.h index 78a7568fc7..93cc33e93f 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicCosineCoefficients.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicCosineCoefficients.h @@ -114,8 +114,8 @@ class SphericalHarmonicsCosineCoefficients: public EstimatableParameter< Eigen:: int parameterSize_; }; -} +} // namespace estimatable_parameters -} +} // namespace tudat -#endif // SPHERICALHARMONICCOSINECOEFFICIENTS_H +#endif // TUDAT_SPHERICALHARMONICCOSINECOEFFICIENTS_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicSineCoefficients.h b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicSineCoefficients.h index 7000f62f87..ee42f0c5bc 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicSineCoefficients.h +++ b/Tudat/Astrodynamics/OrbitDetermination/EstimatableParameters/sphericalHarmonicSineCoefficients.h @@ -117,8 +117,8 @@ class SphericalHarmonicsSineCoefficients: public EstimatableParameter< Eigen::Ve int parameterSize_; }; -} +} // namespace estimatable_parameters -} +} // namespace tudat -#endif // SPHERICALHARMONICSINECOEFFICIENTS_H +#endif // TUDAT_SPHERICALHARMONICSINECOEFFICIENTS_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/CMakeLists.txt b/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/CMakeLists.txt index c05bc248b5..1a7c3ca183 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/CMakeLists.txt +++ b/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/CMakeLists.txt @@ -1,46 +1,18 @@ -# \file CMakeLists.txt - # This is the CMake file for the MissionSegments sub-directory. + # Copyright (c) 2010-2016, Delft University of Technology + # All rigths reserved # - # Path : /Astrodynamics/MissionSegments/ - # Version : 3 - # Check status : Checked - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Author : K. Kumar - # Affiliation : Delft University of Technology - # E-mail address : K.Kumar@tudelft.nl - # - # Author : S.M. Persson - # Affiliation : McGill University, Department of Mechanical Engineering - # E-mail address : mikael.s.persson@gmail.com - # - # Date created : 20 August, 2011 - # Last modified : 26 October, 2011 - # - # References - # - # Notes - # - # Copyright (c) 2010-2011 Delft University of Technology. - # - # This software is protected by national and international copyright. - # Any unauthorized use, reproduction or modification is unlawful and - # will be prosecuted. Commercial and non-private application of the - # software in any form is strictly prohibited unless otherwise granted - # by the authors. - # - # The code is provided without any warranty; without even the implied - # warranty of merchantibility or fitness for a particular purpose. + # This file is part of the Tudat. Redistribution and use in source and + # binary forms, with or without modification, are permitted exclusively + # under the terms of the Modified BSD license. You should have received + # a copy of the license with this file. If not, please or visit: + # http://tudat.tudelft.nl/LICENSE. # # Changelog # YYMMDD Author Comment # 110820 S.M. Persson File created. # 111025 K. Kumar Adapted file to work with Revision 194. # 111026 K. Kumar Adapted file so all headers show in project tree in Qt Creator. - #/ + # # Set the source files. set(OBSERVATION_PARTIALS_SOURCES diff --git a/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/rotationMatrixPartial.h b/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/rotationMatrixPartial.h index a188337f40..c9ebeb57f0 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/rotationMatrixPartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/ObservationPartials/rotationMatrixPartial.h @@ -210,8 +210,8 @@ typedef std::map< std::pair< estimatable_parameters::EstimatebleParametersEnum, boost::shared_ptr< observation_partials::RotationMatrixPartial > > RotationMatrixPartialNamedList; -} +} // namespace observation_partials -} +} // namespace tudat -#endif +#endif // TUDAT_ROTATIONMATRIXPARTIAL_H diff --git a/Tudat/Astrodynamics/OrbitDetermination/stateDerivativePartial.h b/Tudat/Astrodynamics/OrbitDetermination/stateDerivativePartial.h index ade5e8bc65..596fd8345e 100644 --- a/Tudat/Astrodynamics/OrbitDetermination/stateDerivativePartial.h +++ b/Tudat/Astrodynamics/OrbitDetermination/stateDerivativePartial.h @@ -635,8 +635,8 @@ boost::function< void( Eigen::MatrixXd& ) > getCombinedCurrentVectorParameterFun const int firstPartialSize, const int secondPartialSize, const bool subtractPartials = 0 ); -} +} // namespace orbit_determination -} +} // namespace tudat #endif // TUDAT_STATEDERIVATIVEPARTIAL_H diff --git a/Tudat/Astrodynamics/Propagators/UnitTests/unitTestMultiTypeStatePropagation.cpp b/Tudat/Astrodynamics/Propagators/UnitTests/unitTestMultiTypeStatePropagation.cpp index 999bd35c18..268a92991a 100644 --- a/Tudat/Astrodynamics/Propagators/UnitTests/unitTestMultiTypeStatePropagation.cpp +++ b/Tudat/Astrodynamics/Propagators/UnitTests/unitTestMultiTypeStatePropagation.cpp @@ -15,8 +15,6 @@ #include #include -#include - #include #include @@ -219,7 +217,11 @@ BOOST_AUTO_TEST_CASE( testHybridStateDerivativeModel ) // interpolated from reset dynamics (useCase = 1) for( int useCase = 0; useCase < 2; useCase++ ) { - int simulationCaseToAdd = ( useCase == 0 ) ? ( 0 ) : ( 3 ); + int simulationCaseToAdd = 3; + if( useCase == 0 ) + { + simulationCaseToAdd = 0; + } // Propagate dynamics for translational, mass and combined state. std::map< double, Eigen::VectorXd > translationalState = propagateKeplerOrbitAndMassState( 0 + simulationCaseToAdd ); diff --git a/Tudat/Astrodynamics/Propagators/centralBodyData.h b/Tudat/Astrodynamics/Propagators/centralBodyData.h index c2454449cd..5fbc4b8a0b 100644 --- a/Tudat/Astrodynamics/Propagators/centralBodyData.h +++ b/Tudat/Astrodynamics/Propagators/centralBodyData.h @@ -187,7 +187,7 @@ class CentralBodyData const bool areInputStateLocal = true ) { localInternalState_ = internalState; - if( referenceFrameOriginStates.size( ) != updateOrder_.size( ) )\ + if( referenceFrameOriginStates.size( ) != updateOrder_.size( ) ) { referenceFrameOriginStates.resize( updateOrder_.size( ) ); } diff --git a/Tudat/Astrodynamics/Propagators/environmentUpdateTypes.h b/Tudat/Astrodynamics/Propagators/environmentUpdateTypes.h index 6e9731d836..99c091d7e1 100644 --- a/Tudat/Astrodynamics/Propagators/environmentUpdateTypes.h +++ b/Tudat/Astrodynamics/Propagators/environmentUpdateTypes.h @@ -9,8 +9,8 @@ */ -#ifndef ENVIRONMENTUPDATETYPES_H -#define ENVIRONMENTUPDATETYPES_H +#ifndef TUDAT_ENVIRONMENTUPDATETYPES_H +#define TUDAT_ENVIRONMENTUPDATETYPES_H #include #include @@ -46,7 +46,7 @@ void addEnvironmentUpdates( const std::map< propagators::EnvironmentModelsToUpdate, std::vector< std::string > > updatesToAdd ); -} +} // namespace propagators -} -#endif // ENVIRONMENTUPDATETYPES_H +} // namespace tudat +#endif // TUDAT_ENVIRONMENTUPDATETYPES_H diff --git a/Tudat/Astrodynamics/Propagators/nBodyEnckeStateDerivative.h b/Tudat/Astrodynamics/Propagators/nBodyEnckeStateDerivative.h index 1866a94cd3..8bca2bbd4f 100644 --- a/Tudat/Astrodynamics/Propagators/nBodyEnckeStateDerivative.h +++ b/Tudat/Astrodynamics/Propagators/nBodyEnckeStateDerivative.h @@ -321,8 +321,8 @@ class NBodyEnckeStateDerivative: public NBodyStateDerivative< StateScalarType, T }; -} +} // namespace propagators -} +} // namespace tudat #endif // TUDAT_NBODYENCKESTATEDERIVATIVE_H diff --git a/Tudat/Astrodynamics/Propagators/nBodyStateDerivative.h b/Tudat/Astrodynamics/Propagators/nBodyStateDerivative.h index 2053345c90..9c95f4f51c 100644 --- a/Tudat/Astrodynamics/Propagators/nBodyStateDerivative.h +++ b/Tudat/Astrodynamics/Propagators/nBodyStateDerivative.h @@ -339,7 +339,7 @@ class NBodyStateDerivative: public propagators::SingleStateTypeDerivative< State stateDerivative.setZero( ); - int currentBodyIndex = TUDAT_NAN; + int currentBodyIndex = 0; int currentAccelerationIndex = 0; // Iterate over all bodies with accelerations. diff --git a/Tudat/Astrodynamics/Propagators/stateTransitionMatrixInterface.h b/Tudat/Astrodynamics/Propagators/stateTransitionMatrixInterface.h index 6d3bf88e39..c717d60a40 100644 --- a/Tudat/Astrodynamics/Propagators/stateTransitionMatrixInterface.h +++ b/Tudat/Astrodynamics/Propagators/stateTransitionMatrixInterface.h @@ -1,5 +1,5 @@ -#ifndef STATETRANSITIONMATRIXINTERFACE_H -#define STATETRANSITIONMATRIXINTERFACE_H +#ifndef TUDAT_STATETRANSITIONMATRIXINTERFACE_H +#define TUDAT_STATETRANSITIONMATRIXINTERFACE_H #include @@ -211,7 +211,7 @@ class SingleArcCombinedStateTransitionAndSensitivityMatrixInterface: sensitivityMatrixInterpolator_; }; -} +} // namespace propagators -} -#endif // STATETRANSITIONMATRIXINTERFACE_H +} // namespace tudat +#endif // TUDAT_STATETRANSITIONMATRIXINTERFACE_H diff --git a/Tudat/Astrodynamics/Propagators/variationalEquations.h b/Tudat/Astrodynamics/Propagators/variationalEquations.h index 08590dad05..52ff23457d 100644 --- a/Tudat/Astrodynamics/Propagators/variationalEquations.h +++ b/Tudat/Astrodynamics/Propagators/variationalEquations.h @@ -478,8 +478,8 @@ class VariationalEquations }; -} +} // namespace propagators -} +} // namespace tudat #endif // TUDAT_VARIATIONALEQUATIONS_H diff --git a/Tudat/Astrodynamics/Propulsion/UnitTests/unitTestThrustAcceleration.cpp b/Tudat/Astrodynamics/Propulsion/UnitTests/unitTestThrustAcceleration.cpp index 29c805989a..0b7ae10f2d 100644 --- a/Tudat/Astrodynamics/Propulsion/UnitTests/unitTestThrustAcceleration.cpp +++ b/Tudat/Astrodynamics/Propulsion/UnitTests/unitTestThrustAcceleration.cpp @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -74,8 +73,8 @@ BOOST_AUTO_TEST_CASE( testConstantThrustAcceleration ) double thrustMagnitude = 1.0E3; double specificImpulse = 250.0; - double massRate = thrustMagnitude / ( specificImpulse * physical_constants::SEA_LEVEL_GRAVITATIONAL_ACCELERATION ); + // Define acceleration model settings. std::map< std::string, std::vector< boost::shared_ptr< AccelerationSettings > > > accelerationsOfVehicle; accelerationsOfVehicle[ "Vehicle" ].push_back( boost::make_shared< ThrustAccelerationSettings >( @@ -83,6 +82,7 @@ BOOST_AUTO_TEST_CASE( testConstantThrustAcceleration ) boost::lambda::constant( thrustDirection ) ), boost::make_shared< ConstantThrustEngineSettings >( thrustMagnitude, specificImpulse ) ) ); + accelerationMap[ "Vehicle" ] = accelerationsOfVehicle; bodiesToPropagate.push_back( "Vehicle" ); @@ -103,73 +103,66 @@ BOOST_AUTO_TEST_CASE( testConstantThrustAcceleration ) boost::shared_ptr< IntegratorSettings< > > integratorSettings = boost::make_shared< IntegratorSettings< > > ( rungeKutta4, 0.0, 0.1 ); - - for( unsigned int i = 0; i < 2; i++ ) { - if( i == 0 ) - { - // Create simulation object and propagate dynamics. - SingleArcDynamicsSimulator< > dynamicsSimulator( - bodyMap, integratorSettings, translationalPropagatorSettings, true, false, false ); + // Create simulation object and propagate dynamics. + SingleArcDynamicsSimulator< > dynamicsSimulator( + bodyMap, integratorSettings, translationalPropagatorSettings, true, false, false ); - // Retrieve numerical solutions for state and dependent variables - std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > > numericalSolution = - dynamicsSimulator.getEquationsOfMotionNumericalSolution( ); + // Retrieve numerical solutions for state and dependent variables + std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > > numericalSolution = + dynamicsSimulator.getEquationsOfMotionNumericalSolution( ); - Eigen::Vector3d constantAcceleration = thrustDirection.normalized( ) * thrustMagnitude / vehicleMass; - for( std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > >::const_iterator outputIterator = - numericalSolution.begin( ); outputIterator != numericalSolution.end( ); outputIterator++ ) - { - TUDAT_CHECK_MATRIX_CLOSE_FRACTION( - ( outputIterator->second.segment( 0, 3 ) ), - ( 0.5 * constantAcceleration * std::pow( outputIterator->first, 2.0 ) ), 1.0E-12 ); - TUDAT_CHECK_MATRIX_CLOSE_FRACTION( - ( outputIterator->second.segment( 3, 3 ) ), - ( constantAcceleration * outputIterator->first ), 1.0E-12 ); - } - } - else if( i == 1 ) + Eigen::Vector3d constantAcceleration = thrustDirection.normalized( ) * thrustMagnitude / vehicleMass; + for( std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > >::const_iterator outputIterator = + numericalSolution.begin( ); outputIterator != numericalSolution.end( ); outputIterator++ ) { - std::map< std::string, boost::shared_ptr< basic_astrodynamics::MassRateModel > > massRateModels; - massRateModels[ "Vehicle" ] = ( - createMassRateModel( "Vehicle", boost::make_shared< FromThrustMassModelSettings >( 1 ), - bodyMap, accelerationModelMap ) ); + TUDAT_CHECK_MATRIX_CLOSE_FRACTION( + ( outputIterator->second.segment( 0, 3 ) ), + ( 0.5 * constantAcceleration * std::pow( outputIterator->first, 2.0 ) ), 1.0E-12 ); + TUDAT_CHECK_MATRIX_CLOSE_FRACTION( + ( outputIterator->second.segment( 3, 3 ) ), + ( constantAcceleration * outputIterator->first ), 1.0E-12 ); + } + } + { + std::map< std::string, boost::shared_ptr< basic_astrodynamics::MassRateModel > > massRateModels; + massRateModels[ "Vehicle" ] = ( + createMassRateModel( "Vehicle", boost::make_shared< FromThrustMassModelSettings >( 1 ), + bodyMap, accelerationModelMap ) ); - boost::shared_ptr< PropagatorSettings< double > > massPropagatorSettings = - boost::make_shared< MassPropagatorSettings< double > >( - boost::assign::list_of( "Vehicle" ), massRateModels, + boost::shared_ptr< PropagatorSettings< double > > massPropagatorSettings = + boost::make_shared< MassPropagatorSettings< double > >( + boost::assign::list_of( "Vehicle" ), massRateModels, ( Eigen::Matrix< double, 1, 1 >( ) << vehicleMass ).finished( ), terminationSettings ); - std::vector< boost::shared_ptr< PropagatorSettings< double > > > propagatorSettingsVector; - propagatorSettingsVector.push_back( translationalPropagatorSettings ); - propagatorSettingsVector.push_back( massPropagatorSettings ); + std::vector< boost::shared_ptr< PropagatorSettings< double > > > propagatorSettingsVector; + propagatorSettingsVector.push_back( translationalPropagatorSettings ); + propagatorSettingsVector.push_back( massPropagatorSettings ); - boost::shared_ptr< PropagatorSettings< double > > propagatorSettings = - boost::make_shared< MultiTypePropagatorSettings< double > >( propagatorSettingsVector, terminationSettings ); + boost::shared_ptr< PropagatorSettings< double > > propagatorSettings = + boost::make_shared< MultiTypePropagatorSettings< double > >( propagatorSettingsVector, terminationSettings ); - // Create simulation object and propagate dynamics. - SingleArcDynamicsSimulator< > dynamicsSimulator( - bodyMap, integratorSettings, propagatorSettings, true, false, false ); + // Create simulation object and propagate dynamics. + SingleArcDynamicsSimulator< > dynamicsSimulator( + bodyMap, integratorSettings, propagatorSettings, true, false, false ); - std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > > numericalSolution = - dynamicsSimulator.getEquationsOfMotionNumericalSolution( ); + std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > > numericalSolution = + dynamicsSimulator.getEquationsOfMotionNumericalSolution( ); - for( std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > >::const_iterator outputIterator = - numericalSolution.begin( ); outputIterator != numericalSolution.end( ); outputIterator++ ) - { - double currentMass = vehicleMass - outputIterator->first * massRate; + for( std::map< double, Eigen::Matrix< double, Eigen::Dynamic, 1 > >::const_iterator outputIterator = + numericalSolution.begin( ); outputIterator != numericalSolution.end( ); outputIterator++ ) + { + double currentMass = vehicleMass - outputIterator->first * massRate; - Eigen::Vector3d currentVelocity = thrustDirection.normalized( ) * - specificImpulse * physical_constants::SEA_LEVEL_GRAVITATIONAL_ACCELERATION * - std::log( vehicleMass / currentMass ); - BOOST_CHECK_CLOSE_FRACTION( outputIterator->second( 6 ), currentMass, 1.0E-12 ); - TUDAT_CHECK_MATRIX_CLOSE_FRACTION( - ( outputIterator->second.segment( 3, 3 ) ), currentVelocity, 1.0E-11 ); + Eigen::Vector3d currentVelocity = thrustDirection.normalized( ) * + specificImpulse * physical_constants::SEA_LEVEL_GRAVITATIONAL_ACCELERATION * + std::log( vehicleMass / currentMass ); + BOOST_CHECK_CLOSE_FRACTION( outputIterator->second( 6 ), currentMass, 1.0E-12 ); + TUDAT_CHECK_MATRIX_CLOSE_FRACTION( + ( outputIterator->second.segment( 3, 3 ) ), currentVelocity, 1.0E-11 ); - } } } - std::cout<<"Finished test 1"< #include -#include #include #include diff --git a/Tudat/Astrodynamics/Propulsion/thrustAccelerationModel.h b/Tudat/Astrodynamics/Propulsion/thrustAccelerationModel.h index 197e61f7e3..3b0f9d4a92 100644 --- a/Tudat/Astrodynamics/Propulsion/thrustAccelerationModel.h +++ b/Tudat/Astrodynamics/Propulsion/thrustAccelerationModel.h @@ -217,8 +217,8 @@ class ThrustAcceleration : public basic_astrodynamics::AccelerationModel< Eigen: //! List of environment models that are to be updated before computing the acceleration, /*! * List of environment models that are to be updated before computing the acceleration, - * list is included here to account for versatility of dependencies of thrust model (guidance) algorithms. - */ + * list is included here to account for versatility of dependencies of thrust model (guidance) algorithms. + */ std::map< propagators::EnvironmentModelsToUpdate, std::vector< std::string > > requiredModelUpdates_; }; diff --git a/Tudat/Astrodynamics/Propulsion/thrustFunctions.h b/Tudat/Astrodynamics/Propulsion/thrustFunctions.h index b22b89f160..6c61d27c7d 100644 --- a/Tudat/Astrodynamics/Propulsion/thrustFunctions.h +++ b/Tudat/Astrodynamics/Propulsion/thrustFunctions.h @@ -43,4 +43,4 @@ double computePropellantMassRateFromSpecificImpulse( } // namespace tudat -#endif // THRUSTFUNCTIONS_H +#endif // TUDAT_THRUSTFUNCTIONS_H diff --git a/Tudat/Astrodynamics/Propulsion/thrustGuidance.h b/Tudat/Astrodynamics/Propulsion/thrustGuidance.h index be8a51c065..fcc4093d93 100644 --- a/Tudat/Astrodynamics/Propulsion/thrustGuidance.h +++ b/Tudat/Astrodynamics/Propulsion/thrustGuidance.h @@ -12,8 +12,6 @@ #ifndef TUDAT_THRUSTGUIDANCE_H #define TUDAT_THRUSTGUIDANCE_H -#include - #include #include diff --git a/Tudat/Astrodynamics/ReferenceFrames/UnitTests/unitTestReferenceFrameTransformations.cpp b/Tudat/Astrodynamics/ReferenceFrames/UnitTests/unitTestReferenceFrameTransformations.cpp index 91d960e6fd..e98977747a 100644 --- a/Tudat/Astrodynamics/ReferenceFrames/UnitTests/unitTestReferenceFrameTransformations.cpp +++ b/Tudat/Astrodynamics/ReferenceFrames/UnitTests/unitTestReferenceFrameTransformations.cpp @@ -50,8 +50,6 @@ #define BOOST_TEST_MAIN -#include - #include #include diff --git a/Tudat/Astrodynamics/ReferenceFrames/aerodynamicAngleCalculator.cpp b/Tudat/Astrodynamics/ReferenceFrames/aerodynamicAngleCalculator.cpp index 7db8187518..080a27a58e 100644 --- a/Tudat/Astrodynamics/ReferenceFrames/aerodynamicAngleCalculator.cpp +++ b/Tudat/Astrodynamics/ReferenceFrames/aerodynamicAngleCalculator.cpp @@ -9,7 +9,6 @@ */ #include -#include #include #include @@ -380,7 +379,7 @@ void AerodynamicAngleCalculator::setOrientationAngleFunctions( { if( !angleOfAttackFunction_.empty( ) ) { - std::cout<<"Warning, overriding existing angle of attack function in AerodynamicAngleCalculator"< ephemeris = boost::make_shared< ConstantEphemeris >( diff --git a/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.cpp b/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.cpp index dc10bb311a..02c3a3b3f8 100644 --- a/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.cpp +++ b/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.cpp @@ -8,10 +8,7 @@ * http://tudat.tudelft.nl/LICENSE. */ -#include - #include "Tudat/Astrodynamics/BasicAstrodynamics/physicalConstants.h" - #include "Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.h" namespace tudat diff --git a/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.h b/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.h index 6b3c099de6..1d872879d8 100644 --- a/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.h +++ b/Tudat/Astrodynamics/Relativity/relativisticLightTimeCorrection.h @@ -8,8 +8,8 @@ * http://tudat.tudelft.nl/LICENSE. */ -#ifndef RELATIVISTICLIGHTTIMECORRECTIONS_H -#define RELATIVISTICLIGHTTIMECORRECTIONS_H +#ifndef TUDAT_RELATIVISTICLIGHTTIMECORRECTIONS_H +#define TUDAT_RELATIVISTICLIGHTTIMECORRECTIONS_H #include "Tudat/Astrodynamics/BasicAstrodynamics/physicalConstants.h" #include @@ -44,7 +44,7 @@ double calculateFirstOrderLightTimeCorrectionFromCentralBody( const double bodyG const Eigen::Vector3d& receiverPosition, const Eigen::Vector3d& centralBodyPosition, const double ppnParameterGamma = 1.0 ); -} +} // namespace relativity -} -#endif // RELATIVISTICLIGHTTIMECORRECTIONS_H +} // namespace tudat +#endif // TUDAT_RELATIVISTICLIGHTTIMECORRECTIONS_H diff --git a/Tudat/Astrodynamics/SystemModels/engineModel.h b/Tudat/Astrodynamics/SystemModels/engineModel.h index fbf75acb0d..ea044e9c1b 100644 --- a/Tudat/Astrodynamics/SystemModels/engineModel.h +++ b/Tudat/Astrodynamics/SystemModels/engineModel.h @@ -160,8 +160,8 @@ class DirectEngineModel: public EngineModel boost::function< double( ) > massFlowFunction_; }; -} +} // namespace system_models -} +} // namespace tudat #endif // TUDAT_ENGINEMODEL_H diff --git a/Tudat/Astrodynamics/SystemModels/vehicleSystems.h b/Tudat/Astrodynamics/SystemModels/vehicleSystems.h index 415e0a8920..b3ca7029ef 100644 --- a/Tudat/Astrodynamics/SystemModels/vehicleSystems.h +++ b/Tudat/Astrodynamics/SystemModels/vehicleSystems.h @@ -80,8 +80,8 @@ class VehicleSystems }; -} +} // namespace system_models -} +} // namespace tudat #endif // TUDAT_VEHICLESYSTEMS_H diff --git a/Tudat/Basics/utilities.h b/Tudat/Basics/utilities.h index 31ce9332cf..c3d5e5eba2 100644 --- a/Tudat/Basics/utilities.h +++ b/Tudat/Basics/utilities.h @@ -1,5 +1,17 @@ -#ifndef UTILITIES_H -#define UTILITIES_H +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved + * + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. + */ + +#ifndef TUDAT_UTILITIES_H +#define TUDAT_UTILITIES_H + +#include #include #include @@ -121,8 +133,8 @@ void printMapContents( const std::map< S, T >& mapToPrint) } } -} +} // namespace utilities -} +} // namespace tudat -#endif // UTILITIES_H +#endif // TUDAT_UTILITIES_H diff --git a/Tudat/InputOutput/UnitTests/unitTestMissileDatcomData.cpp b/Tudat/InputOutput/UnitTests/unitTestMissileDatcomData.cpp index 17be0c965b..0dea4bd5d7 100644 --- a/Tudat/InputOutput/UnitTests/unitTestMissileDatcomData.cpp +++ b/Tudat/InputOutput/UnitTests/unitTestMissileDatcomData.cpp @@ -62,32 +62,31 @@ BOOST_AUTO_TEST_SUITE( test_missile_datcom_data ) BOOST_AUTO_TEST_CASE( testMissileDatcomData ) { using namespace input_output; - using std::string; // Read and process data file. - string fileLocation = getTudatRootPath( ) + std::string fileLocation = getTudatRootPath( ) + "InputOutput/UnitTests/inputForBenchMarkMissileDatcomData.dat"; MissileDatcomData myMissileDatcomData( fileLocation ); // Set name of file and path to write to and from. - string outputFileName = getTudatRootPath( ) + "InputOutput/UnitTests/bodyTailConfiguration"; + std::string outputFileName = getTudatRootPath( ) + "InputOutput/UnitTests/bodyTailConfiguration"; // Write files for coefficients at each angle of attack. myMissileDatcomData.writeCoefficientsToFile( outputFileName, 9, 2 ); // Read benchmark files and check if all entries are equal to those written by DatcomData - string totalPath; + std::string totalPath; Eigen::MatrixXd benchmarkFile, tudatFile; for ( int i = 0; i < 5; i++ ) { // Read file just written - totalPath = outputFileName + "_" + boost::lexical_cast< string >( i ); + totalPath = outputFileName + "_" + boost::lexical_cast< std::string >( i ); tudatFile = readMatrixFromFile( totalPath ); // Read benchmark file totalPath = getTudatRootPath( ) + "InputOutput/UnitTests/benchmark_" - + boost::lexical_cast< string >( i ); + + boost::lexical_cast< std::string >( i ); benchmarkFile = readMatrixFromFile( totalPath ); // Iterate over all entries and check values. diff --git a/Tudat/InputOutput/missileDatcomData.cpp b/Tudat/InputOutput/missileDatcomData.cpp index c642ad3949..fb8da89df7 100644 --- a/Tudat/InputOutput/missileDatcomData.cpp +++ b/Tudat/InputOutput/missileDatcomData.cpp @@ -54,8 +54,6 @@ namespace input_output using unit_conversions::convertDegreesToRadians; using std::iterator; -using std::string; -using std::vector; //! Constructor that reads and processes Missile Datcom output. MissileDatcomData::MissileDatcomData( const std::string& fileNameAndPath ) @@ -65,13 +63,13 @@ MissileDatcomData::MissileDatcomData( const std::string& fileNameAndPath ) } //! Function to convert the MissileDatcomData. -void MissileDatcomData::convertDatcomData( const vector< double >& datcomData ) +void MissileDatcomData::convertDatcomData( const std::vector< double >& datcomData ) { - vector< double > datcomDataToBeConverted = datcomData; + std::vector< double > datcomDataToBeConverted = datcomData; // Add an extra item at the begin, such that the first real value is at entry 1. // The same indices as described in the MissileDatcom user manual can now be used. - vector< double >::iterator it; + std::vector< double >::iterator it; it = datcomDataToBeConverted.begin( ); datcomDataToBeConverted.insert( it,-0.0 ); @@ -210,7 +208,7 @@ void MissileDatcomData::writeCoefficientsToFile( const std::string& fileNameBase // Make filename for specific angle of attack. std::ostringstream stringstream; stringstream << fileNameBase << "_" << i; - string fileName = stringstream.str( ); + std::string fileName = stringstream.str( ); // Open output file. std::ofstream outputFile; diff --git a/Tudat/InputOutput/missileDatcomReader.cpp b/Tudat/InputOutput/missileDatcomReader.cpp index ef8b1a6c16..f9baa64df9 100644 --- a/Tudat/InputOutput/missileDatcomReader.cpp +++ b/Tudat/InputOutput/missileDatcomReader.cpp @@ -52,10 +52,6 @@ namespace tudat namespace input_output { -using std::string; -using std::stringstream; -using std::vector; - //! Default constructor. MissileDatcomReader::MissileDatcomReader ( const std::string& fileNameAndPath ) : dataFile_( ) { @@ -93,7 +89,7 @@ void MissileDatcomReader::readFor004( const std::string& fileNameAndPath ) } //! Open data file. -void MissileDatcomReader::openFile( const string& fileNameAndPath ) +void MissileDatcomReader::openFile( const std::string& fileNameAndPath ) { // Open data file. dataFile_.open( fileNameAndPath.c_str( ), std::ios::binary ); @@ -114,16 +110,16 @@ void MissileDatcomReader::openFile( const string& fileNameAndPath ) } //! Function to split a string consisting of line of entries in smaller strings. -void MissileDatcomReader::split( const string& dataString, char separator, - vector< string >& dataVector ) +void MissileDatcomReader::split( const std::string& dataString, char separator, + std::vector< std::string >& dataVector ) { - string::size_type i = 0; - string::size_type j = dataString.find( separator ); + std::string::size_type i = 0; + std::string::size_type j = dataString.find( separator ); // Loop over the whole string and place characters into new string until the separator is // found. Then start with a new string at the next entry in the vector. Until the end of the // original string is reached. - while ( j != string::npos ) + while ( j != std::string::npos ) { // to prevent placements of empty entries if multiple seperators after eachother are placed. if ( !dataString.substr( i, j-i ).empty() ) @@ -134,7 +130,7 @@ void MissileDatcomReader::split( const string& dataString, char separator, i = ++j; j = dataString.find( separator, j ); - if ( j == string::npos ) + if ( j == std::string::npos ) { dataVector.push_back( dataString.substr(i, dataString.length( ) ) ); } @@ -142,7 +138,7 @@ void MissileDatcomReader::split( const string& dataString, char separator, } //! Read and store data. -void MissileDatcomReader::readAndStoreData( const string& skipKeyword ) +void MissileDatcomReader::readAndStoreData( const std::string& skipKeyword ) { // Local variable for reading a single line std::string stringOfData; @@ -158,7 +154,7 @@ void MissileDatcomReader::readAndStoreData( const string& skipKeyword ) // Check if string doesn't start with set starting character, if string // is not empty, and if the skip keyword is not in the string. - if ( ( ( !skipKeyword.empty( ) && stringOfData.find( skipKeyword ) == string::npos ) + if ( ( ( !skipKeyword.empty( ) && stringOfData.find( skipKeyword ) == std::string::npos ) || ( skipKeyword.empty( ) ) ) && !stringOfData.empty( ) ) { // Store string in container. diff --git a/Tudat/InputOutput/parseSolarActivityData.cpp b/Tudat/InputOutput/parseSolarActivityData.cpp index b10401862b..61bd49e9f6 100644 --- a/Tudat/InputOutput/parseSolarActivityData.cpp +++ b/Tudat/InputOutput/parseSolarActivityData.cpp @@ -38,6 +38,7 @@ #include "Tudat/InputOutput/fixedWidthParser.h" #include +#include #include diff --git a/Tudat/InputOutput/parseSolarActivityData.h b/Tudat/InputOutput/parseSolarActivityData.h index 77c05f3c47..952f434a73 100644 --- a/Tudat/InputOutput/parseSolarActivityData.h +++ b/Tudat/InputOutput/parseSolarActivityData.h @@ -39,7 +39,6 @@ #define TUDAT_PARSESOLARACTIVITY_H #include -#include #include @@ -132,8 +131,6 @@ namespace input_output namespace solar_activity { -using std::string; - //! Solar activity parser class. /*! * This class implements a fixed width parser specifically designed for parsing solar activity diff --git a/Tudat/InputOutput/solarActivityData.h b/Tudat/InputOutput/solarActivityData.h index 4023706231..ec6bc93a6f 100644 --- a/Tudat/InputOutput/solarActivityData.h +++ b/Tudat/InputOutput/solarActivityData.h @@ -1,26 +1,11 @@ -/* Copyright (c) 2010-2012, Delft University of Technology - * All rights reserved. +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - Neither the name of the Delft University of Technology nor the names of its contributors - * may be used to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. * * Changelog * YYMMDD Author Comment @@ -201,4 +186,4 @@ SolarActivityDataMap readSolarActivityData( std::string filePath ) ; } // namespace input_output } // namespace tudat -#endif //TUDAT_SOLAR_ACTIVITY_DATA_H +#endif // TUDAT_SOLAR_ACTIVITY_DATA_H diff --git a/Tudat/InputOutput/twoLineElementData.cpp b/Tudat/InputOutput/twoLineElementData.cpp index f4dd526d3d..af4fc33281 100644 --- a/Tudat/InputOutput/twoLineElementData.cpp +++ b/Tudat/InputOutput/twoLineElementData.cpp @@ -76,21 +76,19 @@ TwoLineElementData::TwoLineElementData( ) std::ostream& operator<<( std::ostream& stream, TwoLineElementData& twoLineElementData ) { - // Using declarations. - using std::endl; - stream << "This is a TLE data object." << endl; - stream << "The converted TLE information is stored as: " << endl; + stream << "This is a TLE data object." << std::endl; + stream << "The converted TLE information is stored as: " << std::endl; - stream << "TLE line 0: " << endl; + stream << "TLE line 0: " << std::endl; for ( unsigned int i = 0; i < twoLineElementData.objectName.size( ); i++ ) { stream << twoLineElementData.objectName.at( i ) << " "; } - stream << endl; - stream << twoLineElementData.objectNameString << endl; + stream << std::endl; + stream << twoLineElementData.objectNameString << std::endl; - stream << "TLE line 1: " << endl; + stream << "TLE line 1: " << std::endl; stream << twoLineElementData.lineNumberLine1 << " "; stream << twoLineElementData.objectIdentificationNumber << " "; stream << twoLineElementData.tleClassification << " "; @@ -110,9 +108,9 @@ std::ostream& operator<<( std::ostream& stream, stream << twoLineElementData.bStar << " "; stream << twoLineElementData.orbitalModel << " "; stream << twoLineElementData.tleNumber << " "; - stream << twoLineElementData.modulo10CheckSumLine1 << endl; + stream << twoLineElementData.modulo10CheckSumLine1 << std::endl; - stream << "TLE line 2: " << endl; + stream << "TLE line 2: " << std::endl; stream << twoLineElementData.lineNumberLine2 << " "; stream << twoLineElementData.objectIdentificationNumberLine2 << " "; stream << twoLineElementData.TLEKeplerianElements( @@ -127,14 +125,14 @@ std::ostream& operator<<( std::ostream& stream, stream << twoLineElementData.meanMotionInRevolutionsPerDay << " "; stream << twoLineElementData.revolutionNumber << " "; stream << twoLineElementData.totalRevolutionNumber << " "; - stream << twoLineElementData.modulo10CheckSumLine2 << endl; + stream << twoLineElementData.modulo10CheckSumLine2 << std::endl; - stream << "Calculated values: " << endl; + stream << "Calculated values: " << std::endl; stream << "Semi-Major Axis = " << twoLineElementData.TLEKeplerianElements( orbital_element_conversions::semiMajorAxisIndex ) - << endl; - stream << "Perigee = " << twoLineElementData.perigee << endl; - stream << "Apogee = " << twoLineElementData.apogee << endl; + << std::endl; + stream << "Perigee = " << twoLineElementData.perigee << std::endl; + stream << "Apogee = " << twoLineElementData.apogee << std::endl; // Return stream. return stream; diff --git a/Tudat/InputOutput/twoLineElementsTextFileReader.cpp b/Tudat/InputOutput/twoLineElementsTextFileReader.cpp index 67a2bae620..c5ba206b24 100644 --- a/Tudat/InputOutput/twoLineElementsTextFileReader.cpp +++ b/Tudat/InputOutput/twoLineElementsTextFileReader.cpp @@ -85,12 +85,6 @@ namespace input_output // Using declarations. using mathematical_constants::PI; -using std::string; -using std::stringstream; -using std::endl; -using std::vector; -using std::multimap; -using std::pair; //! Open data file. void TwoLineElementsTextFileReader::openFile( ) @@ -165,7 +159,7 @@ void TwoLineElementsTextFileReader::readAndStoreData( ) if ( ( ( !startingCharacter_.empty( ) && stringOfData_.substr( 0, 1 ) .compare( startingCharacter_ ) != 0 ) || ( !skipKeyword_.empty( ) && stringOfData_.find( skipKeyword_ ) - == string::npos ) + == std::string::npos ) || ( startingCharacter_.empty( ) && skipKeyword_.empty( ) ) ) && !stringOfData_.empty( ) ) { @@ -206,7 +200,7 @@ void TwoLineElementsTextFileReader::stripEndOfLineCharacters( { // Declare local variables. // Declare string iterator. - string::iterator iteratorString_; + std::string::iterator iteratorString_; // Loop through all the strings stored in the container. for ( LineBasedStringDataMap::iterator iteratorContainerOfDataFromFile_ @@ -250,7 +244,7 @@ void TwoLineElementsTextFileReader::storeTwoLineElementData( ) twoLineElementData_.resize( numberOfObjects_ ); // Create vector of the three lines of a single object's TLE data as strings. - vector< string > twoLineElementString_( 3 ); + std::vector< std::string > twoLineElementString_( 3 ); // Create the object counter. unsigned int objectNumberCounter_ = 0; @@ -303,9 +297,9 @@ void TwoLineElementsTextFileReader::storeTwoLineElementData( ) } // Initiate a stringstream for each line. - stringstream line0StringStream_( stringstream::in | stringstream::out ); - stringstream line1StringStream_( stringstream::in | stringstream::out ); - stringstream line2StringStream_( stringstream::in | stringstream::out ); + std::stringstream line0StringStream_( std::stringstream::in | std::stringstream::out ); + std::stringstream line1StringStream_( std::stringstream::in | std::stringstream::out ); + std::stringstream line2StringStream_( std::stringstream::in | std::stringstream::out ); // Insert the strings into the stringstreams if ( numberOfLinesPerTwoLineElementDatum_ == 3 ) @@ -320,7 +314,7 @@ void TwoLineElementsTextFileReader::storeTwoLineElementData( ) if ( numberOfLinesPerTwoLineElementDatum_ == 3 ) { // Declare string containing part of name of object. - string namePart_; + std::string namePart_; // Loop through the stringstream and read words that constitute name of // object. Store name parts in objectName storage container. @@ -584,19 +578,19 @@ void TwoLineElementsTextFileReader::storeTwoLineElementData( ) } //! Checks the integrity of the TLE input file. -multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileIntegrity( ) +std::multimap< int, std::string > TwoLineElementsTextFileReader::checkTwoLineElementsFileIntegrity( ) { // Create vector of the three lines of a TLE as strings - vector< string > twoLineElementString_( 3 ); + std::vector< std::string > twoLineElementString_( 3 ); // Boolean which turns to true if one of the tests is not passed. bool isObjectErroneous = false; // Vector of object numbers of objects with corrupted TLE data. - vector< int > corruptedTwoLineElementDataPositions_; + std::vector< int > corruptedTwoLineElementDataPositions_; // Multimap of corrupted TLE errors. - multimap< int, string > corruptedTwoLineElementDataErrors_; + std::multimap< int, std::string > corruptedTwoLineElementDataErrors_; // Loop is started over the entire structure of objects, // multiple checks are performed per TLE, if a check is not passed boolean @@ -624,7 +618,7 @@ multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileI if ( twoLineElementData_.at( i ).lineNumberLine1 != 1 ) { corruptedTwoLineElementDataErrors_.insert( - pair< int, string >( i, "Incorrect line-1 leading integer." ) ); + std::pair< int, std::string >( i, "Incorrect line-1 leading integer." ) ); isObjectErroneous = true; } @@ -633,7 +627,7 @@ multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileI if ( twoLineElementData_.at( i ).lineNumberLine2 != 2 ) { corruptedTwoLineElementDataErrors_.insert( - pair< int, string >( i, "Incorrect line-2 leading integer." ) ); + std::pair< int, std::string >( i, "Incorrect line-2 leading integer." ) ); isObjectErroneous = true; } @@ -642,7 +636,7 @@ multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileI && twoLineElementData_.at( i ).tleClassification != 'C' ) { corruptedTwoLineElementDataErrors_.insert( - pair< int, string >( i, "Invalid TLE classification." ) ); + std::pair< int, std::string >( i, "Invalid TLE classification." ) ); isObjectErroneous = true; } @@ -651,7 +645,7 @@ multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileI if ( twoLineElementData_.at( i ).orbitalModel != 0 ) { corruptedTwoLineElementDataErrors_.insert( - pair< int, string >( i, "Incorrect orbital model." ) ); + std::pair< int, std::string >( i, "Incorrect orbital model." ) ); isObjectErroneous = true; } @@ -695,7 +689,7 @@ multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileI if ( line1Modulo10Sum_ != twoLineElementData_.at( i ).modulo10CheckSumLine1 ) { corruptedTwoLineElementDataErrors_.insert( - pair< int, string >( i, "Incorrect line-1 modulo-10 checksum." ) ); + std::pair< int, std::string >( i, "Incorrect line-1 modulo-10 checksum." ) ); isObjectErroneous = true; } @@ -725,7 +719,7 @@ multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileI if ( line2Modulo10Sum_ != twoLineElementData_.at( i ).modulo10CheckSumLine2 ) { corruptedTwoLineElementDataErrors_.insert( - pair< int, string >( i, "Incorrect line-2 modulo-10 checksum." ) ); + std::pair< int, std::string >( i, "Incorrect line-2 modulo-10 checksum." ) ); isObjectErroneous = true; } @@ -736,7 +730,7 @@ multimap< int, string > TwoLineElementsTextFileReader::checkTwoLineElementsFileI twoLineElementData_.at( i ).objectIdentificationNumberLine2 ) { corruptedTwoLineElementDataErrors_.insert( - pair< int, string >( + std::pair< int, std::string >( i, "Line-1 and line-2 object idenfitication number mismatch." ) ); isObjectErroneous = true; diff --git a/Tudat/Mathematics/BasicMathematics/coordinateConversions.h b/Tudat/Mathematics/BasicMathematics/coordinateConversions.h index 4136413990..9a522dcd3a 100644 --- a/Tudat/Mathematics/BasicMathematics/coordinateConversions.h +++ b/Tudat/Mathematics/BasicMathematics/coordinateConversions.h @@ -66,6 +66,8 @@ #ifndef TUDAT_COORDINATE_CONVERSIONS_H #define TUDAT_COORDINATE_CONVERSIONS_H +#include + #include #include "Tudat/Mathematics/BasicMathematics/linearAlgebraTypes.h" diff --git a/Tudat/Mathematics/GeometricShapes/capsule.cpp b/Tudat/Mathematics/GeometricShapes/capsule.cpp index 883dc5a1bf..2226074408 100644 --- a/Tudat/Mathematics/GeometricShapes/capsule.cpp +++ b/Tudat/Mathematics/GeometricShapes/capsule.cpp @@ -169,15 +169,13 @@ Capsule::Capsule( const double noseRadius, //! Overload ostream to print class information. std::ostream &operator<<( std::ostream &stream, Capsule& capsule ) { - using std::endl; - - stream << "This is a capsule." << endl; - stream << "The defining parameters are: "<< endl - << "Nose radius: " << capsule.getNoseRadius( ) << endl - << "Mid radius: " << capsule.getMiddleRadius( ) << endl - << "Rear length: " << capsule.getRearLength( ) << endl - << "Rear angle: " << capsule.getRearAngle( ) << endl - << "Side radius: " << capsule.getSideRadius( )<< endl; + stream << "This is a capsule." << std::endl; + stream << "The defining parameters are: "<< std::endl + << "Nose radius: " << capsule.getNoseRadius( ) << std::endl + << "Mid radius: " << capsule.getMiddleRadius( ) << std::endl + << "Rear length: " << capsule.getRearLength( ) << std::endl + << "Rear angle: " << capsule.getRearAngle( ) << std::endl + << "Side radius: " << capsule.getSideRadius( )<< std::endl; return stream; } diff --git a/Tudat/Mathematics/GeometricShapes/conicalFrustum.cpp b/Tudat/Mathematics/GeometricShapes/conicalFrustum.cpp index 6cb0db2245..30520f2f85 100644 --- a/Tudat/Mathematics/GeometricShapes/conicalFrustum.cpp +++ b/Tudat/Mathematics/GeometricShapes/conicalFrustum.cpp @@ -52,7 +52,6 @@ namespace geometric_shapes { using mathematical_constants::PI; -using std::endl; using std::sin; using std::cos; @@ -238,14 +237,14 @@ double ConicalFrustum::getParameter( const int index ) //! Overload ostream to print class information. std::ostream &operator<<( std::ostream &stream, ConicalFrustum& conicalFrustum ) { - stream << "This is a conical frustum geometry." << endl; + stream << "This is a conical frustum geometry." << std::endl; stream << "The circumferential angle runs from: " << conicalFrustum.getMinimumAzimuthAngle( ) * 180.0 / PI << " degrees to " - << conicalFrustum.getMaximumAzimuthAngle( ) * 180.0 / PI << " degrees" << endl; - stream << "The start radius is: " << conicalFrustum.getStartRadius( ) << endl; - stream << "The length is: " << conicalFrustum.getLength( ) << endl; + << conicalFrustum.getMaximumAzimuthAngle( ) * 180.0 / PI << " degrees" << std::endl; + stream << "The start radius is: " << conicalFrustum.getStartRadius( ) << std::endl; + stream << "The length is: " << conicalFrustum.getLength( ) << std::endl; stream << "The cone half angle is: " << conicalFrustum.getConeHalfAngle( ) * 180.0 / PI - << " degrees" << endl; + << " degrees" << std::endl; // Return stream. return stream; diff --git a/Tudat/Mathematics/GeometricShapes/surfaceGeometry.h b/Tudat/Mathematics/GeometricShapes/surfaceGeometry.h index f9c9bbe924..2cb1cbc95d 100644 --- a/Tudat/Mathematics/GeometricShapes/surfaceGeometry.h +++ b/Tudat/Mathematics/GeometricShapes/surfaceGeometry.h @@ -1,13 +1,11 @@ -/*! Copyright (c) 2010-2012 Delft University of Technology. +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved * - * This software is protected by national and international copyright. - * Any unauthorized use, reproduction or modification is unlawful and - * will be prosecuted. Commercial and non-private application of the - * software in any form is strictly prohibited unless otherwise granted - * by the authors. - * - * The code is provided without any warranty; without even the implied - * warranty of merchantibility or fitness for a particular purpose. + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. * * Changelog * YYMMDD Author Comment @@ -23,15 +21,8 @@ * */ -// Temporary notes (move to class/function doxygen): -// -// ` comments. -// 110204 K. Kumar Minor comment and layout modifications. -// 110905 S. Billemont Reorganized includes. -// Moved (con/de)structors and getter/setters to header. - -#ifndef SURFACEGEOMETRY_H -#define SURFACEGEOMETRY_H +#ifndef TUDAT_SURFACEGEOMETRY_H +#define TUDAT_SURFACEGEOMETRY_H #include @@ -62,8 +53,6 @@ class SurfaceGeometry private: }; -} - -#endif // SURFACEGEOMETRY_H +} // namespace tudat -// End of file. +#endif // TUDAT_SURFACEGEOMETRY_H diff --git a/Tudat/Mathematics/Interpolators/hermiteCubicSplineInterpolator.h b/Tudat/Mathematics/Interpolators/hermiteCubicSplineInterpolator.h index 78418ae2f5..d1da4b1d77 100644 --- a/Tudat/Mathematics/Interpolators/hermiteCubicSplineInterpolator.h +++ b/Tudat/Mathematics/Interpolators/hermiteCubicSplineInterpolator.h @@ -185,8 +185,8 @@ class HermiteCubicSplineInterpolator : //! Typede for cubic hermite spline with double (in)dependent variables. typedef HermiteCubicSplineInterpolator< double, double > HermiteCubicSplineInterpolatorDouble; -} //namespace tudat +} // namespace interpolators -} //namespace interpolators +} // namespace tudat #endif // TUDAT_HERMITE_CUBIC_SPLINE_INTERPOLATOR_H diff --git a/Tudat/Mathematics/Interpolators/lagrangeInterpolator.h b/Tudat/Mathematics/Interpolators/lagrangeInterpolator.h index e8cbc19e8b..e38f4f6fc0 100644 --- a/Tudat/Mathematics/Interpolators/lagrangeInterpolator.h +++ b/Tudat/Mathematics/Interpolators/lagrangeInterpolator.h @@ -475,7 +475,7 @@ class LagrangeInterpolator : public OneDimensionalInterpolator< IndependentVaria //! Typedef for LagrangeInterpolator with double as both its dependent and independent data type. typedef LagrangeInterpolator< double, double > LagrangeInterpolatorDouble; -} +} // namespace interpolators -} +} // namespace tudat #endif // TUDAT_LAGRANGEINTERPOLATOR_H diff --git a/Tudat/Mathematics/NumericalIntegrators/createNumericalIntegrator.h b/Tudat/Mathematics/NumericalIntegrators/createNumericalIntegrator.h index 3aa2b12feb..a741250ebe 100644 --- a/Tudat/Mathematics/NumericalIntegrators/createNumericalIntegrator.h +++ b/Tudat/Mathematics/NumericalIntegrators/createNumericalIntegrator.h @@ -288,8 +288,8 @@ DependentVariableType > > createFixedStepSizeIntegrator( return integrator; } -} +} // namespace numerical_integrators -} +} // namespace tudat #endif // TUDAT_CREATENUMERICALINTEGRATOR_H diff --git a/Tudat/Mathematics/NumericalIntegrators/rungeKutta4Integrator.h b/Tudat/Mathematics/NumericalIntegrators/rungeKutta4Integrator.h index d0607bbee7..b922107463 100644 --- a/Tudat/Mathematics/NumericalIntegrators/rungeKutta4Integrator.h +++ b/Tudat/Mathematics/NumericalIntegrators/rungeKutta4Integrator.h @@ -257,7 +257,7 @@ typedef boost::shared_ptr< RungeKutta4IntegratorXd > RungeKutta4IntegratorXdPoin */ typedef boost::shared_ptr< RungeKutta4Integratord > RungeKutta4IntegratordPointer; -} // namespace integrators +} // namespace numerical_integrators } // namespace tudat #endif // TUDAT_RUNGE_KUTTA_4_INTEGRATOR_H diff --git a/Tudat/Mathematics/Statistics/boostProbabilityDistributions.h b/Tudat/Mathematics/Statistics/boostProbabilityDistributions.h index 21fecb0686..5bd4da02c0 100644 --- a/Tudat/Mathematics/Statistics/boostProbabilityDistributions.h +++ b/Tudat/Mathematics/Statistics/boostProbabilityDistributions.h @@ -8,8 +8,8 @@ * http://tudat.tudelft.nl/LICENSE. */ -#ifndef BOOSTPROBABILITYDISTRIBUTIONS_H -#define BOOSTPROBABILITYDISTRIBUTIONS_H +#ifndef TUDAT_BOOSTPROBABILITYDISTRIBUTIONS_H +#define TUDAT_BOOSTPROBABILITYDISTRIBUTIONS_H #include @@ -105,9 +105,9 @@ class BoostContinuousProbabilityDistribution: public InvertibleContinuousProbabi boost::shared_ptr< InvertibleContinuousProbabilityDistribution< double > > createBoostRandomVariable( const ContinuousBoostStatisticalDistributions boostDistribution, const std::vector< double >& parameters ); -} +} // namespace statistics -} +} // namespace tudat -#endif // BOOSTPROBABILITYDISTRIBUTIONS_H +#endif // TUDAT_BOOSTPROBABILITYDISTRIBUTIONS_H diff --git a/Tudat/Mathematics/Statistics/continuousProbabilityDistributions.h b/Tudat/Mathematics/Statistics/continuousProbabilityDistributions.h index 5941abc5ef..e5d8caaa84 100644 --- a/Tudat/Mathematics/Statistics/continuousProbabilityDistributions.h +++ b/Tudat/Mathematics/Statistics/continuousProbabilityDistributions.h @@ -106,8 +106,8 @@ class InvertibleContinuousProbabilityDistribution: public ContinuousProbabilityD virtual double evaluateInverseCdf( const IndependentVariableType independentVariable ) = 0; }; -} +} // namespace statistics -} +} // namespace tudat -#endif // CONTINUOUSPROBABILITYDISTRIBUTIONS_H +#endif // TUDAT_CONTINUOUSPROBABILITYDISTRIBUTIONS_H diff --git a/Tudat/Mathematics/Statistics/randomVariableGenerator.h b/Tudat/Mathematics/Statistics/randomVariableGenerator.h index 6bcd086093..4ce9525696 100644 --- a/Tudat/Mathematics/Statistics/randomVariableGenerator.h +++ b/Tudat/Mathematics/Statistics/randomVariableGenerator.h @@ -136,8 +136,8 @@ boost::shared_ptr< RandomVariableGenerator< double > > createBoostContinuousRand const ContinuousBoostStatisticalDistributions boostDistribution, const std::vector< double >& parameters, const double seed ); -} +} // namespace statistics -} +} // namespace tudat -#endif // RANDOMVARIABLEGENERATION_H +#endif // TUDAT_RANDOMVARIABLEGENERATION_H diff --git a/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.cpp b/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.cpp index 9d2266df45..da4d040acd 100644 --- a/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.cpp +++ b/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.cpp @@ -255,7 +255,7 @@ boost::shared_ptr< aerodynamics::TrimOrientationCalculator > setTrimmedCondition return setTrimmedConditions( bodyWithFlightConditions->getFlightConditions( ) ); } -//! Function that must be called to link the EntryGuidance object to the simulation +//! Function that must be called to link the AerodynamicGuidance object to the simulation void setGuidanceAnglesFunctions( const boost::shared_ptr< aerodynamics::AerodynamicGuidance > aerodynamicGuidance, const boost::shared_ptr< reference_frames::AerodynamicAngleCalculator > angleCalculator ) @@ -267,7 +267,7 @@ void setGuidanceAnglesFunctions( boost::bind( &aerodynamics::AerodynamicGuidance::updateGuidance, aerodynamicGuidance,_1 ) ); } -//! Function that must be called to link the EntryGuidance object to the simulation +//! Function that must be called to link the AerodynamicGuidance object to the simulation void setGuidanceAnglesFunctions( const boost::shared_ptr< aerodynamics::AerodynamicGuidance > aerodynamicGuidance, const boost::shared_ptr< simulation_setup::Body > bodyWithAngles ) diff --git a/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.h b/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.h index 4b337e3bab..4a9fbe7b4d 100644 --- a/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.h +++ b/Tudat/SimulationSetup/EnvironmentSetup/createFlightConditions.h @@ -634,9 +634,9 @@ boost::shared_ptr< aerodynamics::TrimOrientationCalculator > setTrimmedCondition const boost::shared_ptr< Body > bodyWithFlightConditions ); -//! Function that must be called to link the EntryGuidance object to the simulation +//! Function that must be called to link the AerodynamicGuidance object to the simulation /*! - * Function that must be called to link the EntryGuidance object to the simulation + * Function that must be called to link the AerodynamicGuidance object to the simulation * \param aerodynamicGuidance Object computing the current aerodynamic angles. * \param angleCalculator Object that handles all aerodynamic angles in the numerical propagation */ @@ -644,9 +644,9 @@ void setGuidanceAnglesFunctions( const boost::shared_ptr< aerodynamics::AerodynamicGuidance > aerodynamicGuidance, const boost::shared_ptr< reference_frames::AerodynamicAngleCalculator > angleCalculator ); -//! Function that must be called to link the EntryGuidance object to the simulation +//! Function that must be called to link the AerodynamicGuidance object to the simulation /*! - * Function that must be called to link the EntryGuidance object to the simulation + * Function that must be called to link the AerodynamicGuidance object to the simulation * \param aerodynamicGuidance Object computing the current aerodynamic angles. * \param bodyWithAngles Body for which the orientation is to be controlled. */ diff --git a/Tudat/SimulationSetup/EstimationSetup/createAccelerationPartials.h b/Tudat/SimulationSetup/EstimationSetup/createAccelerationPartials.h index cde2667cf1..a8d9702c5a 100644 --- a/Tudat/SimulationSetup/EstimationSetup/createAccelerationPartials.h +++ b/Tudat/SimulationSetup/EstimationSetup/createAccelerationPartials.h @@ -303,8 +303,8 @@ orbit_determination::StateDerivativePartialsMap createAccelerationPartialsMap( return accelerationPartialsList; } -} +} // namespace simulation_setup -} +} // namespace tudat #endif // TUDAT_CREATEACCELERATIONPARTIALS_H diff --git a/Tudat/SimulationSetup/EstimationSetup/createEstimatableParameters.h b/Tudat/SimulationSetup/EstimationSetup/createEstimatableParameters.h index 3756640713..aaadbacbaa 100644 --- a/Tudat/SimulationSetup/EstimationSetup/createEstimatableParameters.h +++ b/Tudat/SimulationSetup/EstimationSetup/createEstimatableParameters.h @@ -1,5 +1,15 @@ -#ifndef CREATEESTIMATABLEPARAMETERS_H -#define CREATEESTIMATABLEPARAMETERS_H +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved + * + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. + */ + +#ifndef TUDAT_CREATEESTIMATABLEPARAMETERS_H +#define TUDAT_CREATEESTIMATABLEPARAMETERS_H #include "Tudat/Astrodynamics/BasicAstrodynamics/accelerationModel.h" @@ -193,8 +203,8 @@ boost::shared_ptr< estimatable_parameters::EstimatableParameterSet< InitialState } -} +} // namespace simulation_setup -} +} // namespace tudat -#endif // CREATEESTIMATABLEPARAMETERS_H +#endif // TUDAT_CREATEESTIMATABLEPARAMETERS_H diff --git a/Tudat/SimulationSetup/EstimationSetup/createLightTimeCalculator.h b/Tudat/SimulationSetup/EstimationSetup/createLightTimeCalculator.h index 4dfa590b78..9d79d79271 100644 --- a/Tudat/SimulationSetup/EstimationSetup/createLightTimeCalculator.h +++ b/Tudat/SimulationSetup/EstimationSetup/createLightTimeCalculator.h @@ -114,7 +114,7 @@ createLightTimeCalculator( bodyMap, lightTimeCorrections, transmittingLinkEnd, receivingLinkEnd ); } -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_CREATELIGHTTIMECALCULATOR_H diff --git a/Tudat/SimulationSetup/EstimationSetup/createLightTimeCorrection.h b/Tudat/SimulationSetup/EstimationSetup/createLightTimeCorrection.h index 91cc6a4a55..ab4c6bc264 100644 --- a/Tudat/SimulationSetup/EstimationSetup/createLightTimeCorrection.h +++ b/Tudat/SimulationSetup/EstimationSetup/createLightTimeCorrection.h @@ -114,9 +114,9 @@ boost::shared_ptr< LightTimeCorrection > createLightTimeCorrections( const std::pair< std::string, std::string >& transmitter, const std::pair< std::string, std::string >& receiver ); -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_CREATELIGHTTIMECORRECTION_H diff --git a/Tudat/SimulationSetup/EstimationSetup/createObservationModel.h b/Tudat/SimulationSetup/EstimationSetup/createObservationModel.h index 4966e21697..bf0127fd6f 100644 --- a/Tudat/SimulationSetup/EstimationSetup/createObservationModel.h +++ b/Tudat/SimulationSetup/EstimationSetup/createObservationModel.h @@ -283,8 +283,8 @@ class ObservationModelCreator< 3, ObservationScalarType, TimeType, StateScalarTy } }; -} +} // namespace observation_models -} +} // namespace tudat #endif // TUDAT_CREATEOBSERVATIONMODEL_H diff --git a/Tudat/SimulationSetup/EstimationSetup/createPositionPartials.h b/Tudat/SimulationSetup/EstimationSetup/createPositionPartials.h index 893db7328f..57f8ce1479 100644 --- a/Tudat/SimulationSetup/EstimationSetup/createPositionPartials.h +++ b/Tudat/SimulationSetup/EstimationSetup/createPositionPartials.h @@ -1,3 +1,13 @@ +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved + * + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. + */ + #ifndef TUDAT_CREATEPOSITIONPARTIALS_H #define TUDAT_CREATEPOSITIONPARTIALS_H @@ -111,8 +121,8 @@ RotationMatrixPartialNamedList createRotationMatrixPartials( } -} +} // namespace observation_partials -} +} // namespace tudat -#endif // CREATEPOSITIONPARTIALS_H +#endif // TUDAT_CREATEPOSITIONPARTIALS_H diff --git a/Tudat/SimulationSetup/EstimationSetup/createStateDerivativePartials.h b/Tudat/SimulationSetup/EstimationSetup/createStateDerivativePartials.h index bb80fcf85e..623d095da6 100644 --- a/Tudat/SimulationSetup/EstimationSetup/createStateDerivativePartials.h +++ b/Tudat/SimulationSetup/EstimationSetup/createStateDerivativePartials.h @@ -1,5 +1,15 @@ -#ifndef CREATESTATEDERIVATIVEPARTIALS_H -#define CREATESTATEDERIVATIVEPARTIALS_H +/* Copyright (c) 2010-2016, Delft University of Technology + * All rigths reserved + * + * This file is part of the Tudat. Redistribution and use in source and + * binary forms, with or without modification, are permitted exclusively + * under the terms of the Modified BSD license. You should have received + * a copy of the license with this file. If not, please or visit: + * http://tudat.tudelft.nl/LICENSE. + */ + +#ifndef TUDAT_CREATESTATEDERIVATIVEPARTIALS_H +#define TUDAT_CREATESTATEDERIVATIVEPARTIALS_H #include "Tudat/Astrodynamics/OrbitDetermination/stateDerivativePartial.h" #include "Tudat/SimulationSetup/PropagationSetup/propagationSettings.h" @@ -72,8 +82,8 @@ std::map< propagators::IntegratedStateType, orbit_determination::StateDerivative return stateDerivativePartials; } -} +} // namespace simulation_setup -} +} // namespace tudat -#endif // CREATESTATEDERIVATIVEPARTIALS_H +#endif // TUDAT_CREATESTATEDERIVATIVEPARTIALS_H diff --git a/Tudat/SimulationSetup/EstimationSetup/estimatableParameterSettings.h b/Tudat/SimulationSetup/EstimationSetup/estimatableParameterSettings.h index 5f769df7fa..736d9aa9c5 100644 --- a/Tudat/SimulationSetup/EstimationSetup/estimatableParameterSettings.h +++ b/Tudat/SimulationSetup/EstimationSetup/estimatableParameterSettings.h @@ -173,7 +173,7 @@ class InitialTranslationalStateEstimatableParameterSettings: public EstimatableP }; -} +} // namespace estimatable_parameters -} +} // namespace tudat #endif // TUDAT_ESTIMATABLEPARAMETERSETTINGS_H diff --git a/Tudat/SimulationSetup/PropagationSetup/createNumericalSimulator.h b/Tudat/SimulationSetup/PropagationSetup/createNumericalSimulator.h index ba9c0d8e7b..e7da8d9bee 100644 --- a/Tudat/SimulationSetup/PropagationSetup/createNumericalSimulator.h +++ b/Tudat/SimulationSetup/PropagationSetup/createNumericalSimulator.h @@ -94,8 +94,8 @@ createSingleArcVariationalEquationsSolver( clearNumericalSolution, integrateEquationsOnCreation ); } -} +} // namespace simulation_setup -} +} // namespace tudat -#endif // CREATENUMERICALSIMULATOR_H +#endif // TUDAT_CREATENUMERICALSIMULATOR_H diff --git a/Tudat/SimulationSetup/PropagationSetup/createThrustModelGuidance.h b/Tudat/SimulationSetup/PropagationSetup/createThrustModelGuidance.h index ab9488848f..0c1f110d86 100644 --- a/Tudat/SimulationSetup/PropagationSetup/createThrustModelGuidance.h +++ b/Tudat/SimulationSetup/PropagationSetup/createThrustModelGuidance.h @@ -94,8 +94,8 @@ void resetThrustMagnitudeAndDirectionTime( const boost::shared_ptr< propulsion::BodyFixedForceDirectionGuidance > thrustDirectionGuidance, const double currentTime = TUDAT_NAN ); -} +} // namespace simulation_setup -} +} // namespace tudat #endif // TUDAT_CREATETHRUSTMODELGUIDANCE_H diff --git a/Tudat/SimulationSetup/PropagationSetup/dynamicsSimulator.h b/Tudat/SimulationSetup/PropagationSetup/dynamicsSimulator.h index 0edbd17bd6..aafb0d7436 100644 --- a/Tudat/SimulationSetup/PropagationSetup/dynamicsSimulator.h +++ b/Tudat/SimulationSetup/PropagationSetup/dynamicsSimulator.h @@ -11,6 +11,9 @@ #ifndef TUDAT_DYNAMICSSIMULATOR_H #define TUDAT_DYNAMICSSIMULATOR_H +#include +#include + #include #include diff --git a/Tudat/SimulationSetup/PropagationSetup/environmentUpdater.h b/Tudat/SimulationSetup/PropagationSetup/environmentUpdater.h index 58ee1c092e..d45a5b8fc2 100644 --- a/Tudat/SimulationSetup/PropagationSetup/environmentUpdater.h +++ b/Tudat/SimulationSetup/PropagationSetup/environmentUpdater.h @@ -165,7 +165,7 @@ class EnvironmentUpdater { bodyList_[ bodiesWithIntegratedMass[ i ].first ] ->setConstantBodyMass( integratedStateIterator_->second( i ) ); - } + } break; }; default: @@ -254,8 +254,10 @@ class EnvironmentUpdater if( boost::dynamic_pointer_cast< reference_frames::AerodynamicAngleCalculator >( dependentOrientationCalculator ) != NULL ) { - int translationalUpdateIndex = -1; - int rotationalUpdateIndex = -1; + unsigned int translationalUpdateIndex = 0; + unsigned int rotationalUpdateIndex = 0; + bool translationalUpdateIndexSet = false; + bool rotationalUpdateIndexSet = false; // Check if the state or orientation of the central body of AerodynamicAngleCalculator is updated. for( unsigned int j = 0; j < updateFunctionVector_.size( ); j++ ) @@ -265,6 +267,7 @@ class EnvironmentUpdater aerodynamicAngleCalculator->getCentralBodyName( ) ) ) { translationalUpdateIndex = j; + translationalUpdateIndexSet = true; } if( ( updateFunctionVector_.at( j ).get< 0 >( ) == body_rotational_state_update ) && @@ -272,11 +275,12 @@ class EnvironmentUpdater aerodynamicAngleCalculator->getCentralBodyName( ) ) ) { rotationalUpdateIndex = j; + rotationalUpdateIndexSet = true; } } // If required updates are not found, throw error. - if( ( translationalUpdateIndex == -1 ) || ( rotationalUpdateIndex == -1 ) ) + if( !translationalUpdateIndexSet || !rotationalUpdateIndexSet ) { throw std::runtime_error( "Error when finding update order for AerodynamicAngleCalculator, did not find required updates for central body" ); diff --git a/Tudat/SimulationSetup/PropagationSetup/setNumericallyIntegratedStates.h b/Tudat/SimulationSetup/PropagationSetup/setNumericallyIntegratedStates.h index e9d5bb6f40..dd7bbc1a96 100644 --- a/Tudat/SimulationSetup/PropagationSetup/setNumericallyIntegratedStates.h +++ b/Tudat/SimulationSetup/PropagationSetup/setNumericallyIntegratedStates.h @@ -210,7 +210,7 @@ void resetIntegratedEphemerides( const simulation_setup::NamedBodyMap& bodyMap, const std::map< TimeType, Eigen::Matrix< StateScalarType, Eigen::Dynamic, 1 > >& equationsOfMotionNumericalSolution, const std::vector< std::string >& bodiesToIntegrate, - const std::pair< int, int > startIndexAndSize, + const std::pair< unsigned int, unsigned int > startIndexAndSize, std::vector< std::string > ephemerisUpdateOrder = std::vector< std::string >( ), const std::map< std::string, boost::function< Eigen::Matrix< StateScalarType, 6, 1 >( const TimeType ) > >& integrationToEphemerisFrameFunctions = @@ -259,7 +259,7 @@ void resetIntegratedBodyMass( const simulation_setup::NamedBodyMap& bodyMap, const std::map< TimeType, Eigen::Matrix< StateScalarType, Eigen::Dynamic, 1 > >& equationsOfMotionNumericalSolution, const std::vector< std::string >& bodiesToIntegrate , - const std::pair< int, int > startIndexAndSize ) + const std::pair< unsigned int, unsigned int > startIndexAndSize ) { if( startIndexAndSize.second != bodiesToIntegrate.size( ) ) { diff --git a/Tudat/SimulationSetup/PropagationSetup/thrustSettings.h b/Tudat/SimulationSetup/PropagationSetup/thrustSettings.h index a2d42fd032..0b9c4f6eb5 100644 --- a/Tudat/SimulationSetup/PropagationSetup/thrustSettings.h +++ b/Tudat/SimulationSetup/PropagationSetup/thrustSettings.h @@ -298,7 +298,7 @@ class FromFunctionThrustEngineSettings: public ThrustEngineSettings Eigen::Vector3d bodyFixedThrustDirection_; }; -} +} // namespace simulation_setup -} +} // namespace tudat #endif // TUDAT_THRUSTSETTINGS_H diff --git a/Tudat/SimulationSetup/PropagationSetup/variationalEquationsSolver.h b/Tudat/SimulationSetup/PropagationSetup/variationalEquationsSolver.h index 7c4cd7a1dc..b0084edb90 100644 --- a/Tudat/SimulationSetup/PropagationSetup/variationalEquationsSolver.h +++ b/Tudat/SimulationSetup/PropagationSetup/variationalEquationsSolver.h @@ -656,9 +656,9 @@ class SingleArcVariationalEquationsSolver: public VariationalEquationsSolver< St }; -} +} // namespace propagators -} +} // namespace tudat diff --git a/Tudat/SimulationSetup/tudatSimulationHeader.h b/Tudat/SimulationSetup/tudatSimulationHeader.h index 2d5c48c5eb..82e348119b 100644 --- a/Tudat/SimulationSetup/tudatSimulationHeader.h +++ b/Tudat/SimulationSetup/tudatSimulationHeader.h @@ -9,8 +9,8 @@ */ -#ifndef TUDATSIMULATIONHEADER_H -#define TUDATSIMULATIONHEADER_H +#ifndef TUDAT_SIMULATIONHEADER_H +#define TUDAT_SIMULATIONHEADER_H #include "Tudat/Astrodynamics/BasicAstrodynamics/physicalConstants.h" #include "Tudat/Astrodynamics/BasicAstrodynamics/timeConversions.h" @@ -47,4 +47,4 @@ #include "Tudat/SimulationSetup/PropagationSetup/thrustSettings.h" #include "Tudat/SimulationSetup/PropagationSetup/createMassRateModels.h" -#endif // TUDATSIMULATIONHEADER_H +#endif // TUDAT_SIMULATIONHEADER_H