FrankHogervorst · FrankHogervorst · Feb 12, 2018 · Sep 8, 2017 · Sep 8, 2017 · Sep 8, 2017
diff --git a/.gitignore b/.gitignore
@@ -52,6 +52,12 @@ build*/
 bin/
 lib/
 
+#
+# Spice Kernel creation tools
+#
+Tudat/External/SpiceInterface/Kernels/KernelMerge/
+Tudat/External/SpiceInterface/Kernels/
+
 #
 # Editor related
 #
@@ -61,3 +67,4 @@ lib/
 *.autosave
 *.~?~
 *.save
+.DS_Store
diff --git a/Doxyfile.in b/Doxyfile.in
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @PROJECT_BINARY_DIR@/../Documentation
+OUTPUT_DIRECTORY       = @PROJECT_BINARY_DIR@/../../../tudatBundle/tudat/Tudat/Documentation
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016, Delft University of Technology
+Copyright (c) 2010-2018, Delft University of Technology
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are

diff --git a/README b/README
@@ -1 +1 @@
-Documentation for the Tudat project can be obtained at http://tudat.tudelft.nl/wiki.
+Documentation for the Tudat project can be obtained at http://tudat.tudelft.nl.
diff --git a/Tudat/Astrodynamics/Aerodynamics/CMakeLists.txt b/Tudat/Astrodynamics/Aerodynamics/CMakeLists.txt
@@ -1,4 +1,4 @@
- #    Copyright (c) 2010-2017, Delft University of Technology
+ #    Copyright (c) 2010-2018, Delft University of Technology
  #    All rigths reserved
  #
  #    This file is part of the Tudat. Redistribution and use in source and
