Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nrlmsise update #28

Merged
merged 11 commits into from
Sep 4, 2016
Merged

Nrlmsise update #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9f91afd
CMakeList comment changed
Reneh107 Mar 21, 2016
29c405f
Merge branch 'nrlmsise'
Reneh107 Mar 21, 2016
761e7d8
Merge remote-tracking branch 'upstream/master'
Reneh107 May 4, 2016
a219c39
Added virtual function resetHashKey, which is used in NRLMSISE
Reneh107 May 4, 2016
8282678
Minor changes + Computation atmospheric pressure
Reneh107 May 4, 2016
1822f05
Minor adjustments + Add tests: speed of sound , mean molar mass, mean…
Reneh107 May 5, 2016
f5d142a
Add nrlmsise input functions
Reneh107 Aug 8, 2016
6553307
Update vector size (fix data leak)
Reneh107 Aug 8, 2016
40083e3
base class functions update
Reneh107 Aug 8, 2016
10be932
Added unit tests for nrlmsise input functions
Reneh107 Aug 8, 2016
a36a767
update unit test mean free path
Reneh107 Aug 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Tudat/Astrodynamics/Aerodynamics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ set(AERODYNAMICS_HEADERS

if(USE_NRLMSISE00)
set(AERODYNAMICS_SOURCES "${AERODYNAMICS_SOURCES}"
"${SRCROOT}${AERODYNAMICSDIR}/nrlmsise00Atmosphere.cpp")
"${SRCROOT}${AERODYNAMICSDIR}/nrlmsise00Atmosphere.cpp"
"${SRCROOT}${AERODYNAMICSDIR}/nrlmsise00InputFunctions.cpp")
set(AERODYNAMICS_HEADERS "${AERODYNAMICS_HEADERS}"
"${SRCROOT}${AERODYNAMICSDIR}/nrlmsise00Atmosphere.h")
"${SRCROOT}${AERODYNAMICSDIR}/nrlmsise00Atmosphere.h"
"${SRCROOT}${AERODYNAMICSDIR}/nrlmsise00InputFunctions.h")
endif( )

