Merge pull request #1 from magnific0/RadiationPressureUpdate

Code check, minor fixes
Tudat · Apr 4, 2016 · cc38b82 · cc38b82
2 parents 7ffa877 + e58b58e
commit cc38b82
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/Tudat/Astrodynamics/ElectroMagnetism/CMakeLists.txt b/Tudat/Astrodynamics/ElectroMagnetism/CMakeLists.txt
@@ -43,12 +43,11 @@ set(ELECTROMAGNETISM_SOURCES
 )
 
 # Set the header files.
-set(ELECTROMAGNETISM_HEADERS 
+set(ELECTROMAGNETISM_HEADERS
   "${SRCROOT}${ELECTROMAGNETISMDIR}/cannonBallRadiationPressureAcceleration.cpp"
   "${SRCROOT}${ELECTROMAGNETISMDIR}/cannonBallRadiationPressureForce.cpp"
   "${SRCROOT}${ELECTROMAGNETISMDIR}/lorentzStaticMagneticForce.cpp"
   "${SRCROOT}${ELECTROMAGNETISMDIR}/lorentzStaticMagneticAcceleration.cpp"
-  "${SRCROOT}${ELECTROMAGNETISMDIR}/lorentzStaticMagneticAcceleration.cpp"
   "${SRCROOT}${ELECTROMAGNETISMDIR}/radiationPressureInterface.cpp"
 )
 

diff --git a/Tudat/Astrodynamics/ElectroMagnetism/UnitTests/unitTestRadiationPressureInterface.cpp b/Tudat/Astrodynamics/ElectroMagnetism/UnitTests/unitTestRadiationPressureInterface.cpp
@@ -132,6 +132,9 @@ BOOST_AUTO_TEST_CASE( testShadowFunctionLink )
     unoccultedRadiationPressureInterface->updateInterface( );
 
     // Test application of shadow function (see testShadowFunctionForPartialShadow)
+    // Satellite partially visible. Satellite is located between the locations of the previous
+    // tests in penumbra. According to analytical derivations in Matlab the shadow function should
+    // be around 0.4547. Altitude of satellite = 1000 km (from unitTestMissionGeometry.cpp).
     BOOST_CHECK_CLOSE_FRACTION(
                 occultedRadiationPressureInterface->getCurrentRadiationPressure( ) /
                 unoccultedRadiationPressureInterface->getCurrentRadiationPressure( ) , 0.4547,

diff --git a/Tudat/Astrodynamics/ElectroMagnetism/radiationPressureInterface.cpp b/Tudat/Astrodynamics/ElectroMagnetism/radiationPressureInterface.cpp
@@ -72,8 +72,7 @@ void RadiationPressureInterface::updateInterface( )
 
         if( currentShadowFunction != 1.0 && shadowFunction != 1.0 )
         {
-            std::cerr<<"Warning, multiple occultation occured in radiation pressure interface, "
-                    <<"results may be slightly in error"<<std::endl;
+            std::cerr << "Warning, multiple occultation occured in radiation pressure interface, results may be slightly in error" << std::endl;
         }
 
         shadowFunction *= currentShadowFunction;
@@ -82,6 +81,5 @@ void RadiationPressureInterface::updateInterface( )
     currentRadiationPressure_ *= shadowFunction;
 }
 
-}
-
-}
+} // namespace electro_magnetism
+} // namespace tudat
diff --git a/Tudat/Astrodynamics/ElectroMagnetism/radiationPressureInterface.h b/Tudat/Astrodynamics/ElectroMagnetism/radiationPressureInterface.h
@@ -41,8 +41,8 @@
 
 #include <Eigen/Core>
 
-#include <Tudat/Astrodynamics/BasicAstrodynamics/physicalConstants.h>
-#include <Tudat/Mathematics/BasicMathematics/mathematicalConstants.h>
+#include "Tudat/Astrodynamics/BasicAstrodynamics/physicalConstants.h"
+#include "Tudat/Mathematics/BasicMathematics/mathematicalConstants.h"
 
 namespace tudat
 {
@@ -82,7 +82,7 @@ class RadiationPressureInterface{
      *  causing occultations (default none) NOTE: Multplie concurrent occultations may currently
      *  result in slighlty underestimted radiation pressure.
      *  \param occultingBodyRadii List of radii of the bodies causing occultations (default none).
-     *  \param sourceRadius Radius of the source body (used for occultation calculations)
+     *  \param sourceRadius Radius of the source body (used for occultation calculations) (default 0).
      */
     RadiationPressureInterface(
             const boost::function< double( ) > sourcePower,
@@ -103,7 +103,7 @@ class RadiationPressureInterface{
         currentRadiationPressure_( 0.0 ){ }
 
     //! Destructor
-    ~RadiationPressureInterface( ){ }
+    virtual ~RadiationPressureInterface( ){ }
 
     //! Function to update the current value of the radiation pressure
     /*!
@@ -139,7 +139,7 @@ class RadiationPressureInterface{
      */
     boost::function< Eigen::Vector3d( ) > getSourcePositionFunction( ) const
     {
-        return sourcePositionFunction_ ;
+        return sourcePositionFunction_;
     }
 
     //! Function to return the function returning the current position of the target body.
@@ -149,7 +149,7 @@ class RadiationPressureInterface{
      */
     boost::function< Eigen::Vector3d( ) > getTargetPositionFunction( ) const
     {
-        return targetPositionFunction_ ;
+        return targetPositionFunction_;
     }
 
     //! Function to return the reflecting area of the target body.
@@ -251,8 +251,7 @@ class RadiationPressureInterface{
     Eigen::Vector3d currentSolarVector_;
 };
 
-}
+} // namespace electro_magnetism
+} // namespace tudat
 
-}
-
-#endif // RADIATIONPRESSUREINTERFACE_H
+#endif // TUDAT_RADIATIONPRESSUREINTERFACE_H