Shape based cleanv1

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

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.

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
@@ -11,13 +11,14 @@
 # Set the source files.
 set(AERODYNAMICS_SOURCES
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicAcceleration.cpp"
+  "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicCoefficientGenerator.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicTorque.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicForce.cpp"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamics.cpp"
+  "${SRCROOT}${AERODYNAMICSDIR}/customConstantTemperatureAtmosphere.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"
@@ -33,6 +34,7 @@ set(AERODYNAMICS_HEADERS
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamicForce.h"
   "${SRCROOT}${AERODYNAMICSDIR}/aerodynamics.h"
   "${SRCROOT}${AERODYNAMICSDIR}/atmosphereModel.h"
+  "${SRCROOT}${AERODYNAMICSDIR}/customConstantTemperatureAtmosphere.h"
   "${SRCROOT}${AERODYNAMICSDIR}/exponentialAtmosphere.h"
   "${SRCROOT}${AERODYNAMICSDIR}/hypersonicLocalInclinationAnalysis.h"
   "${SRCROOT}${AERODYNAMICSDIR}/tabulatedAtmosphere.h"
@@ -67,27 +69,33 @@ target_link_libraries(test_AerodynamicMomentAndAerodynamicForce ${TUDAT_PROPAGAT
 
 add_executable(test_AerodynamicsNamespace "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestAerodynamicsNamespace.cpp")
 setup_custom_test_program(test_AerodynamicsNamespace "${SRCROOT}${AERODYNAMICSDIR}")
-target_link_libraries(test_AerodynamicsNamespace tudat_aerodynamics ${Boost_LIBRARIES})
+target_link_libraries(test_AerodynamicsNamespace tudat_aerodynamics tudat_basic_mathematics ${Boost_LIBRARIES})
 
 add_executable(test_AerodynamicCoefficientGenerator "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestCoefficientGenerator.cpp")
 setup_custom_test_program(test_AerodynamicCoefficientGenerator "${SRCROOT}${AERODYNAMICSDIR}")
-target_link_libraries(test_AerodynamicCoefficientGenerator tudat_aerodynamics tudat_geometric_shapes tudat_basic_mathematics ${Boost_LIBRARIES})
+target_link_libraries(test_AerodynamicCoefficientGenerator tudat_aerodynamics tudat_geometric_shapes tudat_interpolators tudat_basic_mathematics ${Boost_LIBRARIES})
 
 add_executable(test_ExponentialAtmosphere "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestExponentialAtmosphere.cpp")
 setup_custom_test_program(test_ExponentialAtmosphere "${SRCROOT}${AERODYNAMICSDIR}")
-target_link_libraries(test_ExponentialAtmosphere tudat_aerodynamics ${Boost_LIBRARIES})
+target_link_libraries(test_ExponentialAtmosphere tudat_aerodynamics tudat_basic_mathematics ${Boost_LIBRARIES})
+
+add_executable(test_CustomConstantTemperatureAtmosphere "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestCustomConstantTemperatureAtmosphere.cpp")
+setup_custom_test_program(test_CustomConstantTemperatureAtmosphere "${SRCROOT}${AERODYNAMICSDIR}")
+target_link_libraries(test_CustomConstantTemperatureAtmosphere tudat_aerodynamics tudat_basic_mathematics ${Boost_LIBRARIES})
 
 add_executable(test_TabulatedAtmosphere "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestTabulatedAtmosphere.cpp")
 setup_custom_test_program(test_TabulatedAtmosphere "${SRCROOT}${AERODYNAMICSDIR}")
-target_link_libraries(test_TabulatedAtmosphere tudat_aerodynamics tudat_interpolators tudat_basic_mathematics tudat_input_output ${Boost_LIBRARIES})
+target_link_libraries(test_TabulatedAtmosphere tudat_aerodynamics tudat_input_output tudat_interpolators
+    tudat_basic_mathematics tudat_basic_astrodynamics ${Boost_LIBRARIES})
 
 add_executable(test_TabulatedAerodynamicCoefficients "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestTabulatedAerodynamicCoefficients.cpp")
 setup_custom_test_program(test_TabulatedAerodynamicCoefficients "${SRCROOT}${AERODYNAMICSDIR}")
 target_link_libraries(test_TabulatedAerodynamicCoefficients ${TUDAT_PROPAGATION_LIBRARIES} ${Boost_LIBRARIES})
 
 add_executable(test_HeatTransfer "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestHeatTransfer.cpp")
 setup_custom_test_program(test_HeatTransfer "${SRCROOT}${AERODYNAMICSDIR}")
-target_link_libraries(test_HeatTransfer tudat_aerodynamics tudat_root_finders tudat_basic_astrodynamics ${Boost_LIBRARIES})
+target_link_libraries(test_HeatTransfer tudat_aerodynamics tudat_root_finders tudat_basic_mathematics
+    tudat_basic_astrodynamics ${Boost_LIBRARIES})
 
 add_executable(test_ControlSurfaceIncrements "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestControlSurfaceIncrements.cpp")
 setup_custom_test_program(test_ControlSurfaceIncrements "${SRCROOT}${AERODYNAMICSDIR}")
@@ -100,6 +108,7 @@ target_link_libraries(test_AerodynamicCoefficientsFromFile ${TUDAT_PROPAGATION_L
 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}")

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

Tudat/Astrodynamics/Aerodynamics/UnitTests/dCDw4DTest1.txt

@@ -0,0 +1,143 @@
+# Drag coefficient increment of elevons (dCDw) as function of Mach (line 1), angle of attack in deg. (line 2) 
+# and deflection angle in deg. (line 3). The 5 tables are respectively for the 5 different deflection angles.
+4
+0.3 0.7	0.9 1.5 2.5 4 6 10 15 20 24.2
+-1 0 1 2 4 6 8 10 12
+-0.35 -0.175 0 0.175 0.35
+0 1
+
+0.0070    0.0050    0.0030    0.0010   -0.0010   -0.0050   -0.0080   -0.0130   -0.0180
+0.0080    0.0060    0.0045    0.0025   -0.0015   -0.0050   -0.0100   -0.0145   -0.0200
+0.0100    0.0080    0.0060    0.0040   -0.0010   -0.0050   -0.0100   -0.0160   -0.0230
+0.0022    0.0015    0.0040   -0.0010   -0.0040   -0.0040   -0.0070   -0.0110   -0.0160
+0.0053    0.0047    0.0043    0.0036    0.0028    0.0019    0.0009         0   -0.0006
+0.0034    0.0030    0.0026    0.0023    0.0016    0.0010    0.0005         0   -0.0005
+0.0026    0.0023    0.0020    0.0017    0.0012    0.0008    0.0004         0   -0.0004
+0.0022    0.0018    0.0016    0.0014    0.0009    0.0005    0.0003         0   -0.0003
+0.0021    0.0018    0.0015    0.0013    0.0008    0.0005    0.0003         0   -0.0003
+0.0020    0.0017    0.0014    0.0012    0.0007    0.0005    0.0003         0   -0.0003
+0.0021    0.0018    0.0015    0.0013    0.0008    0.0005    0.0003         0   -0.0003
+
+
+0.0020    0.0010    0.0002         0   -0.0020   -0.0040   -0.0060   -0.0080   -0.0100
+0.0021    0.0014    0.0007         0   -0.0020   -0.0040   -0.0060   -0.0080   -0.0110
+0.0030    0.0020    0.0010         0   -0.0020   -0.0050   -0.0080   -0.0100   -0.0140
+0.0003         0         0   -0.0010   -0.0020   -0.0040   -0.0050   -0.0065   -0.0090
+0.0014    0.0011    0.0008    0.0006    0.0003   -0.0003   -0.0008   -0.0012   -0.0015
+0.0007    0.0006    0.0004    0.0003    0.0001   -0.0001   -0.0002   -0.0005   -0.0008
+0.0005    0.0004    0.0003    0.0002    0.0001   -0.0001   -0.0002   -0.0004   -0.0006
+0.0003    0.0002    0.0001    0.0001    0.0001         0   -0.0001   -0.0003   -0.0005
+0.0003    0.0002    0.0001    0.0001         0         0   -0.0001   -0.0002   -0.0005
+0.0003    0.0002    0.0001         0         0         0   -0.0001   -0.0002   -0.0003
+0.0003    0.0002    0.0001    0.0001         0         0   -0.0001   -0.0002   -0.0003
+
+
+
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+
+
+
+     0    0.0008    0.0016    0.0024    0.0040    0.0060    0.0090    0.0120    0.0150
+0.0007    0.0014    0.0021    0.0028    0.0052    0.0076    0.0100    0.0130    0.0160
+0.0010    0.0020    0.0030    0.0040    0.0060    0.0090    0.0130    0.0165    0.0200
+     0         0         0         0    0.0040    0.0070    0.0090    0.0120    0.0150
+0.0009    0.0011    0.0013    0.0015    0.0020    0.0025    0.0030    0.0036    0.0042
+0.0005    0.0006    0.0007    0.0008    0.0011    0.0016    0.0020    0.0025    0.0030
+0.0003    0.0004    0.0005    0.0006    0.0008    0.0010    0.0015    0.0020    0.0023
+0.0002    0.0003    0.0003    0.0004    0.0006    0.0008    0.0012    0.0016    0.0020
+0.0002    0.0003    0.0003    0.0004    0.0005    0.0008    0.0012    0.0016    0.0020
+0.0002    0.0001    0.0002    0.0003    0.0005    0.0008    0.0012    0.0016    0.0020
+0.0002    0.0001    0.0002    0.0003    0.0005    0.0008    0.0012    0.0016    0.0020
+
+
+
+0.0040    0.0050    0.0060    0.0080    0.0120    0.0170    0.0220    0.0270    0.0320
+0.0050    0.0060    0.0080    0.0100    0.0150    0.0190    0.0250    0.0320    0.0380
+0.0060    0.0080    0.0100    0.0130    0.0180    0.0240    0.0300    0.0380    0.0440
+0.0040    0.0020    0.0023    0.0025    0.0025    0.0160    0.0210    0.0260    0.0320
+0.0043    0.0047    0.0053    0.0057    0.0067    0.0077    0.0088    0.0100    0.0113
+0.0026    0.0030    0.0034    0.0038    0.0046    0.0054    0.0063    0.0075    0.0085
+0.0020    0.0023    0.0026    0.0030    0.0037    0.0045    0.0054    0.0067    0.0077
+0.0016    0.0018    0.0021    0.0025    0.0032    0.0040    0.0050    0.0060    0.0077
+0.0015    0.0018    0.0021    0.0024    0.0032    0.0040    0.0050    0.0060    0.0077
+0.0015    0.0017    0.0020    0.0023    0.0030    0.0039    0.0049    0.0060    0.0072
+0.0015    0.0018    0.0021    0.0024    0.0032    0.0040    0.0050    0.0060    0.0072
+
+
+0.0070    0.0050    0.0030    0.0010   -0.0010   -0.0050   -0.0080   -0.0130   -0.0180
+0.0080    0.0060    0.0045    0.0025   -0.0015   -0.0050   -0.0100   -0.0145   -0.0200
+0.0100    0.0080    0.0060    0.0040   -0.0010   -0.0050   -0.0100   -0.0160   -0.0230
+0.0022    0.0015    0.0040   -0.0010   -0.0040   -0.0040   -0.0070   -0.0110   -0.0160
+0.0053    0.0047    0.0043    0.0036    0.0028    0.0019    0.0009         0   -0.0006
+0.0034    0.0030    0.0026    0.0023    0.0016    0.0010    0.0005         0   -0.0005
+0.0026    0.0023    0.0020    0.0017    0.0012    0.0008    0.0004         0   -0.0004
+0.0022    0.0018    0.0016    0.0014    0.0009    0.0005    0.0003         0   -0.0003
+0.0021    0.0018    0.0015    0.0013    0.0008    0.0005    0.0003         0   -0.0003
+0.0020    0.0017    0.0014    0.0012    0.0007    0.0005    0.0003         0   -0.0003
+0.0021    0.0018    0.0015    0.0013    0.0008    0.0005    0.0003         0   -0.0003
+
+
+0.0020    0.0010    0.0002         0   -0.0020   -0.0040   -0.0060   -0.0080   -0.0100
+0.0021    0.0014    0.0007         0   -0.0020   -0.0040   -0.0060   -0.0080   -0.0110
+0.0030    0.0020    0.0010         0   -0.0020   -0.0050   -0.0080   -0.0100   -0.0140
+0.0003         0         0   -0.0010   -0.0020   -0.0040   -0.0050   -0.0065   -0.0090
+0.0014    0.0011    0.0008    0.0006    0.0003   -0.0003   -0.0008   -0.0012   -0.0015
+0.0007    0.0006    0.0004    0.0003    0.0001   -0.0001   -0.0002   -0.0005   -0.0008
+0.0005    0.0004    0.0003    0.0002    0.0001   -0.0001   -0.0002   -0.0004   -0.0006
+0.0003    0.0002    0.0001    0.0001    0.0001         0   -0.0001   -0.0003   -0.0005
+0.0003    0.0002    0.0001    0.0001         0         0   -0.0001   -0.0002   -0.0005
+0.0003    0.0002    0.0001         0         0         0   -0.0001   -0.0002   -0.0003
+0.0003    0.0002    0.0001    0.0001         0         0   -0.0001   -0.0002   -0.0003
+
+
+
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+0     0     0     0     0     0     0     0     0
+
+
+
+     0    0.0008    0.0016    0.0024    0.0040    0.0060    0.0090    0.0120    0.0150
+0.0007    0.0014    0.0021    0.0028    0.0052    0.0076    0.0100    0.0130    0.0160
+0.0010    0.0020    0.0030    0.0040    0.0060    0.0090    0.0130    0.0165    0.0200
+     0         0         0         0    0.0040    0.0070    0.0090    0.0120    0.0150
+0.0009    0.0011    0.0013    0.0015    0.0020    0.0025    0.0030    0.0036    0.0042
+0.0005    0.0006    0.0007    0.0008    0.0011    0.0016    0.0020    0.0025    0.0030
+0.0003    0.0004    0.0005    0.0006    0.0008    0.0010    0.0015    0.0020    0.0023
+0.0002    0.0003    0.0003    0.0004    0.0006    0.0008    0.0012    0.0016    0.0020
+0.0002    0.0003    0.0003    0.0004    0.0005    0.0008    0.0012    0.0016    0.0020
+0.0002    0.0001    0.0002    0.0003    0.0005    0.0008    0.0012    0.0016    0.0020
+0.0002    0.0001    0.0002    0.0003    0.0005    0.0008    0.0012    0.0016    0.0020
+
+
+
+0.0040    0.0050    0.0060    0.0080    0.0120    0.0170    0.0220    0.0270    0.0320
+0.0050    0.0060    0.0080    0.0100    0.0150    0.0190    0.0250    0.0320    0.0380
+0.0060    0.0080    0.0100    0.0130    0.0180    0.0240    0.0300    0.0380    0.0440
+0.0040    0.0020    0.0023    0.0025    0.0025    0.0160    0.0210    0.0260    0.0320
+0.0043    0.0047    0.0053    0.0057    0.0067    0.0077    0.0088    0.0100    0.0113
+0.0026    0.0030    0.0034    0.0038    0.0046    0.0054    0.0063    0.0075    0.0085
+0.0020    0.0023    0.0026    0.0030    0.0037    0.0045    0.0054    0.0067    0.0077
+0.0016    0.0018    0.0021    0.0025    0.0032    0.0040    0.0050    0.0060    0.0077
+0.0015    0.0018    0.0021    0.0024    0.0032    0.0040    0.0050    0.0060    0.0077
+0.0015    0.0017    0.0020    0.0023    0.0030    0.0039    0.2949    0.0060    0.0072
+0.0015    0.0018    0.0021    0.0024    0.0032    0.0040    0.0050    0.0060    0.0072
+