# Add static libraries.
Expand Down Expand Up @@ -98,5 +100,5 @@ target_link_libraries(test_TabulatedAtmosphere tudat_aerodynamics tudat_interpol
if(USE_NRLMSISE00)
add_executable(test_NRLMSISE00Atmosphere "${SRCROOT}${AERODYNAMICSDIR}/UnitTests/unitTestNRLMSISE00Atmosphere.cpp")
setup_custom_test_program(test_NRLMSISE00Atmosphere "${SRCROOT}${AERODYNAMICSDIR}")
target_link_libraries(test_NRLMSISE00Atmosphere tudat_aerodynamics tudat_basic_mathematics nrlmsise00 ${Boost_LIBRARIES})
target_link_libraries(test_NRLMSISE00Atmosphere tudat_aerodynamics tudat_interpolators tudat_basic_mathematics nrlmsise00 tudat_input_output tudat_basic_astrodynamics ${Boost_LIBRARIES})
endif( )
49 changes: 49 additions & 0 deletions Tudat/Astrodynamics/Aerodynamics/UnitTests/swAtmosTestNoAdjust.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
DATATYPE CssiSpaceWeather
VERSION 1.2
UPDATED 2016 Mar 24 18:35:11 UTC
# --------------------------------------------------------------------------------------------------------------------------------
# ANALYTICAL GRAPHICS, INC.
# CENTER FOR SPACE STANDARDS & INNOVATION
# SPACE WEATHER DATA
# --------------------------------------------------------------------------------------------------------------------------------
#
# See http://celestrak.com/SpaceData/SpaceWx-format.asp for format details.
#
# FORMAT(I4,I3,I3,I5,I3,8I3,I4,8I4,I4,F4.1,I2,I4,F6.1,I2,5F6.1)
# --------------------------------------------------------------------------------------------------------------------------------
# Adj Adj Adj Obs Obs Obs
# yy mm dd BSRN ND Kp Kp Kp Kp Kp Kp Kp Kp Sum Ap Ap Ap Ap Ap Ap Ap Ap Avg Cp C9 ISN F10.7 Q Ctr81 Lst81 F10.7 Ctr81 Lst81
# --------------------------------------------------------------------------------------------------------------------------------
#
NUM_OBSERVED_POINTS 21360
BEGIN OBSERVED
1957 10 01 1700 19 43 40 30 20 37 23 43 37 273 32 27 15 7 22 9 32 22 21 1.1 5 236 268.0 0 265.2 230.6 269.3 266.6 230.9
1957 10 02 1700 20 37 37 17 17 27 23 17 30 203 22 22 6 6 12 9 6 15 12 0.7 3 234 252.0 0 266.0 231.4 253.3 267.4 231.7
1957 10 03 1700 21 27 20 13 33 37 47 43 30 250 12 7 5 18 22 39 32 15 19 1.0 5 242 265.0 0 266.7 232.3 266.3 268.1 232.7
1957 10 04 1700 22 30 30 23 27 23 27 30 27 217 15 15 9 12 9 12 15 12 12 0.7 3 217 237.0 0 267.4 232.9 238.2 268.8 233.3
1957 10 05 1700 23 30 30 17 23 20 27 27 20 193 15 15 6 9 7 12 12 7 10 0.6 3 219 245.0 0 267.8 233.5 246.2 269.3 233.9
1957 10 06 1700 24 17 3 10 7 0 0 3 3 43 6 2 4 3 0 0 2 2 2 0.0 0 227 250.0 0 268.1 233.9 251.2 269.6 234.3
1957 10 07 1700 25 10 20 17 17 17 7 20 13 120 4 7 6 6 6 3 7 5 6 0.2 1 234 253.0 0 268.4 234.2 254.3 269.9 234.6
1957 10 08 1700 26 17 0 10 7 3 3 3 3 47 6 0 4 3 2 2 2 2 3 0.0 0 244 261.0 0 268.2 234.7 262.6 269.8 235.2
1957 10 09 1700 27 3 17 23 17 23 23 20 23 150 2 6 9 6 9 9 7 9 7 0.4 2 267 275.0 0 268.3 235.2 276.6 270.0 235.7
1957 10 10 1701 1 30 40 40 30 23 30 37 27 257 15 27 27 15 9 15 22 12 18 1.0 5 264 275.0 0 268.2 235.6 276.6 269.8 236.1
1957 10 11 1701 2 33 43 33 43 37 30 23 23 267 18 32 18 32 22 15 9 9 19 1.0 5 232 278.0 0 267.8 236.1 279.7 269.5 236.7
1957 10 12 1701 3 23 30 27 37 27 27 17 33 220 9 15 12 22 12 12 6 18 13 0.8 4 236 284.0 0 267.8 236.6 285.7 269.5 237.1
1957 10 13 1701 4 50 53 30 23 27 23 43 40 290 48 56 15 9 12 9 32 27 26 1.2 6 244 281.0 0 268.1 236.9 282.7 269.9 237.5
1957 10 14 1701 5 43 63 57 50 43 53 40 50 400 32 94 67 48 32 56 27 48 50 1.6 7 232 289.0 0 268.2 237.4 290.7 270.0 238.0
1957 10 15 1701 6 33 20 17 23 30 27 33 20 203 18 7 6 9 15 12 18 7 12 0.7 3 264 277.0 0 268.7 238.0 278.9 270.5 238.6
1957 10 16 1701 7 13 3 3 7 13 13 17 3 73 5 2 2 3 5 5 6 2 4 0.1 0 268 289.0 0 269.1 238.7 291.0 271.0 239.3
1957 10 17 1701 8 13 13 13 30 27 20 10 13 140 5 5 5 15 12 7 4 5 7 0.4 2 251 272.0 0 269.5 239.4 273.9 271.5 240.1
1957 10 18 1701 9 17 13 17 13 7 17 27 13 123 6 5 6 5 3 6 12 5 6 0.3 1 222 294.0 0 270.0 240.6 296.1 271.9 241.3
1957 10 19 1701 10 7 13 27 33 17 23 27 17 163 3 5 12 18 6 9 12 6 9 0.5 2 217 291.0 0 270.3 241.8 293.0 272.3 242.5
1957 10 20 1701 11 20 23 13 20 20 30 27 40 193 7 9 5 7 7 15 12 27 11 0.6 3 230 303.0 0 270.5 243.2 305.1 272.5 243.9
1957 10 21 1701 12 33 27 27 17 27 40 37 67 273 18 12 12 6 12 27 22 111 28 1.2 6 237 282.0 0 270.9 244.1 284.0 273.0 244.9
1957 10 22 1701 13 43 30 37 37 23 33 27 37 267 32 15 22 22 9 18 12 22 19 1.0 5 241 274.0 0 271.2 245.1 276.2 273.4 245.9
2030 06 21 3892 1 1 1 1 1 1 1 1 1 8 0 0 0 0 0 0 0 0 4 220.0 0 220.0 210.0 150.0 150.0 180.0
2030 06 22 3892 1 1 1 1 1 1 1 1 1 8 0 0 0 0 0 0 0 0 4 100.0 0 100.0 100.0 100.0 100.0 100.0
1957 10 24 1701 15 20 17 20 23 27 17 37 10 170 7 6 7 9 12 6 22 4 9 0.5 2 276 280.0 0 271.3 247.3 282.2 273.6 248.2
1957 10 25 1701 16 20 17 20 30 20 13 20 23 163 7 6 7 15 7 5 7 9 8 0.4 2 240 259.0 0 271.6 248.2 261.1 273.8 249.1
1957 10 26 1701 17 30 20 13 23 20 13 17 20 157 15 7 5 9 7 5 6 7 8 0.4 2 293 266.0 0 271.8 249.2 268.1 274.1 250.1
1957 10 27 1701 18 20 20 20 27 40 33 20 23 203 7 7 7 12 27 18 7 9 12 0.7 3 280 296.0 0 271.9 250.6 298.4 274.2 251.5
END OBSERVED

48 changes: 48 additions & 0 deletions Tudat/Astrodynamics/Aerodynamics/UnitTests/swAtmosTestWithAdjust.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
DATATYPE CssiSpaceWeather
VERSION 1.2
UPDATED 2016 Mar 24 18:35:11 UTC
# --------------------------------------------------------------------------------------------------------------------------------
# ANALYTICAL GRAPHICS, INC.
# CENTER FOR SPACE STANDARDS & INNOVATION
# SPACE WEATHER DATA
# --------------------------------------------------------------------------------------------------------------------------------
#
# See http://celestrak.com/SpaceData/SpaceWx-format.asp for format details.
#
# FORMAT(I4,I3,I3,I5,I3,8I3,I4,8I4,I4,F4.1,I2,I4,F6.1,I2,5F6.1)
# --------------------------------------------------------------------------------------------------------------------------------
# Adj Adj Adj Obs Obs Obs
# yy mm dd BSRN ND Kp Kp Kp Kp Kp Kp Kp Kp Sum Ap Ap Ap Ap Ap Ap Ap Ap Avg Cp C9 ISN F10.7 Q Ctr81 Lst81 F10.7 Ctr81 Lst81
# --------------------------------------------------------------------------------------------------------------------------------
#
NUM_OBSERVED_POINTS 21360
BEGIN OBSERVED
1957 10 01 1700 19 43 40 30 20 37 23 43 37 273 32 27 15 7 22 9 32 22 21 1.1 5 236 268.0 0 265.2 230.6 269.3 266.6 230.9
1957 10 02 1700 20 37 37 17 17 27 23 17 30 203 22 22 6 6 12 9 6 15 12 0.7 3 234 252.0 0 266.0 231.4 253.3 267.4 231.7
1957 10 03 1700 21 27 20 13 33 37 47 43 30 250 12 7 5 18 22 39 32 15 19 1.0 5 242 265.0 0 266.7 232.3 266.3 268.1 232.7
1957 10 04 1700 22 30 30 23 27 23 27 30 27 217 15 15 9 12 9 12 15 12 12 0.7 3 217 237.0 0 267.4 232.9 238.2 268.8 233.3
1957 10 05 1700 23 30 30 17 23 20 27 27 20 193 15 15 6 9 7 12 12 7 10 0.6 3 219 245.0 0 267.8 233.5 246.2 269.3 233.9
1957 10 06 1700 24 17 3 10 7 0 0 3 3 43 6 2 4 3 0 0 2 2 2 0.0 0 227 250.0 0 268.1 233.9 251.2 269.6 234.3
1957 10 07 1700 25 10 20 17 17 17 7 20 13 120 4 7 6 6 6 3 7 5 6 0.2 1 234 253.0 0 268.4 234.2 254.3 269.9 234.6
1957 10 08 1700 26 17 0 10 7 3 3 3 3 47 6 0 4 3 2 2 2 2 3 0.0 0 244 261.0 0 268.2 234.7 262.6 269.8 235.2
1957 10 09 1700 27 3 17 23 17 23 23 20 23 150 2 6 9 6 9 9 7 9 7 0.4 2 267 275.0 0 268.3 235.2 276.6 270.0 235.7
1957 10 10 1701 1 30 40 40 30 23 30 37 27 257 15 27 27 15 9 15 22 12 18 1.0 5 264 275.0 0 268.2 235.6 276.6 269.8 236.1
1957 10 11 1701 2 33 43 33 43 37 30 23 23 267 18 32 18 32 22 15 9 9 19 1.0 5 232 278.0 0 267.8 236.1 279.7 269.5 236.7
1957 10 12 1701 3 23 30 27 37 27 27 17 33 220 9 15 12 22 12 12 6 18 13 0.8 4 236 284.0 0 267.8 236.6 285.7 269.5 237.1
1957 10 13 1701 4 50 53 30 23 27 23 43 40 290 48 56 15 9 12 9 32 27 26 1.2 6 244 281.0 0 268.1 236.9 282.7 269.9 237.5
1957 10 14 1701 5 43 63 57 50 43 53 40 50 400 32 94 67 48 32 56 27 48 50 1.6 7 232 289.0 0 268.2 237.4 290.7 270.0 238.0
1957 10 15 1701 6 33 20 17 23 30 27 33 20 203 18 7 6 9 15 12 18 7 12 0.7 3 264 277.0 0 268.7 238.0 278.9 270.5 238.6
1957 10 16 1701 7 13 3 3 7 13 13 17 3 73 5 2 2 3 5 5 6 2 4 0.1 0 268 289.0 0 269.1 238.7 291.0 271.0 239.3
1957 10 17 1701 8 13 13 13 30 27 20 10 13 140 5 5 5 15 12 7 4 5 7 0.4 2 251 272.0 0 269.5 239.4 273.9 271.5 240.1
1957 10 18 1701 9 17 13 17 13 7 17 27 13 123 6 5 6 5 3 6 12 5 6 0.3 1 222 294.0 0 270.0 240.6 296.1 271.9 241.3
1957 10 19 1701 10 7 13 27 33 17 23 27 17 163 3 5 12 18 6 9 12 6 9 0.5 2 217 291.0 0 270.3 241.8 293.0 272.3 242.5
1957 10 20 1701 11 20 23 13 20 20 30 27 40 193 7 9 5 7 7 15 12 27 11 0.6 3 230 303.0 0 270.5 243.2 305.1 272.5 243.9
1957 10 21 1701 12 33 27 27 17 27 40 37 67 273 18 12 12 6 12 27 22 111 28 1.2 6 237 282.0 0 270.9 244.1 284.0 273.0 244.9
1957 10 22 1701 13 43 30 37 37 23 33 27 37 267 32 15 22 22 9 18 12 22 19 1.0 5 241 274.0 0 271.2 245.1 276.2 273.4 245.9
2030 06 21 3892 1 1 1 1 1 1 1 1 1 8 0 0 0 0 0 0 0 0 4 150.0 1 150.0 210.0 250.0 250.0 180.0
1957 10 24 1701 15 20 17 20 23 27 17 37 10 170 7 6 7 9 12 6 22 4 9 0.5 2 276 280.0 0 271.3 247.3 282.2 273.6 248.2
1957 10 25 1701 16 20 17 20 30 20 13 20 23 163 7 6 7 15 7 5 7 9 8 0.4 2 240 259.0 0 271.6 248.2 261.1 273.8 249.1
1957 10 26 1701 17 30 20 13 23 20 13 17 20 157 15 7 5 9 7 5 6 7 8 0.4 2 293 266.0 0 271.8 249.2 268.1 274.1 250.1
1957 10 27 1701 18 20 20 20 27 40 33 20 23 203 7 7 7 12 27 18 7 9 12 0.7 3 280 296.0 0 271.9 250.6 298.4 274.2 251.5
END OBSERVED

Loading