Skip to content

Updates to allow for upgraded vehicle repository #259

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

Draft
kylecarow wants to merge 4 commits into
base: fastsim-3
Choose a base branch
from
Draft

Updates to allow for upgraded vehicle repository #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dbdaaa
commit to create PR
kylecarow Jun 18, 2026
43f4eae
Merge branch 'fastsim-3' into f3/vehicle-repo-changes
kylecarow Jul 6, 2026
97f8e18
introduce make, model, fastsim version fields. change year to Option\…
kylecarow Jul 6, 2026
4eea855
cargo fmt, plumbed up version checking logic, updated cal_and_val veh…
kylecarow Jul 6, 2026
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
29 changes: 25 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions cal_and_val/f3-vehicles/2010 Mazda 3 i-Stop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
---
name: 2010 Mazda 3 i-Stop
min_fastsim_version: 1.0.4
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2010
year: "2010"
make: ~
model: ~
pt_type:
Conv:
fs:
pwr_out_max_watts: 2000000.0
pwr_ramp_lag_seconds: 1.0
energy_capacity_joules: 1587600000.0
specific_energy_joules_per_kilogram: ~
specific_energy_joules_per_kilogram: 43200000.0
mass_kilograms: ~
fc:
thrml: None
Expand Down Expand Up @@ -141,8 +144,8 @@ chassis:
drive_axle_weight_frac: 0.61
wheel_base_meters: 2.6
mass_kilograms: ~
glider_mass_kilograms: ~
cargo_mass_kilograms: ~
glider_mass_kilograms: 1045.636
cargo_mass_kilograms: 136.0
cabin: None
hvac: None
mass_kilograms: 1473.9
Expand All @@ -152,6 +155,7 @@ state:
i: 0
time_seconds: 0.0
pwr_prop_fwd_max_watts: 0.0
speed_trac_fwd_max_meters_per_second: 0.0
pwr_prop_bwd_max_watts: 0.0
pwr_tractive_watts: 0.0
pwr_tractive_for_cyc_watts: 0.0
Expand Down Expand Up @@ -182,6 +186,7 @@ history:
i: []
time_seconds: []
pwr_prop_fwd_max_watts: []
speed_trac_fwd_max_meters_per_second: []
pwr_prop_bwd_max_watts: []
pwr_tractive_watts: []
pwr_tractive_for_cyc_watts: []
Expand Down
13 changes: 9 additions & 4 deletions cal_and_val/f3-vehicles/2012 Ford Focus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
---
name: 2012 Ford Focus
min_fastsim_version: 1.0.4
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2012
year: "2012"
make: ~
model: ~
pt_type:
Conv:
fs:
pwr_out_max_watts: 2000000.0
pwr_ramp_lag_seconds: 1.0
energy_capacity_joules: 1587600000.0
specific_energy_joules_per_kilogram: ~
specific_energy_joules_per_kilogram: 43200000.0
mass_kilograms: ~
fc:
thrml: None
Expand Down Expand Up @@ -141,8 +144,8 @@ chassis:
drive_axle_weight_frac: 0.61
wheel_base_meters: 2.6
mass_kilograms: ~
glider_mass_kilograms: ~
cargo_mass_kilograms: ~
glider_mass_kilograms: 1045.636
cargo_mass_kilograms: 136.0
cabin: None
hvac: None
mass_kilograms: 1473.9
Expand All @@ -152,6 +155,7 @@ state:
i: 0
time_seconds: 0.0
pwr_prop_fwd_max_watts: 0.0
speed_trac_fwd_max_meters_per_second: 0.0
pwr_prop_bwd_max_watts: 0.0
pwr_tractive_watts: 0.0
pwr_tractive_for_cyc_watts: 0.0
Expand Down Expand Up @@ -182,6 +186,7 @@ history:
i: []
time_seconds: []
pwr_prop_fwd_max_watts: []
speed_trac_fwd_max_meters_per_second: []
pwr_prop_bwd_max_watts: []
pwr_tractive_watts: []
pwr_tractive_for_cyc_watts: []
Expand Down
13 changes: 9 additions & 4 deletions cal_and_val/f3-vehicles/2012 Ford Fusion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
---
name: 2012 Ford Fusion
min_fastsim_version: 1.0.4
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2012
year: "2012"
make: ~
model: ~
pt_type:
Conv:
fs:
pwr_out_max_watts: 1000000.0
pwr_ramp_lag_seconds: 1.0
energy_capacity_joules: 2124000000.0
specific_energy_joules_per_kilogram: ~
specific_energy_joules_per_kilogram: 43200000.0
mass_kilograms: ~
fc:
thrml: None
Expand Down Expand Up @@ -141,8 +144,8 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.72
mass_kilograms: ~
glider_mass_kilograms: ~
cargo_mass_kilograms: ~
glider_mass_kilograms: 791.0702892
cargo_mass_kilograms: 136.0
cabin: None
hvac: None
mass_kilograms: 1644.2724500334996
Expand All @@ -152,6 +155,7 @@ state:
i: 0
time_seconds: 0.0
pwr_prop_fwd_max_watts: 0.0
speed_trac_fwd_max_meters_per_second: 0.0
pwr_prop_bwd_max_watts: 0.0
pwr_tractive_watts: 0.0
pwr_tractive_for_cyc_watts: 0.0
Expand Down Expand Up @@ -182,6 +186,7 @@ history:
i: []
time_seconds: []
pwr_prop_fwd_max_watts: []
speed_trac_fwd_max_meters_per_second: []
pwr_prop_bwd_max_watts: []
pwr_tractive_watts: []
pwr_tractive_for_cyc_watts: []
Expand Down
19 changes: 12 additions & 7 deletions cal_and_val/f3-vehicles/2016 AUDI A3 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
---
name: 2016 AUDI A3 4cyl 2WD
min_fastsim_version: 1.0.4
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
year: "2016"
make: ~
model: ~
pt_type:
Conv:
fs:
pwr_out_max_watts: 2000000.0
pwr_ramp_lag_seconds: 1.0
energy_capacity_joules: 1587600000.0
specific_energy_joules_per_kilogram: ~
specific_energy_joules_per_kilogram: 43200000.0
mass_kilograms: ~
fc:
thrml: None
mass_kilograms: ~
specific_pwr_watts_per_kilogram: ~
pwr_out_max_watts: 126000.0
pwr_out_max_watts: 112000.0
pwr_out_max_init_watts: 18666.666666666668
pwr_ramp_lag_seconds: 6.0
eff_interp_from_pwr_out:
Expand Down Expand Up @@ -136,13 +139,13 @@ chassis:
wheel_radius_meters: 0.336
tire_code: ~
cg_height_meters: 0.53
wheel_fric_coef: 0.8
wheel_fric_coef: 0.7
drive_type: FWD
drive_axle_weight_frac: 0.61
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: ~
glider_mass_kilograms: ~
cargo_mass_kilograms: ~
glider_mass_kilograms: 1089.051
cargo_mass_kilograms: 136.0
cabin: None
hvac: None
mass_kilograms: 1606.0927171041076
Expand All @@ -152,6 +155,7 @@ state:
i: 0
time_seconds: 0.0
pwr_prop_fwd_max_watts: 0.0
speed_trac_fwd_max_meters_per_second: 0.0
pwr_prop_bwd_max_watts: 0.0
pwr_tractive_watts: 0.0
pwr_tractive_for_cyc_watts: 0.0
Expand Down Expand Up @@ -182,6 +186,7 @@ history:
i: []
time_seconds: []
pwr_prop_fwd_max_watts: []
speed_trac_fwd_max_meters_per_second: []
pwr_prop_bwd_max_watts: []
pwr_tractive_watts: []
pwr_tractive_for_cyc_watts: []
Expand Down
19 changes: 12 additions & 7 deletions cal_and_val/f3-vehicles/2016 BMW 328d 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
---
name: 2016 BMW 328d 4cyl 2WD
min_fastsim_version: 1.0.4
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
year: "2016"
make: ~
model: ~
pt_type:
Conv:
fs:
pwr_out_max_watts: 2000000.0
pwr_ramp_lag_seconds: 1.0
energy_capacity_joules: 1803600000.0
specific_energy_joules_per_kilogram: ~
specific_energy_joules_per_kilogram: 43200000.0
mass_kilograms: ~
fc:
thrml: None
Expand Down Expand Up @@ -136,13 +139,13 @@ chassis:
wheel_radius_meters: 0.336
tire_code: ~
cg_height_meters: 0.53
wheel_fric_coef: 0.8
drive_type: RWD
drive_axle_weight_frac: 0.61
wheel_fric_coef: 0.7
drive_type: FWD
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: ~
glider_mass_kilograms: ~
cargo_mass_kilograms: ~
glider_mass_kilograms: 1409.717
cargo_mass_kilograms: 136.0
cabin: None
hvac: None
mass_kilograms: 1950.3695157008785
Expand All @@ -152,6 +155,7 @@ state:
i: 0
time_seconds: 0.0
pwr_prop_fwd_max_watts: 0.0
speed_trac_fwd_max_meters_per_second: 0.0
pwr_prop_bwd_max_watts: 0.0
pwr_tractive_watts: 0.0
pwr_tractive_for_cyc_watts: 0.0
Expand Down Expand Up @@ -182,6 +186,7 @@ history:
i: []
time_seconds: []
pwr_prop_fwd_max_watts: []
speed_trac_fwd_max_meters_per_second: []
pwr_prop_bwd_max_watts: []
pwr_tractive_watts: []
pwr_tractive_for_cyc_watts: []
Expand Down
11 changes: 8 additions & 3 deletions cal_and_val/f3-vehicles/2016 BMW i3 REx PHEV.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
---
name: 2016 BMW i3 REx PHEV
min_fastsim_version: 1.0.4
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
year: "2016"
make: ~
model: ~
pt_type:
PHEV:
res:
Expand Down Expand Up @@ -339,8 +342,8 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: ~
glider_mass_kilograms: ~
cargo_mass_kilograms: ~
glider_mass_kilograms: 607.577
cargo_mass_kilograms: 136.0
cabin: None
hvac: None
mass_kilograms: 1666.874423972619
Expand All @@ -350,6 +353,7 @@ state:
i: 0
time_seconds: 0.0
pwr_prop_fwd_max_watts: 0.0
speed_trac_fwd_max_meters_per_second: 0.0
pwr_prop_bwd_max_watts: 0.0
pwr_tractive_watts: 0.0
pwr_tractive_for_cyc_watts: 0.0
Expand Down Expand Up @@ -380,6 +384,7 @@ history:
i: []
time_seconds: []
pwr_prop_fwd_max_watts: []
speed_trac_fwd_max_meters_per_second: []
pwr_prop_bwd_max_watts: []
pwr_tractive_watts: []
pwr_tractive_for_cyc_watts: []
Expand Down
13 changes: 9 additions & 4 deletions cal_and_val/f3-vehicles/2016 CHEVROLET Malibu 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
---
name: 2016 CHEVROLET Malibu 4cyl 2WD
min_fastsim_version: 1.0.4
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
year: "2016"
make: ~
model: ~
pt_type:
Conv:
fs:
pwr_out_max_watts: 2000000.0
pwr_ramp_lag_seconds: 1.0
energy_capacity_joules: 1562400000.0
specific_energy_joules_per_kilogram: ~
specific_energy_joules_per_kilogram: 43200000.0
mass_kilograms: ~
fc:
thrml: None
Expand Down Expand Up @@ -141,8 +144,8 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: ~
glider_mass_kilograms: ~
cargo_mass_kilograms: ~
glider_mass_kilograms: 1146.223
cargo_mass_kilograms: 136.0
cabin: None
hvac: None
mass_kilograms: 1666.874756172356
Expand All @@ -152,6 +155,7 @@ state:
i: 0
time_seconds: 0.0
pwr_prop_fwd_max_watts: 0.0
speed_trac_fwd_max_meters_per_second: 0.0
pwr_prop_bwd_max_watts: 0.0
pwr_tractive_watts: 0.0
pwr_tractive_for_cyc_watts: 0.0
Expand Down Expand Up @@ -182,6 +186,7 @@ history:
i: []
time_seconds: []
pwr_prop_fwd_max_watts: []
speed_trac_fwd_max_meters_per_second: []
pwr_prop_bwd_max_watts: []
pwr_tractive_watts: []
pwr_tractive_for_cyc_watts: []
Expand Down
Loading
Loading