Skip to content

Commit

Permalink
Corrections for PR
Browse files Browse the repository at this point in the history
  • Loading branch information
mclarke2 committed Dec 9, 2021
1 parent 4633fb9 commit f685c51
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 4 deletions.
18 changes: 14 additions & 4 deletions regression/scripts/battery/aircraft_discharge_comparisons.py
Expand Up @@ -321,7 +321,9 @@ def GA_mission_setup(analyses,vehicle):
segment.altitude_end = 8012 * Units.feet
segment.air_speed = 96.4260 * Units['mph']
segment.climb_rate = 700.034 * Units['ft/min']
segment = vehicle.networks.battery_propeller.add_unknowns_and_residuals_to_segment(segment)
segment = vehicle.networks.battery_propeller.add_unknowns_and_residuals_to_segment(segment)

# add to misison
mission.append_segment(segment)

# ------------------------------------------------------------------
Expand All @@ -333,7 +335,9 @@ def GA_mission_setup(analyses,vehicle):
segment.altitude = 8012 * Units.feet
segment.air_speed = 120.91 * Units['mph']
segment.distance = 20. * Units.nautical_mile
segment = vehicle.networks.battery_propeller.add_unknowns_and_residuals_to_segment(segment)
segment = vehicle.networks.battery_propeller.add_unknowns_and_residuals_to_segment(segment)

# add to misison
mission.append_segment(segment)


Expand All @@ -350,7 +354,9 @@ def GA_mission_setup(analyses,vehicle):
segment.climb_rate = -200 * Units['ft/min']
segment.state.unknowns.throttle = 0.8 * ones_row(1)
segment = vehicle.networks.battery_propeller.add_unknowns_and_residuals_to_segment(segment, initial_power_coefficient = 0.1)
mission.append_segment(segment)

# add to misison
mission.append_segment(segment)

# ------------------------------------------------------------------
# Charge Segment:
Expand All @@ -362,8 +368,10 @@ def GA_mission_setup(analyses,vehicle):
segment.battery_discharge = False
segment.increment_battery_cycle_day = True
segment = vehicle.networks.battery_propeller.add_unknowns_and_residuals_to_segment(segment)
mission.append_segment(segment)

# add to misison
mission.append_segment(segment)

return mission


Expand Down Expand Up @@ -527,6 +535,8 @@ def EVTOL_mission_setup(analyses,vehicle):
segment.battery_discharge = False
segment.increment_battery_cycle_day = True
segment = vehicle.networks.lift_cruise.add_lift_unknowns_and_residuals_to_segment(segment)

# add to misison
mission.append_segment(segment)

return mission
Expand Down
Binary file modified regression/scripts/multifidelity/f_data.npy
Binary file not shown.
Binary file modified regression/scripts/multifidelity/x_samples.npy
Binary file not shown.
1 change: 1 addition & 0 deletions trunk/SUAVE/Methods/Aerodynamics/AVL/Data/Cases.py
Expand Up @@ -5,6 +5,7 @@
# Modified: Jan 2016, E. Botero
# Jun 2017, M. Clarke
# Aug 2019, M. Clarke
# Dec 2021, M. Clarke
# ----------------------------------------------------------------------
# Imports
# ----------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions trunk/SUAVE/Methods/Aerodynamics/AVL/Data/Settings.py
Expand Up @@ -5,6 +5,7 @@
# Modified: Jan 2016, E. Botero
# Oct 2018, M. Clarke
# Aug 2019, M. Clarke
# Dec 2021, M. Clarke
# ----------------------------------------------------------------------
# Imports
# ----------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py
Expand Up @@ -5,6 +5,7 @@
# Modified: Jan 2016, E. Botero
# Dec 2017, M. Clarke
# Aug 2019, M. Clarke
# Dec 2021, M. Clarke
# ----------------------------------------------------------------------
# Imports
# ----------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions trunk/SUAVE/Methods/Aerodynamics/AVL/run_analysis.py
Expand Up @@ -5,6 +5,7 @@
# Modified: Jan 2016, E. Botero
# Jul 2017, M. Clarke
# Aug 2019, M. Clarke
# Dec 2021, M. Clarke
# ----------------------------------------------------------------------
# Imports
# ----------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions trunk/SUAVE/Methods/Aerodynamics/AVL/translate_data.py
Expand Up @@ -4,6 +4,7 @@
# Created: Mar 2015, T. Momose
# Modified: Jan 2016, E. Botero
# Apr 2017, M. Clarke
# Dec 2021, M. Clarke

# ----------------------------------------------------------------------
# Imports
Expand Down
1 change: 1 addition & 0 deletions trunk/SUAVE/Methods/Aerodynamics/AVL/write_input_deck.py
Expand Up @@ -5,6 +5,7 @@
# Modified: Jan 2016, E. Botero
# Apr 2017, M. Clarke
# Aug 2019, M. Clarke
# Dec 2021, M. Clarke
# ----------------------------------------------------------------------
# Imports
# ----------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions trunk/SUAVE/Methods/Aerodynamics/AVL/write_run_cases.py
Expand Up @@ -6,6 +6,7 @@
# Apr 2017, M. Clarke
# Aug 2019, M. Clarke
# Apr 2020, M. Clarke
# Dec 2021, M. Clarke

# ----------------------------------------------------------------------
# Imports
Expand Down
1 change: 1 addition & 0 deletions trunk/SUAVE/Plots/Geometry/plot_vehicle.py
Expand Up @@ -6,6 +6,7 @@
# Jul 2020, M. Clarke
# Jul 2021, E. Botero
# Oct 2021, M. Clarke
# Dec 2021, M. Clarke

# ----------------------------------------------------------------------
# Imports
Expand Down
Expand Up @@ -4,6 +4,7 @@
# Created: Mar 2020, M. Clarke
# Apr 2020, M. Clarke
# Jul 2020, M. Clarke
# Dec 2021, M. Clarke

# ----------------------------------------------------------------------
# Imports
Expand Down

0 comments on commit f685c51

Please sign in to comment.