@@ -10,14 +10,13 @@
 
 # Set the source files.
 set(AERODYNAMICS_SOURCES
-  "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicMoment.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicAcceleration.cpp"
+  "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicTorque.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicForce.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamics.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/exponentialAtmosphere.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/hypersonicLocalInclinationAnalysis.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/tabulatedAtmosphere.cpp"
-  "${SRCROOT}${AERODYNAMICSDIR}/customAerodynamicCoefficientInterface.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/flightConditions.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/trimOrientation.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/equilibriumWallTemperature.cpp"
@@ -26,12 +25,11 @@ set(AERODYNAMICS_SOURCES
 # Set the header files.
 set(AERODYNAMICS_HEADERS
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicAcceleration.h"
+  "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicTorque.h"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicCoefficientGenerator.h"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicCoefficientInterface.h"
-  "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicMoment.h"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicAcceleration.h"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicForce.h"
-  "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicRotationalAcceleration.h"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamics.h"
   "${SRCROOT}${AERODYNAMICSDIR}/atmosphereModel.h"
   "${SRCROOT}${AERODYNAMICSDIR}/exponentialAtmosphere.h"
@@ -45,6 +43,7 @@ set(AERODYNAMICS_HEADERS
   "${SRCROOT}${AERODYNAMICSDIR}/flightConditions.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicGuidance.h"
   "${SRCROOT}${AERODYNAMICSDIR}/equilibriumWallTemperature.h"
+  "${SRCROOT}${AERODYNAMICSDIR}/windModel.h"
 )
 
 if(USE_NRLMSISE00)
@@ -97,6 +96,9 @@ add_executable(test_AerodynamicCoefficientsFromFile "${SRCROOT}${AERODYNAMICSDIR
 setup_custom_test_program(test_AerodynamicCoefficientsFromFile "${SRCROOT}${AERODYNAMICSDIR}")
 target_link_libraries(test_AerodynamicCoefficientsFromFile ${TUDAT_PROPAGATION_LIBRARIES} ${Boost_LIBRARIES})
 
+add_executable(test_WindModel "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestWindModel.cpp")
+setup_custom_test_program(test_WindModel "${SRCROOT}${AERODYNAMICSDIR}")
+target_link_libraries(test_WindModel ${TUDAT_PROPAGATION_LIBRARIES} ${Boost_LIBRARIES})
 if(USE_NRLMSISE00)
     add_executable(test_NRLMSISE00Atmosphere "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestNRLMSISE00Atmosphere.cpp")
     setup_custom_test_program(test_NRLMSISE00Atmosphere "${SRCROOT}${AERODYNAMICSDIR}")

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/applicationOutput.h b/Tudat/Astrodynamics/Aerodynamics/UnitTests/applicationOutput.h
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/testApolloCapsuleCoefficients.h b/Tudat/Astrodynamics/Aerodynamics/UnitTests/testApolloCapsuleCoefficients.h
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and
@@ -7,6 +7,7 @@
  *    a copy of the license with this file. If not, please or visit:
  *    http://tudat.tudelft.nl/LICENSE.
  */
+
 #ifndef TUDAT_TESTAPOLLOCAPSULECOEFFICIENTS_H
 #define TUDAT_TESTAPOLLOCAPSULECOEFFICIENTS_H
 

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicCoefficientsFromFile.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicCoefficientsFromFile.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and
@@ -49,9 +49,7 @@ BOOST_AUTO_TEST_CASE( testAerodynamicCoefficientsFromFile )
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     // Load Spice kernels.
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "pck00009.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de-403-masses.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de421.bsp" );
+    spice_interface::loadStandardSpiceKernels( );
 
     for( unsigned int i = 0; i < 3; i++ )
     {

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicMomentAndAerodynamicForce.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicMomentAndAerodynamicForce.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and
@@ -38,16 +38,14 @@
 #include "Tudat/Basics/testMacros.h"
 #include "Tudat/Astrodynamics/Aerodynamics/customAerodynamicCoefficientInterface.h"
 #include "Tudat/Astrodynamics/Aerodynamics/aerodynamicAcceleration.h"
-#include "Tudat/Astrodynamics/Aerodynamics/aerodynamicRotationalAcceleration.h"
 #include "Tudat/Astrodynamics/ReferenceFrames/aerodynamicAngleCalculator.h"
 #include "Tudat/SimulationSetup/PropagationSetup/dynamicsSimulator.h"
-#include <Tudat/External/SpiceInterface/spiceEphemeris.h>
-#include <Tudat/External/SpiceInterface/spiceRotationalEphemeris.h>
-#include <Tudat/InputOutput/basicInputOutput.h>
-#include <Tudat/SimulationSetup/EnvironmentSetup/body.h>
-#include <Tudat/SimulationSetup/PropagationSetup/createNumericalSimulator.h>
-#include <Tudat/SimulationSetup/EnvironmentSetup/defaultBodies.h>
-
+#include "Tudat/External/SpiceInterface/spiceEphemeris.h"
+#include "Tudat/External/SpiceInterface/spiceRotationalEphemeris.h"
+#include "Tudat/InputOutput/basicInputOutput.h"
+#include "Tudat/SimulationSetup/EnvironmentSetup/body.h"
+#include "Tudat/SimulationSetup/PropagationSetup/createNumericalSimulator.h"
+#include "Tudat/SimulationSetup/EnvironmentSetup/defaultBodies.h"
 namespace tudat
 {
 
@@ -228,7 +226,6 @@ BOOST_AUTO_TEST_CASE( testAerodynamicMomentAndRotationalAcceleration )
     const double dynamicPressure = 123.6;
     const double referenceArea = 1.7;
     const double referenceLength = 2.6;
-    const double mass = 12.46;
 
     // Calculate expected moment.
     const Eigen::Vector3d expectedMoment = dynamicPressure * referenceArea *
@@ -263,38 +260,6 @@ BOOST_AUTO_TEST_CASE( testAerodynamicMomentAndRotationalAcceleration )
         // Check if computed moment matches expected.
         TUDAT_CHECK_MATRIX_CLOSE_FRACTION( expectedMoment, moment, tolerance );
     }
-
-    // Test 3: test the rotational acceleration model implemented as free function with coefficient
-    //         interface argument, based on the force that can be derived from the computed
-    //         acceleration.
-    {
-        // Set coefficients and model parameters in aerodynamics coefficient interface object.
-        AerodynamicCoefficientInterfacePointer aerodynamicCoefficientInterface =
-                createConstantCoefficientAerodynamicCoefficientInterface(
-                    Eigen::Vector3d::Zero( ), momentCoefficients,
-                    referenceLength, referenceArea, referenceLength, Eigen::Vector3d::Zero( ) );
-
-        // Compute aerodynamic moment from aerodynamic rotational acceleration free function with
-        // primitive arguments.
-        Eigen::Vector3d moment = computeAerodynamicRotationalAcceleration(
-                    dynamicPressure, aerodynamicCoefficientInterface, mass ) * mass;
-
-        // Check if computed moment matches expected.
-        TUDAT_CHECK_MATRIX_CLOSE_FRACTION( expectedMoment, moment, tolerance );
-    }
-
-    // Test 4: test the rotational acceleration model implemented as free function with primitive
-    //         arguments, based on the force that can be derived from the computed acceleration.
-    {
-        // Compute aerodynamic moment from aerodynamic rotational acceleration free function with
-        // primitive arguments.
-        Eigen::Vector3d moment = computeAerodynamicRotationalAcceleration(
-                    dynamicPressure, referenceArea, referenceLength,
-                    momentCoefficients, mass ) * mass;
-
-        // Check if computed moment matches expected.
-        TUDAT_CHECK_MATRIX_CLOSE_FRACTION( expectedMoment, moment, tolerance );
-    }
 }
 
 class DummyAngleCalculator: public AerodynamicGuidance
@@ -343,9 +308,7 @@ void testAerodynamicForceDirection( const bool includeThrustForce,
     using namespace basic_astrodynamics;
 
     //Load spice kernels.
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "pck00009.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de-403-masses.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de421.bsp" );
+    spice_interface::loadStandardSpiceKernels( );
 
     double thrustMagnitude = 1.0E3;
     double specificImpulse = 250.0;
@@ -396,7 +359,7 @@ void testAerodynamicForceDirection( const bool includeThrustForce,
         }
         else
         {
-            aerodynamicCoefficients = ( Eigen::Vector3d( )<<1.0, -0.1, 0.5 ).finished( );
+            aerodynamicCoefficients = ( Eigen::Vector3d( ) << 1.0, -0.1, 0.5 ).finished( );
 
         }
 

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicsNamespace.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestAerodynamicsNamespace.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestCoefficientGenerator.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestCoefficientGenerator.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestControlSurfaceIncrements.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestControlSurfaceIncrements.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and
@@ -97,7 +97,7 @@ Eigen::Vector6d dummyControlIncrements(
         const std::vector< double > independentVariables )
 {
     Eigen::Vector6d randomControlIncrements =
-            ( Eigen::Vector6d( )<<1.0, -3.5, 2.1, 0.4, -0.75, 1.3 ).finished( );
+            ( Eigen::Vector6d( ) << 1.0, -3.5, 2.1, 0.4, -0.75, 1.3 ).finished( );
     for( unsigned int i = 0; i < 6; i++ )
     {
         randomControlIncrements( i ) *= (
@@ -198,9 +198,7 @@ BOOST_AUTO_TEST_CASE( testControlSurfaceIncrementInterfaceInPropagation )
     using namespace input_output;
 
     // Load Spice kernels.
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "pck00009.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de-403-masses.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de421.bsp" );
+    spice_interface::loadStandardSpiceKernels( );
 
 
     // Set simulation start epoch.

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestExponentialAtmosphere.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestExponentialAtmosphere.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestHeatTransfer.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestHeatTransfer.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestNRLMSISE00Atmosphere.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestNRLMSISE00Atmosphere.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and
@@ -17,7 +17,6 @@
 #define BOOST_TEST_MAIN
 
 #include <algorithm>
-#include <iostream>
 #include <vector>
 #include <utility>
 
@@ -955,7 +954,7 @@ BOOST_AUTO_TEST_CASE( testSpeedOfSound )
     BOOST_CHECK_CLOSE_FRACTION( model.getSpeedOfSound(altitude,longitude,latitude,time) , 340.9 , 1.8E-2 ); // < 1.8%
 
     // US Standard Atmosphere Model 1976
-    std::string atmosphereTableFile = tudat::input_output::getTudatRootPath( ) + "/External/AtmosphereTables/" +
+    std::string atmosphereTableFile = tudat::input_output::getAtmosphereTablesPath( ) +
             "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" ;
     tudat::aerodynamics::TabulatedAtmosphere US76model(atmosphereTableFile);
 

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestTabulatedAerodynamicCoefficients.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestTabulatedAerodynamicCoefficients.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and
@@ -12,9 +12,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <Tudat/SimulationSetup/tudatSimulationHeader.h>
-
-#include "applicationOutput.h"
+#include "Tudat/SimulationSetup/tudatSimulationHeader.h"
+#include "Tudat/Astrodynamics/Aerodynamics/UnitTests/applicationOutput.h"
 #include "Tudat/InputOutput/basicInputOutput.h"
 
 
@@ -50,9 +49,7 @@ BOOST_AUTO_TEST_CASE( testTabulatedDragCoefficient )
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     // Load Spice kernels.
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "pck00009.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de-403-masses.tpc" );
-    spice_interface::loadSpiceKernelInTudat( input_output::getSpiceKernelPath( ) + "de421.bsp" );
+    spice_interface::loadStandardSpiceKernels( );
 
     // Set simulation time settings.
     const double simulationStartEpoch = 0.0;
@@ -164,11 +161,11 @@ BOOST_AUTO_TEST_CASE( testTabulatedDragCoefficient )
     double meanEarthRadius = 6371.0E3;
     double perigeeAltitude = 150.0E3;
     double apogeeAltitude = 35780.0E3;
-    double semiMajorAixs= (apogeeAltitude + perigeeAltitude)/2 + meanEarthRadius;
+    double semiMajorAixs= (apogeeAltitude + perigeeAltitude) / 2.0 + meanEarthRadius;
     double eccentricity = (apogeeAltitude - perigeeAltitude)/(apogeeAltitude + perigeeAltitude + 2*meanEarthRadius);
 
     // Set Keplerian elements for Vehicle.
-    Eigen::Vector6d vehicleInitialStateInKeplerianElements;
+    Eigen::Vector6d vehicleInitialStateInKeplerianElements = Eigen::Vector6d::Zero( );
     vehicleInitialStateInKeplerianElements( semiMajorAxisIndex ) = semiMajorAixs;
     vehicleInitialStateInKeplerianElements( eccentricityIndex ) = eccentricity;
     vehicleInitialStateInKeplerianElements( inclinationIndex ) = mathematical_constants::PI / 180.0 * 23.4;

diff --git a/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestTabulatedAtmosphere.cpp b/Tudat/Astrodynamics/Aerodynamics/UnitTests/unitTestTabulatedAtmosphere.cpp
@@ -1,4 +1,4 @@
-/*    Copyright (c) 2010-2017, Delft University of Technology
+/*    Copyright (c) 2010-2018, Delft University of Technology
  *    All rigths reserved
  *
  *    This file is part of the Tudat. Redistribution and use in source and
@@ -45,8 +45,7 @@ BOOST_AUTO_TEST_CASE( testTabulatedAtmosphereAtSeaLevel )
 {
     // Create a tabulated atmosphere object.
     aerodynamics::TabulatedAtmosphere tabulatedAtmosphere(
-                input_output::getTudatRootPath( ) + "/External/AtmosphereTables/" +
-                "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
+                input_output::getAtmosphereTablesPath( ) + "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
 
     // Declare tolerance used for Boost tests.
     const double tolerance = std::numeric_limits< double >::epsilon( );
@@ -64,8 +63,7 @@ BOOST_AUTO_TEST_CASE( testTabulatedAtmosphereAt10km )
 {
     // Create a tabulated atmosphere object.
     aerodynamics::TabulatedAtmosphere tabulatedAtmosphere(
-                input_output::getTudatRootPath( ) + "/External/AtmosphereTables/" +
-                "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
+                input_output::getAtmosphereTablesPath( ) + "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
     const double altitude = 10.0e3;
     const double longitude = 0.0;
     const double latitude = 0.0;
@@ -86,8 +84,7 @@ BOOST_AUTO_TEST_CASE( testTabulatedAtmosphereAt10p5km )
 {
     // Create a tabulated atmosphere object.
     aerodynamics::TabulatedAtmosphere tabulatedAtmosphere(
-                input_output::getTudatRootPath( ) + "/External/AtmosphereTables/" +
-                "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
+                input_output::getAtmosphereTablesPath( ) + "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
     const double altitude = 10.05e3;
 
     BOOST_CHECK_SMALL( 222.9350 - tabulatedAtmosphere.getTemperature( altitude ), 2.0e-2 );
@@ -101,8 +98,7 @@ BOOST_AUTO_TEST_CASE( testTabulatedAtmosphereAt1000kmtab )
 {
     // Create a tabulated atmosphere object.
     aerodynamics::TabulatedAtmosphere tabulatedAtmosphere(
-                input_output::getTudatRootPath( ) + "/External/AtmosphereTables/" +
-                "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
+                input_output::getAtmosphereTablesPath( ) + "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
     const double altitude = 1.0e6 ;
 
     // Declare tolerance used for Boost tests.
@@ -121,8 +117,7 @@ BOOST_AUTO_TEST_CASE( testTabulatedAtmospherePositionIndependentFunctions)
 {
     // Create a tabulated atmosphere object.
     aerodynamics::TabulatedAtmosphere tabulatedAtmosphere(
-                input_output::getTudatRootPath( ) + "/External/AtmosphereTables/" +
-                "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
+                input_output::getAtmosphereTablesPath( ) + "USSA1976Until100kmPer100mUntil1000kmPer1000m.dat" );
 
     const double altitude  = 10.0e3;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Documentation for the Tudat project can be obtained at http://tudat.tudelft.nl/wiki.
		Documentation for the Tudat project can be obtained at http://tudat.tudelft.nl.