Merge pull request #72 from DominicDirkx/SimulationSetupDirectoryRear…

…ranged Simulation setup directory rearranged
Tudat · Oct 13, 2016 · f3f2a5c · f3f2a5c
2 parents a3c691b + a0e7252
commit f3f2a5c
Show file tree

Hide file tree

Showing 311 changed files with 32,305 additions and 3,953 deletions.
diff --git 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/CMakeLists.txt b/Tudat/Astrodynamics/Aerodynamics/CMakeLists.txt
@@ -44,6 +44,7 @@ set(AERODYNAMICS_SOURCES
   "${SRCROOT}${AERODYNAMICSDIR}/tabulatedAtmosphere.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/customAerodynamicCoefficientInterface.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/flightConditions.cpp"
+  "${SRCROOT}${AERODYNAMICSDIR}/trimOrientation.cpp"
 )
 
 # Set the header files.
@@ -63,7 +64,9 @@ set(AERODYNAMICS_HEADERS
   "${SRCROOT}${AERODYNAMICSDIR}/standardAtmosphere.h"
   "${SRCROOT}${AERODYNAMICSDIR}/customAerodynamicCoefficientInterface.h"
   "${SRCROOT}${AERODYNAMICSDIR}/flightConditions.h"
-  "${SRCROOT}${AERODYNAMICSDIR}//UnitTests/testApolloCapsuleCoefficients.h"
+  "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/testApolloCapsuleCoefficients.h"
+  "${SRCROOT}${AERODYNAMICSDIR}/flightConditions.cpp"
+  "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicGuidance.h"
 )
 
 if(USE_NRLMSISE00)
@@ -82,7 +85,8 @@ setup_tudat_library_target(tudat_aerodynamics "${SRCROOT}{AERODYNAMICSDIR}")
 # Add unit tests.
 add_executable(test_AerodynamicMomentAndAerodynamicForce "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestAerodynamicMomentAndAerodynamicForce.cpp")
 setup_custom_test_program(test_AerodynamicMomentAndAerodynamicForce "${SRCROOT}${AERODYNAMICSDIR}")
-target_link_libraries(test_AerodynamicMomentAndAerodynamicForce tudat_simulation_setup tudat_aerodynamics tudat_reference_frames tudat_ephemerides tudat_basic_astrodynamics tudat_basic_mathematics ${Boost_LIBRARIES})
+target_link_libraries(test_AerodynamicMomentAndAerodynamicForce ${TUDAT_PROPAGATION_LIBRARIES} ${Boost_LIBRARIES})
+
 
 add_executable(test_AerodynamicsNamespace "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestAerodynamicsNamespace.cpp")
 setup_custom_test_program(test_AerodynamicsNamespace "${SRCROOT}${AERODYNAMICSDIR}")

diff --git 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 );
@@ -47,7 +46,7 @@ boost::shared_ptr< HypersonicLocalInclinationAnalysis > getApolloCoefficientInte
     Eigen::Vector3d momentReference;
     momentReference( 0 ) = -0.6624;
     momentReference( 1 ) = 0.0;
-    momentReference( 2 ) = -0.1369;
+    momentReference( 2 ) = 0.1369;
 
     std::vector< std::vector< double > > independentVariableDataPoints;
     independentVariableDataPoints.resize( 3 );
@@ -84,7 +83,7 @@ boost::shared_ptr< HypersonicLocalInclinationAnalysis > getApolloCoefficientInte
                 3.9116, momentReference );
 }
 
-}
+} // namespace unit_tests
 
-}
+} // namespace tudat
 #endif // TUDAT_TESTAPOLLOCAPSULECOEFFICIENTS_H