Skip to content

Commit

Permalink
Merge pull request #179 from NREL/f3/thermal
Browse files Browse the repository at this point in the history 
F3/thermal
  • Loading branch information
@calbaker
calbaker authored Jan 8, 2025
2 parents a01dc98 + ef645de commit e3729f7
Show file tree
Hide file tree
Showing 115 changed files with 3,446 additions and 2,091 deletions.
251 changes: 105 additions & 146 deletions Cargo.lock
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ opt-level = 3
document-features = "0.2.10"
fastsim-core = { path = "fastsim-core" }
anyhow = "1.0.71"
pyo3 = "0.19"
numpy = "0.19"
pyo3 = "0.23.3"
numpy = "0.23"
uom = { version = "0.35.0", features = ["use_serde"] }
fastsim-2 = { package = "fastsim-core", version = "~0" }
fastsim-2 = { package = "fastsim-core", version = "~0", features = ["pyo3", "resources"] }
3 changes: 2 additions & 1 deletion build_and_test.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cargo test && \
pip install -e .[dev] && \
# pytest -v python/fastsim/tests/ &&
pytest -v
pytest -v && \
echo "Complete success!"
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2010 Mazda 3 i-Stop.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2012 Ford Focus.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2012 Ford Fusion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 AUDI A3 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 BMW 328d 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 CHEVROLET Malibu 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 FORD C-MAX HEV.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 FORD Escape 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 FORD Explorer 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 HYUNDAI Elantra 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 Hyundai Tucson Fuel Cell.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 Nissan Leaf 30 kWh.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 TESLA Model S60 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Camry 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Corolla 4cyl 2WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Highlander Hybrid.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 Toyota Prius Two FWD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2017 CHEVROLET Bolt.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2017 Maruti Dzire VDI.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2017 Toyota Highlander 3.5 L.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2020 Chevrolet Colorado 2WD Diesel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2020 Hero Splendor+ 100cc.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2020 VW Golf 1.5TSI.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2020 VW Golf 2.0TDI.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2021 BMW iX xDrive40.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2021 Cupra Born.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2021 Fiat Panda Mild Hybrid.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2021 Honda N-Box G.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2021 Peugot 3008.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Ford F-150 Lightning 4WD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 MINI Cooper SE Hardtop 2 door.yaml
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Renault Megane E-Tech.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Renault Zoe ZE50 R135.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Tesla Model 3 RWD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Tesla Model Y RWD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Toyota RAV4 Hybrid LE.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Toyota Yaris Hybrid Mid.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,5 +715,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2022 Volvo XC40 Recharge twin.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2023 Mitsubishi Pajero Sport.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2023 Polestar 2 Long range Dual motor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2023 Volvo C40 Recharge.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2024 BYD Dolphin Active.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2024 Toyota Vios 1.5 G.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,6 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
elev_curr_meters: 180.0
air_density_kilograms_per_cubic_meter: 1.172
mass_kilograms: .nan
Loading

0 comments on commit e3729f7

Please sign in to comment.