Aeroshell Config

diagnostic_interface/canvas/realtime_canvas.py

@@ -6,7 +6,6 @@
 from diagnostic_interface import settings
 from PyQt5.QtWidgets import QMessageBox
 import mplcursors
-from datetime import timezone
 from dateutil import tz
 
 

diagnostic_interface/widgets/realtime_map_widget.py

@@ -45,7 +45,8 @@ def update_map(self, vertex_values: NDArray[float], latitudes: NDArray, longitud
             touchZoom=False,
         )
 
-        get_coord = lambda x: [latitudes[x], longitudes[x]]
+        def get_coord(x):
+            return [latitudes[x], longitudes[x]]
 
         for i, (latitude, longitude, vertex_value) in enumerate(zip(latitudes, longitudes, vertex_values)):
             color = mcolors.to_hex(cmap(norm(vertex_value)))

micro_strategy/__init__.py

@@ -3,3 +3,6 @@
 
 OptimizedSpeedsPath = Path(__file__).parent / "optimization_results" / "optimized_speeds_filtered.npy"
 
+__all__ = [
+    "run_micro_simulation"
+]

prescriptive_interface/prescriptive_ui.py

@@ -11,18 +11,18 @@
 from diagnostic_interface.widgets import SplashOverlay
 from simulation.cmd.run_simulation import get_default_settings
 from simulation.config import SimulationReturnType, SimulationHyperparametersConfig, InitialConditions
-from pathlib import Path
 from PyQt5.QtCore import QTimer
 from PyQt5.QtCore import Qt
 
 from qt_material import apply_stylesheet
 
-config_dir = Path(__file__).parent.parent / "simulation" / "config"
 
 from pathlib import Path
 from prescriptive_interface import (SimulationTab, OptimizationTab, HtmlViewerTab, SimulationSettingsDict, OptimizationThread,
                                     SimulationThread, MutableInitialConditions, InitialConditionsDialog)
 
+config_dir = Path(__file__).parent.parent / "simulation" / "config"
+
 my_speeds_dir = Path("prescriptive_interface/speeds_directory")
 my_speeds_dir.mkdir(parents=True, exist_ok=True)  # Create it if it doesn't exist
 

pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
     "tomli>=2.2.1",
     "tomli-w>=1.2.0",
     "qt-material>=2.17",
-    "ubc-solar-physics==1.8.2",
+    "ubc-solar-physics==1.9.1",
 ]
 
 [project.urls]

simulation/config/BrightSide.toml

@@ -33,7 +33,7 @@ max_acceleration = 6
 max_deceleration = 6
 
 [motor_config]
-motor_type = "AdvancedMotor"
+motor_type = "BasicMotor"
 road_friction = 2.340e-02
 tire_radius = 0.2032
 vehicle_frontal_area = 1.1853
@@ -43,3 +43,10 @@ drag_coefficient = 1.166e-01
 
 [motor_config.AdvancedMotor]
 cornering_coefficient = 1.0
+
+[aeroshell_config]
+drag_lookup = {0 = 0.137601477, 18 =  0.2335363083, 36 =  0.5965968882, 54= 1.224448936, 72= 1.861868971, 90= 2.38148208, 108= 2.073196244, 126= 1.587471653, 144= 0.5564901716, 162= 0.2141437734, 180= 0.1386601712 }
+down_lookup = {0=0.37526598, 18= 0.3378390168, 36= 0.576439927, 54= 0.8675973423, 72= 1.19551954, 90= 2.683269654, 108= 2.223002744, 126= 1.581662338, 144= 0.17190782, 162= 0.1882638387, 180= 0.2153506426 }
+
+
+

simulation/config/models/_car.py

@@ -102,6 +102,15 @@ class AdvancedMotorConfig(MotorConfig):
     cornering_coefficient: float
 
 
