connor/thesis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab.rconnorjohnstone.com/school/thesis

Browse Source
This commit is contained in:
Connor
2021-09-22 22:21:14 -06:00
parent 80e352059e b5154ff471
commit 7d0037f38d
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
julia/src/inner_loop/inner_loop.jl
View File

@@ -44,7 +44,7 @@ function inner_loop(launch_date::DateTime,
end end
time = utc2et(Dates.format(launch_date,"yyyy-mm-ddTHH:MM:SS")) time = utc2et(Dates.format(launch_date,"yyyy-mm-ddTHH:MM:SS"))
thrust_profiles = [] thrust_profiles = Vector{Matrix{Float64}}()
for phase in phases for phase in phases
planet1_state = [spkssb(ids[phase.from_planet], time, "ECLIPJ2000"); 0.0] planet1_state = [spkssb(ids[phase.from_planet], time, "ECLIPJ2000"); 0.0]

17
julia/test/inner_loop/inner_loop.jl
View File

@@ -47,15 +47,14 @@
# The first leg should be valid # The first leg should be valid
fresh_sc = copy(sc) fresh_sc = copy(sc)
mass, thrusts = inner_loop( launch_date, thrusts = inner_loop( launch_date,
sc, sc,
start_mass, start_mass,
[phase1], [phase1],
verbose=true, verbose=true,
mbh_specs=(25,50) ) mbh_specs=(25,50) )
@test sc.mass > sc.dry_mass path, final = prop(thrusts[1], earth_state+[zeros(3);v∞s[1];0.0], Sc("test"), μs["Sun"], leg1_tof)
path, final = prop(thrusts[1], earth_state+[zeros(3);v∞s[1]], fresh_sc, μs["Sun"], leg1_tof) @test final[1:6] ≈ p1_state[1:6] + [zeros(3); v∞s[2]]
@test final ≈ p1_state + [zeros(3); v∞s[2]]
savefig(plot_orbits( [earth, p1_path, path], savefig(plot_orbits( [earth, p1_path, path],
primary="Sun", primary="Sun",
labels=["Earth", p1, "Leg 1"], labels=["Earth", p1, "Leg 1"],