Skip to content

Introduce aux efficiency field aux_eff for FC and RES, deprecate Conv alt_eff #304

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

Open
kylecarow wants to merge 13 commits into
base: fastsim-3
Choose a base branch
from
Open

Introduce aux efficiency field aux_eff for FC and RES, deprecate Conv alt_eff #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a3b0320
preliminary aux load eff for RES
kylecarow Jul 20, 2026
579a387
switch from alt_eff to aux_eff for conv, proper compat plumbing and c…
kylecarow Jul 20, 2026
478e31c
regenerated vehicles
kylecarow Jul 20, 2026
265cab8
add version number to deprecate notice
kylecarow Jul 20, 2026
b0741c2
aux_supply_eff mandatory (defaults to 100%)
kylecarow Jul 21, 2026
0674b6f
minor init cleanup
kylecarow Jul 21, 2026
bf8628a
Merge remote-tracking branch 'origin/f3/efficiency' into f3/aux-effic…
kylecarow Jul 29, 2026
b52e96b
merge to add Default and From impls
kylecarow Jul 29, 2026
1eb7449
Merge branch 'f3/efficiency' into f3/aux-efficiency
kylecarow Jul 31, 2026
6fd1da6
Merge branch 'f3/unit-inputs' into f3/aux-efficiency
kylecarow Jul 31, 2026
f8b2b3b
Merge branch 'fastsim-3' into f3/aux-efficiency
kylecarow Jul 31, 2026
f055843
Merge branch 'fastsim-3' into f3/aux-efficiency
kylecarow Aug 2, 2026
32f7d85
Merge branch 'fastsim-3' into f3/aux-efficiency
kylecarow Aug 2, 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
3 changes: 2 additions & 1 deletion 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
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3301
frontal_area_square_meters: 2.574
Expand Down
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2012 Ford Focus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.304
frontal_area_square_meters: 2.574
Expand Down
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2012 Ford Fusion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.393
frontal_area_square_meters: 2.12
Expand Down
3 changes: 2 additions & 1 deletion 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
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.395
frontal_area_square_meters: 2.565
Expand Down
3 changes: 2 additions & 1 deletion 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
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
frontal_area_square_meters: 2.565
Expand Down
4 changes: 4 additions & 0 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
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.25
max_soc: 0.9
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
3 changes: 2 additions & 1 deletion 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
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
frontal_area_square_meters: 2.732
Expand Down
2 changes: 2 additions & 0 deletions cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.03
max_soc: 0.98
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 CHEVROLET Volt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.15
max_soc: 0.9
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 FORD C-MAX (PHEV).yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.15
max_soc: 0.9
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 FORD C-MAX HEV.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.4
max_soc: 0.8
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 FORD Escape 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.355
frontal_area_square_meters: 3.066
Expand Down
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 FORD Explorer 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.34
frontal_area_square_meters: 3.568
Expand Down
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 HYUNDAI Elantra 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
frontal_area_square_meters: 2.611
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 HYUNDAI Sonata PHEV.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.15
max_soc: 0.9
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 Hyundai Tucson Fuel Cell.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.4
max_soc: 0.8
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.4
max_soc: 0.8
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
2 changes: 2 additions & 0 deletions cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.05
max_soc: 0.95
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down
2 changes: 2 additions & 0 deletions cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.05
max_soc: 0.95
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down
2 changes: 2 additions & 0 deletions cal_and_val/f3-vehicles/2016 Nissan Leaf 30 kWh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.05
max_soc: 0.95
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down
2 changes: 2 additions & 0 deletions cal_and_val/f3-vehicles/2016 TESLA Model S60 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.05
max_soc: 0.9
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Camry 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
frontal_area_square_meters: 2.694
Expand Down
3 changes: 2 additions & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Corolla 4cyl 2WD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down Expand Up @@ -103,7 +105,6 @@ pt_type:
i: 0
vehicle_dynamics_prevent_dfco: false
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
frontal_area_square_meters: 2.574
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 TOYOTA Highlander Hybrid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.4
max_soc: 0.8
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
4 changes: 4 additions & 0 deletions cal_and_val/f3-vehicles/2016 Toyota Prius Two FWD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pt_type:
Constant: 0.9848857801796105
min_soc: 0.25
max_soc: 0.95
aux_supply_eff:
Constant: 1.0
state:
pwr_prop_max_watts: 0.0
pwr_regen_max_watts: 0.0
Expand Down Expand Up @@ -93,6 +95,8 @@ pt_type:
strategy: Linear
extrapolate: Error
pwr_idle_fuel_watts: 0.0
aux_supply_eff:
Constant: 1.0
state:
i: 0
pwr_out_max_watts: 0.0
Expand Down
Loading
Loading