+class AeroshellConfig(Config):
+    """
+        Configuration object describing the aerodynamics forces (specifically drag and downforce) of a vehicle.
+    """
+    model_config = ConfigDict(frozen=True)
+    drag_lookup: dict[float, float]  #lookup table that corresponds angles to drag force, computed by a CFD
+    down_lookup: dict[float, float]  #lookup table that corresponds angles to down force, computed by a CFD
+
+
 class RegenConfig(Config):
     """
     Configuration object describing the regenerative braking systems of a vehicle.
@@ -123,5 +132,6 @@ class CarConfig(Config):
     battery_config: BatteryConfig
     motor_config: MotorConfig
     regen_config: RegenConfig
+    aeroshell_config: AeroshellConfig
 
     name: str

simulation/model/Model.py

@@ -15,6 +15,7 @@
 from physics.models.battery import BaseBattery
 from physics.models.lvs import BaseLVS
 from physics.models.motor import BaseMotor
+from physics.models.aeroshell import Aeroshell
 from physics.models.regen import BaseRegen
 from physics.environment.gis import BaseGIS
 from physics.environment.meteorology import BaseMeteorology
@@ -36,6 +37,7 @@ def __init__(
         array: BaseArray,
         battery: BaseBattery,
         motor: BaseMotor,
+        aeroshell: Aeroshell,
         regen: BaseRegen,
         lvs: BaseLVS,
         gis: BaseGIS,
@@ -56,6 +58,7 @@ def __init__(
         :param BaseArray array: An instance of `BaseArray` representing the solar array to be simulated.
         :param BaseBattery battery: An instance of `BaseBattery` representing the batter pack to be simulated.
         :param BaseMotor motor: An instance of `BaseMotor` representing the motor to be simulated.
+        :param Aeroshell aeroshell: An instance of the Aeroshell class that represents the drag and down force calculations
         :param BaseRegen regen: An instance of `BaseRegen` representing the regenerative braking system to be simulated.
         :param BaseLVS lvs: An instance of `BaseLVS` representing the low-voltage systems to be simulated.
         :param BaseGIS gis: An instance of `BaseGIS` which characterizes geographical information about the simulation.
@@ -72,6 +75,7 @@ def __init__(
         self.simulation_dt = simulation_dt
         self.solar_array = array
         self.motor = motor
+        self.aeroshell = aeroshell
         self.regen = regen
         self.battery = battery
         self.gis = gis

simulation/model/ModelBuilder.py

@@ -28,6 +28,7 @@
 from physics.models.battery import BaseBattery, BasicBattery, EquivalentCircuitBatteryModel, BatteryModelConfig
 from physics.models.lvs import BaseLVS, BasicLVS
 from physics.models.motor import BaseMotor, BasicMotor, AdvancedMotor
+from physics.models.aeroshell import Aeroshell
 from physics.models.regen import BaseRegen, BasicRegen
 from physics.environment.gis import BaseGIS, GIS
 from physics.environment.meteorology import (
@@ -70,6 +71,7 @@ def __init__(self, cache: Cache = None):
         self.gis: Optional[BaseGIS] = None
         self.meteorology: Optional[BaseMeteorology] = None
         self.motor: Optional[BaseMotor] = None
+        self.aeroshell: Optional[Aeroshell] = None
         self.battery: Optional[BaseBattery] = None
         self.regen: Optional[BaseRegen] = None
         self.max_acceleration: Optional[float] = None
@@ -424,6 +426,8 @@ def compile(self):
                     **self._car_config.motor_config.model_dump()
                 )
 
+        self.aeroshell = Aeroshell(**self._car_config.aeroshell_config.model_dump())
+
         self.regen = BasicRegen(self._car_config.vehicle_config.vehicle_mass)
 
         self.num_laps = self.route_data.tiling
@@ -474,6 +478,7 @@ def get(self) -> Model:
             array=self.array,
             battery=self.battery,
             motor=self.motor,
+            aeroshell=self.aeroshell,
             lvs=self.lvs,
             regen=self.regen,
             gis=self.gis,

simulation/model/Simulation.py

@@ -51,6 +51,8 @@ def __init__(self, model):
         self.tick_array = None
         self.time_zones = None
         self.distances = None
+        self.drag_force = None
+        self.down_force = None
         self.cumulative_distances = None
         self.closest_gis_indices = None
         self.closest_weather_indices = None
@@ -73,6 +75,7 @@ def __init__(self, model):
         self.time_in_motion = None
         self.final_soc = None
         self.map_data_indices = None
+        self.wind_attack_angles = None
 
     def run_simulation_calculations(self, speed_kmh: NDArray, track_speeds: NDArray) -> None:
         """
@@ -175,6 +178,12 @@ def run_simulation_calculations(self, speed_kmh: NDArray, track_speeds: NDArray)
         self.wind_speeds = get_array_directional_wind_speed(
             self.gis_vehicle_bearings, self.absolute_wind_speeds, self.wind_directions
         )
+        #get the wind attack angles
+        self.wind_attack_angles = self.model.meteorology.wind_direction - (self.gis_vehicle_bearings + 180) #convert azimuthal angle to meteorological convention
+
+        # with calculated wind_speeds, we can now calculate (aerodynamic) drag and down forces in order to pass into motor model calculations
+        self.drag_force = self.model.aeroshell.calculate_drag(self.wind_speeds, self.wind_attack_angles, self.speed_kmh/3.6)
+        self.down_force = self.model.aeroshell.calculate_down(self.wind_speeds, self.wind_attack_angles, self.speed_kmh/3.6)
 
         # Get an array of solar irradiance at every coordinate and time
         self.solar_irradiances = self.model.meteorology.calculate_solar_irradiances(
@@ -192,10 +201,8 @@ def run_simulation_calculations(self, speed_kmh: NDArray, track_speeds: NDArray)
             self.model.simulation_dt
         )
 
-        coords = self.model.gis.get_path()[:self.model.gis.num_unique_coords]
-        coords_at_each_tick = coords[self.closest_gis_indices]
         self.motor_consumed_energy = self.model.motor.calculate_energy_in(
-            self.speed_kmh, self.gradients, self.wind_speeds, self.model.simulation_dt, coords_at_each_tick
+            self.speed_kmh, self.gradients, self.drag_force, self.down_force, self.model.simulation_dt
         )
 
         self.array_produced_energy = self.model.solar_array.calculate_produced_energy(
@@ -344,6 +351,9 @@ def get_results(
             "map_data_indices": self.map_data_indices,
             "path_coordinates": self.model.gis.get_path(),
             "raw_soc": self.raw_soc,
+            "drag_force": self.drag_force,
+            "down_force": self.down_force,
+            "wind_attack_angles": self.wind_attack_angles,
         }
 
         if "default" in requested_properties or requested_properties == "default":

simulation/optimization/genetic.py

@@ -306,9 +306,6 @@ def __init__(
         # Bind the value of each gene to be between 0 and 1 as chromosomes should be normalized.
         gene_space = {"low": 0.0, "high": 1.0}
 
-        # Add a time delay between generations (used for debug purposes)
-        delay_after_generation = 0.0
-
         # Store diversity of generation per optimization iteration
         self.diversity = []
 
@@ -392,7 +389,7 @@ def get_initial_population(
 
         """
 
-        population_file = population_directory / "initial_population.npz"
+        population_file = "initial_population.npz"
         arrays_from_cache = 0
         new_initial_population = None