diff --git a/cal_and_val/f3-vehicles/2010 Mazda 3 i-Stop.yaml b/cal_and_val/f3-vehicles/2010 Mazda 3 i-Stop.yaml index 2a76205e..56664c5c 100644 --- a/cal_and_val/f3-vehicles/2010 Mazda 3 i-Stop.yaml +++ b/cal_and_val/f3-vehicles/2010 Mazda 3 i-Stop.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2012 Ford Focus.yaml b/cal_and_val/f3-vehicles/2012 Ford Focus.yaml index 225e705c..05a3012b 100644 --- a/cal_and_val/f3-vehicles/2012 Ford Focus.yaml +++ b/cal_and_val/f3-vehicles/2012 Ford Focus.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2012 Ford Fusion.yaml b/cal_and_val/f3-vehicles/2012 Ford Fusion.yaml index 5674590b..548dc9e8 100644 --- a/cal_and_val/f3-vehicles/2012 Ford Fusion.yaml +++ b/cal_and_val/f3-vehicles/2012 Ford Fusion.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 AUDI A3 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 AUDI A3 4cyl 2WD.yaml index 952cf2f7..e4f80649 100644 --- a/cal_and_val/f3-vehicles/2016 AUDI A3 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 AUDI A3 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 BMW 328d 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 BMW 328d 4cyl 2WD.yaml index ba0ecaf4..4a956671 100644 --- a/cal_and_val/f3-vehicles/2016 BMW 328d 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 BMW 328d 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 BMW i3 REx PHEV.yaml b/cal_and_val/f3-vehicles/2016 BMW i3 REx PHEV.yaml index 87763aa0..d77f0026 100644 --- a/cal_and_val/f3-vehicles/2016 BMW i3 REx PHEV.yaml +++ b/cal_and_val/f3-vehicles/2016 BMW i3 REx PHEV.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 CHEVROLET Malibu 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 CHEVROLET Malibu 4cyl 2WD.yaml index 15e8b7d5..4c240d27 100644 --- a/cal_and_val/f3-vehicles/2016 CHEVROLET Malibu 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 CHEVROLET Malibu 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml b/cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml index 1f482fb9..8d14f9b8 100644 --- a/cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml +++ b/cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml @@ -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 diff --git a/cal_and_val/f3-vehicles/2016 CHEVROLET Volt.yaml b/cal_and_val/f3-vehicles/2016 CHEVROLET Volt.yaml index 6c07eed3..bee623c9 100644 --- a/cal_and_val/f3-vehicles/2016 CHEVROLET Volt.yaml +++ b/cal_and_val/f3-vehicles/2016 CHEVROLET Volt.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 FORD C-MAX (PHEV).yaml b/cal_and_val/f3-vehicles/2016 FORD C-MAX (PHEV).yaml index cc5232a2..4744d851 100644 --- a/cal_and_val/f3-vehicles/2016 FORD C-MAX (PHEV).yaml +++ b/cal_and_val/f3-vehicles/2016 FORD C-MAX (PHEV).yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 FORD C-MAX HEV.yaml b/cal_and_val/f3-vehicles/2016 FORD C-MAX HEV.yaml index 2722b54e..5bf7128b 100644 --- a/cal_and_val/f3-vehicles/2016 FORD C-MAX HEV.yaml +++ b/cal_and_val/f3-vehicles/2016 FORD C-MAX HEV.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 FORD Escape 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 FORD Escape 4cyl 2WD.yaml index 753eb75e..85f0ec80 100644 --- a/cal_and_val/f3-vehicles/2016 FORD Escape 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 FORD Escape 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 FORD Explorer 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 FORD Explorer 4cyl 2WD.yaml index 4aa35d76..6f4c8335 100644 --- a/cal_and_val/f3-vehicles/2016 FORD Explorer 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 FORD Explorer 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 HYUNDAI Elantra 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 HYUNDAI Elantra 4cyl 2WD.yaml index d0606f87..bddbfb61 100644 --- a/cal_and_val/f3-vehicles/2016 HYUNDAI Elantra 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 HYUNDAI Elantra 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 HYUNDAI Sonata PHEV.yaml b/cal_and_val/f3-vehicles/2016 HYUNDAI Sonata PHEV.yaml index 6875533f..6edfcf5c 100644 --- a/cal_and_val/f3-vehicles/2016 HYUNDAI Sonata PHEV.yaml +++ b/cal_and_val/f3-vehicles/2016 HYUNDAI Sonata PHEV.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 Hyundai Tucson Fuel Cell.yaml b/cal_and_val/f3-vehicles/2016 Hyundai Tucson Fuel Cell.yaml index 54dae95f..37db799c 100644 --- a/cal_and_val/f3-vehicles/2016 Hyundai Tucson Fuel Cell.yaml +++ b/cal_and_val/f3-vehicles/2016 Hyundai Tucson Fuel Cell.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml b/cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml index 08427462..146d7cb5 100644 --- a/cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml +++ b/cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml b/cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml index a21cc736..abec5d67 100644 --- a/cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml +++ b/cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml @@ -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 diff --git a/cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml b/cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml index 6e6094d2..82c50e36 100644 --- a/cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml +++ b/cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml @@ -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 diff --git a/cal_and_val/f3-vehicles/2016 Nissan Leaf 30 kWh.yaml b/cal_and_val/f3-vehicles/2016 Nissan Leaf 30 kWh.yaml index 7cce8b39..b5d8398a 100644 --- a/cal_and_val/f3-vehicles/2016 Nissan Leaf 30 kWh.yaml +++ b/cal_and_val/f3-vehicles/2016 Nissan Leaf 30 kWh.yaml @@ -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 diff --git a/cal_and_val/f3-vehicles/2016 TESLA Model S60 2WD.yaml b/cal_and_val/f3-vehicles/2016 TESLA Model S60 2WD.yaml index dbf13741..e057e539 100644 --- a/cal_and_val/f3-vehicles/2016 TESLA Model S60 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 TESLA Model S60 2WD.yaml @@ -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 diff --git a/cal_and_val/f3-vehicles/2016 TOYOTA Camry 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 TOYOTA Camry 4cyl 2WD.yaml index 6fd12d8c..69baced7 100644 --- a/cal_and_val/f3-vehicles/2016 TOYOTA Camry 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 TOYOTA Camry 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 TOYOTA Corolla 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/2016 TOYOTA Corolla 4cyl 2WD.yaml index eed833a9..54130f49 100644 --- a/cal_and_val/f3-vehicles/2016 TOYOTA Corolla 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/2016 TOYOTA Corolla 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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 diff --git a/cal_and_val/f3-vehicles/2016 TOYOTA Highlander Hybrid.yaml b/cal_and_val/f3-vehicles/2016 TOYOTA Highlander Hybrid.yaml index 51d8f364..6fb803be 100644 --- a/cal_and_val/f3-vehicles/2016 TOYOTA Highlander Hybrid.yaml +++ b/cal_and_val/f3-vehicles/2016 TOYOTA Highlander Hybrid.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2016 Toyota Prius Two FWD.yaml b/cal_and_val/f3-vehicles/2016 Toyota Prius Two FWD.yaml index de00a922..d8daf43d 100644 --- a/cal_and_val/f3-vehicles/2016 Toyota Prius Two FWD.yaml +++ b/cal_and_val/f3-vehicles/2016 Toyota Prius Two FWD.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2017 CHEVROLET Bolt.yaml b/cal_and_val/f3-vehicles/2017 CHEVROLET Bolt.yaml index 995d13e0..a0356ea3 100644 --- a/cal_and_val/f3-vehicles/2017 CHEVROLET Bolt.yaml +++ b/cal_and_val/f3-vehicles/2017 CHEVROLET Bolt.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.05 max_soc: 0.98 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2017 Maruti Dzire VDI.yaml b/cal_and_val/f3-vehicles/2017 Maruti Dzire VDI.yaml index b65ce6a9..eff20f14 100644 --- a/cal_and_val/f3-vehicles/2017 Maruti Dzire VDI.yaml +++ b/cal_and_val/f3-vehicles/2017 Maruti Dzire VDI.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.375 frontal_area_square_meters: 2.1347 diff --git a/cal_and_val/f3-vehicles/2017 Prius Prime.yaml b/cal_and_val/f3-vehicles/2017 Prius Prime.yaml index 7134cb2d..4acba29e 100644 --- a/cal_and_val/f3-vehicles/2017 Prius Prime.yaml +++ b/cal_and_val/f3-vehicles/2017 Prius Prime.yaml @@ -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 @@ -85,6 +87,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 diff --git a/cal_and_val/f3-vehicles/2017 Toyota Highlander 3.5 L.yaml b/cal_and_val/f3-vehicles/2017 Toyota Highlander 3.5 L.yaml index 9b94a662..5b570fbc 100644 --- a/cal_and_val/f3-vehicles/2017 Toyota Highlander 3.5 L.yaml +++ b/cal_and_val/f3-vehicles/2017 Toyota Highlander 3.5 L.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.1966 frontal_area_square_meters: 6.0 diff --git a/cal_and_val/f3-vehicles/2020 Chevrolet Colorado 2WD Diesel.yaml b/cal_and_val/f3-vehicles/2020 Chevrolet Colorado 2WD Diesel.yaml index 1864b7d6..9f347990 100644 --- a/cal_and_val/f3-vehicles/2020 Chevrolet Colorado 2WD Diesel.yaml +++ b/cal_and_val/f3-vehicles/2020 Chevrolet Colorado 2WD Diesel.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.4 frontal_area_square_meters: 2.88 diff --git a/cal_and_val/f3-vehicles/2020 Hero Splendor+ 100cc.yaml b/cal_and_val/f3-vehicles/2020 Hero Splendor+ 100cc.yaml index 3acff8f5..5f94f38d 100644 --- a/cal_and_val/f3-vehicles/2020 Hero Splendor+ 100cc.yaml +++ b/cal_and_val/f3-vehicles/2020 Hero Splendor+ 100cc.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.78 frontal_area_square_meters: 0.68 diff --git a/cal_and_val/f3-vehicles/2020 VW Golf 1.5TSI.yaml b/cal_and_val/f3-vehicles/2020 VW Golf 1.5TSI.yaml index 62d31990..08ecc04f 100644 --- a/cal_and_val/f3-vehicles/2020 VW Golf 1.5TSI.yaml +++ b/cal_and_val/f3-vehicles/2020 VW Golf 1.5TSI.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.275 frontal_area_square_meters: 2.21 diff --git a/cal_and_val/f3-vehicles/2020 VW Golf 2.0TDI.yaml b/cal_and_val/f3-vehicles/2020 VW Golf 2.0TDI.yaml index e535d472..f1678a97 100644 --- a/cal_and_val/f3-vehicles/2020 VW Golf 2.0TDI.yaml +++ b/cal_and_val/f3-vehicles/2020 VW Golf 2.0TDI.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.275 frontal_area_square_meters: 2.21 diff --git a/cal_and_val/f3-vehicles/2021 BMW iX xDrive40.yaml b/cal_and_val/f3-vehicles/2021 BMW iX xDrive40.yaml index 3ac4fe38..6fcaa0a9 100644 --- a/cal_and_val/f3-vehicles/2021 BMW iX xDrive40.yaml +++ b/cal_and_val/f3-vehicles/2021 BMW iX xDrive40.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.04 max_soc: 0.96689295 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2021 Cupra Born.yaml b/cal_and_val/f3-vehicles/2021 Cupra Born.yaml index b858bb94..b9e849cd 100644 --- a/cal_and_val/f3-vehicles/2021 Cupra Born.yaml +++ b/cal_and_val/f3-vehicles/2021 Cupra Born.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.04 max_soc: 0.97902439 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2021 Fiat Panda Mild Hybrid.yaml b/cal_and_val/f3-vehicles/2021 Fiat Panda Mild Hybrid.yaml index 5ef4afd0..ea3d0235 100644 --- a/cal_and_val/f3-vehicles/2021 Fiat Panda Mild Hybrid.yaml +++ b/cal_and_val/f3-vehicles/2021 Fiat Panda Mild Hybrid.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.4 frontal_area_square_meters: 2.1 diff --git a/cal_and_val/f3-vehicles/2021 Honda N-Box G.yaml b/cal_and_val/f3-vehicles/2021 Honda N-Box G.yaml index 2759ecf8..18f4213b 100644 --- a/cal_and_val/f3-vehicles/2021 Honda N-Box G.yaml +++ b/cal_and_val/f3-vehicles/2021 Honda N-Box G.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.38 frontal_area_square_meters: 2.19 diff --git a/cal_and_val/f3-vehicles/2021 Peugot 3008.yaml b/cal_and_val/f3-vehicles/2021 Peugot 3008.yaml index 8087612f..06bd497e 100644 --- a/cal_and_val/f3-vehicles/2021 Peugot 3008.yaml +++ b/cal_and_val/f3-vehicles/2021 Peugot 3008.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.33 frontal_area_square_meters: 2.8 diff --git a/cal_and_val/f3-vehicles/2022 Ford F-150 Lightning 4WD.yaml b/cal_and_val/f3-vehicles/2022 Ford F-150 Lightning 4WD.yaml index 6a1afea2..fd6a2595 100644 --- a/cal_and_val/f3-vehicles/2022 Ford F-150 Lightning 4WD.yaml +++ b/cal_and_val/f3-vehicles/2022 Ford F-150 Lightning 4WD.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.05 max_soc: 0.98 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 MINI Cooper SE Hardtop 2 door.yaml b/cal_and_val/f3-vehicles/2022 MINI Cooper SE Hardtop 2 door.yaml index a53972ec..9ffa0c4c 100755 --- a/cal_and_val/f3-vehicles/2022 MINI Cooper SE Hardtop 2 door.yaml +++ b/cal_and_val/f3-vehicles/2022 MINI Cooper SE Hardtop 2 door.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.0 max_soc: 1.0 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 Renault Megane E-Tech.yaml b/cal_and_val/f3-vehicles/2022 Renault Megane E-Tech.yaml index b2acf5c7..845c2c9c 100644 --- a/cal_and_val/f3-vehicles/2022 Renault Megane E-Tech.yaml +++ b/cal_and_val/f3-vehicles/2022 Renault Megane E-Tech.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.0 max_soc: 1.0 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 Renault Zoe ZE50 R135.yaml b/cal_and_val/f3-vehicles/2022 Renault Zoe ZE50 R135.yaml index 7dccf121..7f12a6b5 100644 --- a/cal_and_val/f3-vehicles/2022 Renault Zoe ZE50 R135.yaml +++ b/cal_and_val/f3-vehicles/2022 Renault Zoe ZE50 R135.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.029 max_soc: 0.98 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 Tesla Model 3 RWD.yaml b/cal_and_val/f3-vehicles/2022 Tesla Model 3 RWD.yaml index 3750f3f2..91a87f51 100644 --- a/cal_and_val/f3-vehicles/2022 Tesla Model 3 RWD.yaml +++ b/cal_and_val/f3-vehicles/2022 Tesla Model 3 RWD.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.05 max_soc: 0.98 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 Tesla Model Y RWD.yaml b/cal_and_val/f3-vehicles/2022 Tesla Model Y RWD.yaml index 0ef68c00..c38b08e4 100644 --- a/cal_and_val/f3-vehicles/2022 Tesla Model Y RWD.yaml +++ b/cal_and_val/f3-vehicles/2022 Tesla Model Y RWD.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.05 max_soc: 0.98 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 Toyota RAV4 Hybrid LE.yaml b/cal_and_val/f3-vehicles/2022 Toyota RAV4 Hybrid LE.yaml index b29f9b25..5832e7f7 100644 --- a/cal_and_val/f3-vehicles/2022 Toyota RAV4 Hybrid LE.yaml +++ b/cal_and_val/f3-vehicles/2022 Toyota RAV4 Hybrid LE.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.0 max_soc: 1.0 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 @@ -85,6 +87,8 @@ pt_type: strategy: Linear extrapolate: Error pwr_idle_fuel_watts: 0.0 + aux_supply_eff: + Constant: 0.9 state: i: 0 pwr_out_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 Toyota Yaris Hybrid Mid.yaml b/cal_and_val/f3-vehicles/2022 Toyota Yaris Hybrid Mid.yaml index 41f5ef9e..64f0893e 100644 --- a/cal_and_val/f3-vehicles/2022 Toyota Yaris Hybrid Mid.yaml +++ b/cal_and_val/f3-vehicles/2022 Toyota Yaris Hybrid Mid.yaml @@ -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 @@ -85,6 +87,8 @@ pt_type: strategy: Linear extrapolate: Error pwr_idle_fuel_watts: 0.0 + aux_supply_eff: + Constant: 0.9 state: i: 0 pwr_out_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2022 Volvo XC40 Recharge twin.yaml b/cal_and_val/f3-vehicles/2022 Volvo XC40 Recharge twin.yaml index b8d0a620..7595bf30 100644 --- a/cal_and_val/f3-vehicles/2022 Volvo XC40 Recharge twin.yaml +++ b/cal_and_val/f3-vehicles/2022 Volvo XC40 Recharge twin.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.02 max_soc: 0.981538462 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2023 Mitsubishi Pajero Sport.yaml b/cal_and_val/f3-vehicles/2023 Mitsubishi Pajero Sport.yaml index 372952fb..1fdacd5e 100644 --- a/cal_and_val/f3-vehicles/2023 Mitsubishi Pajero Sport.yaml +++ b/cal_and_val/f3-vehicles/2023 Mitsubishi Pajero Sport.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.4 frontal_area_square_meters: 2.83094625 diff --git a/cal_and_val/f3-vehicles/2023 Polestar 2 Long range Dual motor.yaml b/cal_and_val/f3-vehicles/2023 Polestar 2 Long range Dual motor.yaml index 25995dac..3670c543 100644 --- a/cal_and_val/f3-vehicles/2023 Polestar 2 Long range Dual motor.yaml +++ b/cal_and_val/f3-vehicles/2023 Polestar 2 Long range Dual motor.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.02 max_soc: 0.981538462 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2023 Volvo C40 Recharge.yaml b/cal_and_val/f3-vehicles/2023 Volvo C40 Recharge.yaml index d6da715c..a4e764a0 100644 --- a/cal_and_val/f3-vehicles/2023 Volvo C40 Recharge.yaml +++ b/cal_and_val/f3-vehicles/2023 Volvo C40 Recharge.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.02 max_soc: 0.981538462 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2024 BYD Dolphin Active.yaml b/cal_and_val/f3-vehicles/2024 BYD Dolphin Active.yaml index db775141..94aad714 100644 --- a/cal_and_val/f3-vehicles/2024 BYD Dolphin Active.yaml +++ b/cal_and_val/f3-vehicles/2024 BYD Dolphin Active.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.0 max_soc: 1.0 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2024 Toyota Vios 1.5 G.yaml b/cal_and_val/f3-vehicles/2024 Toyota Vios 1.5 G.yaml index 134c186c..c4b77355 100644 --- a/cal_and_val/f3-vehicles/2024 Toyota Vios 1.5 G.yaml +++ b/cal_and_val/f3-vehicles/2024 Toyota Vios 1.5 G.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.28 frontal_area_square_meters: 2.1689875 diff --git a/cal_and_val/f3-vehicles/2024 VinFast VF e34.yaml b/cal_and_val/f3-vehicles/2024 VinFast VF e34.yaml index 4994a937..ec3c350e 100644 --- a/cal_and_val/f3-vehicles/2024 VinFast VF e34.yaml +++ b/cal_and_val/f3-vehicles/2024 VinFast VF e34.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.0 max_soc: 1.0 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/2024 Volkswagen Polo 1.0 MPI.yaml b/cal_and_val/f3-vehicles/2024 Volkswagen Polo 1.0 MPI.yaml index 28041583..a4e5321b 100644 --- a/cal_and_val/f3-vehicles/2024 Volkswagen Polo 1.0 MPI.yaml +++ b/cal_and_val/f3-vehicles/2024 Volkswagen Polo 1.0 MPI.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.306 frontal_area_square_meters: 2.318 diff --git a/cal_and_val/f3-vehicles/BYD ATTO 3.yaml b/cal_and_val/f3-vehicles/BYD ATTO 3.yaml index e24ec5ce..84fb6d59 100644 --- a/cal_and_val/f3-vehicles/BYD ATTO 3.yaml +++ b/cal_and_val/f3-vehicles/BYD ATTO 3.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.029 max_soc: 0.98 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/Bajaj Boxer 150.yaml b/cal_and_val/f3-vehicles/Bajaj Boxer 150.yaml index eb4431bc..70f7a610 100644 --- a/cal_and_val/f3-vehicles/Bajaj Boxer 150.yaml +++ b/cal_and_val/f3-vehicles/Bajaj Boxer 150.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.78 frontal_area_square_meters: 0.68 diff --git a/cal_and_val/f3-vehicles/Class 4 Truck (Isuzu NPR HD).yaml b/cal_and_val/f3-vehicles/Class 4 Truck (Isuzu NPR HD).yaml index edcdbd80..44bbb66a 100644 --- a/cal_and_val/f3-vehicles/Class 4 Truck (Isuzu NPR HD).yaml +++ b/cal_and_val/f3-vehicles/Class 4 Truck (Isuzu NPR HD).yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.6078 frontal_area_square_meters: 8.686 diff --git a/cal_and_val/f3-vehicles/Line Haul Conv.yaml b/cal_and_val/f3-vehicles/Line Haul Conv.yaml index 30d6d6a6..6154d93d 100644 --- a/cal_and_val/f3-vehicles/Line Haul Conv.yaml +++ b/cal_and_val/f3-vehicles/Line Haul Conv.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.6 frontal_area_square_meters: 8.5 diff --git a/cal_and_val/f3-vehicles/Maruti Swift 4cyl 2WD.yaml b/cal_and_val/f3-vehicles/Maruti Swift 4cyl 2WD.yaml index e6445940..c47f58c5 100644 --- a/cal_and_val/f3-vehicles/Maruti Swift 4cyl 2WD.yaml +++ b/cal_and_val/f3-vehicles/Maruti Swift 4cyl 2WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,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.12 diff --git a/cal_and_val/f3-vehicles/Nissan Navara.yaml b/cal_and_val/f3-vehicles/Nissan Navara.yaml index c89a87a8..2ee0fca0 100644 --- a/cal_and_val/f3-vehicles/Nissan Navara.yaml +++ b/cal_and_val/f3-vehicles/Nissan Navara.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.39 frontal_area_square_meters: 3.2 diff --git a/cal_and_val/f3-vehicles/Regional Delivery Class 8 Truck.yaml b/cal_and_val/f3-vehicles/Regional Delivery Class 8 Truck.yaml index b02b8333..b81e68bb 100644 --- a/cal_and_val/f3-vehicles/Regional Delivery Class 8 Truck.yaml +++ b/cal_and_val/f3-vehicles/Regional Delivery Class 8 Truck.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.8 frontal_area_square_meters: 10.0 diff --git a/cal_and_val/f3-vehicles/Renault Clio IV diesel.yaml b/cal_and_val/f3-vehicles/Renault Clio IV diesel.yaml index b4261a53..6a2fe802 100644 --- a/cal_and_val/f3-vehicles/Renault Clio IV diesel.yaml +++ b/cal_and_val/f3-vehicles/Renault Clio IV diesel.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.33 frontal_area_square_meters: 2.0 diff --git a/cal_and_val/f3-vehicles/Renault Megane 1.5 dCi Authentique.yaml b/cal_and_val/f3-vehicles/Renault Megane 1.5 dCi Authentique.yaml index 9c41c722..0d178f44 100644 --- a/cal_and_val/f3-vehicles/Renault Megane 1.5 dCi Authentique.yaml +++ b/cal_and_val/f3-vehicles/Renault Megane 1.5 dCi Authentique.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.35 frontal_area_square_meters: 2.3 diff --git a/cal_and_val/f3-vehicles/Toyota Corolla Cross Hybrid.yaml b/cal_and_val/f3-vehicles/Toyota Corolla Cross Hybrid.yaml index 5a95fe40..5820ee97 100644 --- a/cal_and_val/f3-vehicles/Toyota Corolla Cross Hybrid.yaml +++ b/cal_and_val/f3-vehicles/Toyota Corolla Cross Hybrid.yaml @@ -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 @@ -85,6 +87,8 @@ pt_type: strategy: Linear extrapolate: Error pwr_idle_fuel_watts: 0.0 + aux_supply_eff: + Constant: 0.9 state: i: 0 pwr_out_max_watts: 0.0 diff --git a/cal_and_val/f3-vehicles/Toyota Etios Liva diesel.yaml b/cal_and_val/f3-vehicles/Toyota Etios Liva diesel.yaml index 0698a589..66839100 100644 --- a/cal_and_val/f3-vehicles/Toyota Etios Liva diesel.yaml +++ b/cal_and_val/f3-vehicles/Toyota Etios Liva diesel.yaml @@ -53,6 +53,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 @@ -95,7 +97,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.3 diff --git a/cal_and_val/f3-vehicles/Toyota Hilux Double Cab 4WD.yaml b/cal_and_val/f3-vehicles/Toyota Hilux Double Cab 4WD.yaml index e6c57cf7..c73d31bb 100644 --- a/cal_and_val/f3-vehicles/Toyota Hilux Double Cab 4WD.yaml +++ b/cal_and_val/f3-vehicles/Toyota Hilux Double Cab 4WD.yaml @@ -53,6 +53,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 @@ -95,7 +97,6 @@ pt_type: i: 0 vehicle_dynamics_prevent_dfco: false mass_kilograms: ~ - alt_eff: 1.0 chassis: drag_coef: 0.4 frontal_area_square_meters: 2.86 diff --git a/cal_and_val/f3-vehicles/Toyota Mirai.yaml b/cal_and_val/f3-vehicles/Toyota Mirai.yaml index 75e90fc2..d374db7e 100644 --- a/cal_and_val/f3-vehicles/Toyota Mirai.yaml +++ b/cal_and_val/f3-vehicles/Toyota Mirai.yaml @@ -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 @@ -85,6 +87,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 diff --git a/fastsim-core/resources/vehicles/2012_Ford_Fusion.yaml b/fastsim-core/resources/vehicles/2012_Ford_Fusion.yaml index 007f0556..31c6474a 100644 --- a/fastsim-core/resources/vehicles/2012_Ford_Fusion.yaml +++ b/fastsim-core/resources/vehicles/2012_Ford_Fusion.yaml @@ -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 @@ -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 diff --git a/fastsim-core/resources/vehicles/2016_TOYOTA_Prius_Two.yaml b/fastsim-core/resources/vehicles/2016_TOYOTA_Prius_Two.yaml index 6d52d421..38c3f24b 100755 --- a/fastsim-core/resources/vehicles/2016_TOYOTA_Prius_Two.yaml +++ b/fastsim-core/resources/vehicles/2016_TOYOTA_Prius_Two.yaml @@ -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 @@ -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 diff --git a/fastsim-core/resources/vehicles/2022_Renault_Zoe_ZE50_R135.yaml b/fastsim-core/resources/vehicles/2022_Renault_Zoe_ZE50_R135.yaml index 3db918e2..98a1c505 100644 --- a/fastsim-core/resources/vehicles/2022_Renault_Zoe_ZE50_R135.yaml +++ b/fastsim-core/resources/vehicles/2022_Renault_Zoe_ZE50_R135.yaml @@ -18,6 +18,8 @@ pt_type: Constant: 0.9848857801796105 min_soc: 0.029 max_soc: 0.98 + aux_supply_eff: + Constant: 1.0 state: pwr_prop_max_watts: 0.0 pwr_regen_max_watts: 0.0 diff --git a/fastsim-core/src/compat/fastsim_2/mod.rs b/fastsim-core/src/compat/fastsim_2/mod.rs index 1ca58e97..420d3538 100644 --- a/fastsim-core/src/compat/fastsim_2/mod.rs +++ b/fastsim-core/src/compat/fastsim_2/mod.rs @@ -54,7 +54,9 @@ impl Vehicle { pub fn to_fastsim2(&self) -> anyhow::Result { let mut veh = fastsim_core::vehicle::RustVehicle { alt_eff: match &self.pt_type { - PowertrainType::ConventionalVehicle(conv) => conv.alt_eff.get::(), + PowertrainType::ConventionalVehicle(conv) => match &conv.fc.aux_supply_eff { + AuxSupplyEfficiency::Constant(interp) => interp.interpolate(&[])?, + }, _ => 1.0, }, alt_eff_doc: None, @@ -506,6 +508,7 @@ pub const FUEL_LHV_MJ_PER_KG: f64 = 43.2; impl TryFrom<&fastsim_core::vehicle::RustVehicle> for ConventionalVehicle { type Error = anyhow::Error; + #[allow(deprecated)] fn try_from(f2veh: &fastsim_core::vehicle::RustVehicle) -> anyhow::Result { let conv = ConventionalVehicle { fs: { @@ -524,7 +527,7 @@ impl TryFrom<&fastsim_core::vehicle::RustVehicle> for ConventionalVehicle { pt_cntrl: ConvPowertrainControls::Normal, dfco_cntrl: DfcoControls::default(), mass: None, - alt_eff: f2veh.alt_eff * uc::R, + alt_eff: 1.0 * uc::R, }; Ok(conv) } @@ -737,6 +740,7 @@ impl TryFrom for FuelConverter { pwr_for_peak_eff: uc::KW * f64::NAN, // this gets updated in `init` // this means that aux power must include idle fuel pwr_idle_fuel: si::Power::ZERO, + aux_supply_eff: f2veh.alt_eff.into(), save_interval: Some(1), } .try_into() @@ -763,6 +767,7 @@ impl TryFrom for ReversibleEnergyStorage { ), min_soc: f2veh.min_soc * uc::R, max_soc: f2veh.max_soc * uc::R, + aux_supply_eff: Default::default(), save_interval: Some(1), history: Default::default(), }; diff --git a/fastsim-core/src/vehicle/bev.rs b/fastsim-core/src/vehicle/bev.rs index 7b8d9e72..fa1117d5 100644 --- a/fastsim-core/src/vehicle/bev.rs +++ b/fastsim-core/src/vehicle/bev.rs @@ -206,8 +206,11 @@ impl Powertrain for BatteryElectricVehicle { self.res .set_curr_pwr_out_max(dt, disch_buffer, chrg_buffer) .with_context(|| anyhow!(format_dbg!()))?; + let aux_supply_eff = match &self.res.aux_supply_eff { + AuxSupplyEfficiency::Constant(interp) => interp.interpolate(&[]), + }?; self.res - .set_curr_pwr_prop_max(pwr_aux) + .set_curr_pwr_prop_max(pwr_aux / aux_supply_eff) .with_context(|| anyhow!(format_dbg!()))?; self.em .set_curr_pwr_prop_out_max( diff --git a/fastsim-core/src/vehicle/conv.rs b/fastsim-core/src/vehicle/conv.rs index 26ffcf1c..b8e5e042 100644 --- a/fastsim-core/src/vehicle/conv.rs +++ b/fastsim-core/src/vehicle/conv.rs @@ -178,13 +178,25 @@ pub struct ConventionalVehicle { /// powertrain mass pub(crate) mass: Option, /// Alternator efficiency used to calculate aux mechanical power demand on engine + #[serde(default = "default_alt_eff")] + #[deprecated( + since = "3.1.0", + note = "This field will be removed in a future release. Use FuelConverter.aux_eff instead." + )] + #[serde(skip_serializing)] pub alt_eff: si::Ratio, } +/// Defaults to 100% for backward compatibility. This field will be removed in a future release. +fn default_alt_eff() -> si::Ratio { + 1.0 * uc::R +} + #[pyo3_api] impl ConventionalVehicle {} impl ConventionalVehicle { + #[allow(deprecated)] pub fn new( fs: FuelStorage, fc: FuelConverter, @@ -210,7 +222,37 @@ impl ConventionalVehicle { impl SerdeAPI for ConventionalVehicle {} impl Init for ConventionalVehicle { + #[allow(deprecated)] fn init(&mut self) -> Result<(), Error> { + let alt_eff = self.alt_eff.get::(); + if alt_eff != 1.0 { + let AuxSupplyEfficiency::Constant(interp) = &self.fc.aux_supply_eff; + if interp.0 == 1.0 { + // `fc.aux_supply_eff` was left at its default, so fall back to + // the deprecated `alt_eff` to preserve legacy simulation behavior + // + // Also fires for `fc.aux_supply_eff` explicitly set to 1.0 + eprintln!( + "Warning: deprecated field `alt_eff` = `{}` is set. Assigning it to `fc.aux_supply_eff` for backward compatibility. This field will be removed in a future release; set `fc.aux_supply_eff` directly instead.", + alt_eff + ); + self.fc.aux_supply_eff = AuxSupplyEfficiency::from(alt_eff); + } else if interp.0 != alt_eff { + // provided both alt_eff != 1.0 and aux_supply_eff that is not equivalent; + // emit warning that aux_supply_eff overrides alt_eff + eprintln!( + "Warning: provided deprecated field `alt_eff` = `{}` is being overridden by `fc.aux_supply_eff`. The `alt_eff` field will be removed in a future release.", + alt_eff + ); + } else { + // alt_eff != 1.0 but happens to match fc.aux_supply_eff; still flag + // the deprecated field since it has no effect but is present + eprintln!( + "Warning: deprecated field `alt_eff` = `{}` is set but has no effect, since it matches `fc.aux_supply_eff`. This field will be removed in a future release; remove it from your vehicle file.", + alt_eff + ); + } + } self.fc .init() .map_err(|err| Error::InitError(format_dbg!(err)))?; @@ -252,8 +294,11 @@ impl Powertrain for Box { self.fc .set_curr_pwr_out_max(dt) .with_context(|| anyhow!(format_dbg!()))?; + let aux_supply_eff = match &self.fc.aux_supply_eff { + AuxSupplyEfficiency::Constant(interp) => interp.interpolate(&[]), + }?; self.fc - .set_curr_pwr_prop_max(pwr_aux / self.alt_eff) + .set_curr_pwr_prop_max(pwr_aux / aux_supply_eff) .with_context(|| anyhow!(format_dbg!()))?; self.transmission .set_curr_pwr_prop_out_max( diff --git a/fastsim-core/src/vehicle/mod.rs b/fastsim-core/src/vehicle/mod.rs index 44621c0d..8ee1cfb4 100755 --- a/fastsim-core/src/vehicle/mod.rs +++ b/fastsim-core/src/vehicle/mod.rs @@ -32,4 +32,4 @@ pub use powertrain::traits::Powertrain; pub use powertrain::transmission::Transmission; pub use powertrain_type::PowertrainType; pub use traits::*; -pub use vehicle_model::{Vehicle, VehicleState}; +pub use vehicle_model::{AuxSupplyEfficiency, Vehicle, VehicleState}; diff --git a/fastsim-core/src/vehicle/powertrain/fuel_converter.rs b/fastsim-core/src/vehicle/powertrain/fuel_converter.rs index e2f8eea3..3df71b5e 100755 --- a/fastsim-core/src/vehicle/powertrain/fuel_converter.rs +++ b/fastsim-core/src/vehicle/powertrain/fuel_converter.rs @@ -38,6 +38,11 @@ pub struct FuelConverter { pub(crate) pwr_for_peak_eff: si::Power, /// idle fuel power to overcome internal friction (not including aux load) \[W\] pub pwr_idle_fuel: si::Power, + + /// Efficiency to apply to aux load + #[serde(default)] + pub aux_supply_eff: AuxSupplyEfficiency, + /// struct for tracking current state #[serde(default)] pub state: FuelConverterState, @@ -111,6 +116,7 @@ impl FuelConverter { eff_interp_from_pwr_out: InterpolatorEnum, pwr_for_peak_eff: si::Power, pwr_idle_fuel: si::Power, + aux_supply_eff: AuxSupplyEfficiency, save_interval: Option, ) -> anyhow::Result { let mut fc = Self { @@ -123,6 +129,7 @@ impl FuelConverter { eff_interp_from_pwr_out, pwr_for_peak_eff, pwr_idle_fuel, + aux_supply_eff, state: FuelConverterState::default(), history: FuelConverterStateHistoryVec::default(), save_interval, @@ -139,6 +146,9 @@ impl Init for FuelConverter { .mass() .map_err(|err| Error::InitError(format_dbg!(err)))?; self.thrml.init()?; + self.aux_supply_eff + .validate() + .map_err(|err| Error::InitError(format_dbg!(err)))?; self.state .init() .map_err(|err| Error::InitError(format_dbg!(err)))?; @@ -515,6 +525,7 @@ impl TryFrom for FuelConverter { // TODO: make a function for setting this according with below line // this means that aux power must include idle fuel pwr_idle_fuel: si::Power::ZERO, + aux_supply_eff: fcbuilder.aux_supply_eff, save_interval: Some(1), history: Default::default(), }; @@ -541,6 +552,8 @@ pub struct FCBuilder { pub(crate) pwr_for_peak_eff: si::Power, /// idle fuel power to overcome internal friction (not including aux load) \[W\] pub pwr_idle_fuel: si::Power, + /// Efficiency to apply to aux load + pub aux_supply_eff: AuxSupplyEfficiency, /// time step interval between saves. 1 is a good option. If None, no saving occurs. pub save_interval: Option, } @@ -1349,6 +1362,7 @@ mod tests { .unwrap(), pwr_for_peak_eff: peak_pwr * 0.8, pwr_idle_fuel: idle_pwr, + aux_supply_eff: Default::default(), state: fc_state, history: FuelConverterStateHistoryVec::default(), save_interval: None, diff --git a/fastsim-core/src/vehicle/powertrain/reversible_energy_storage.rs b/fastsim-core/src/vehicle/powertrain/reversible_energy_storage.rs index f96dd07b..259d748a 100644 --- a/fastsim-core/src/vehicle/powertrain/reversible_energy_storage.rs +++ b/fastsim-core/src/vehicle/powertrain/reversible_energy_storage.rs @@ -36,6 +36,11 @@ pub struct ReversibleEnergyStorage { pub min_soc: si::Ratio, /// Hard limit on maximum SOC, e.g. 0.95 pub max_soc: si::Ratio, + + /// Efficiency to apply to aux load + #[serde(default)] + pub aux_supply_eff: AuxSupplyEfficiency, + /// struct for tracking current state #[serde(default)] pub state: ReversibleEnergyStorageState, @@ -144,6 +149,7 @@ impl ReversibleEnergyStorage { eff_interp: RESEfficiency, min_soc: si::Ratio, max_soc: si::Ratio, + aux_supply_eff: AuxSupplyEfficiency, save_interval: Option, ) -> anyhow::Result { let mut reversible_energy_storage = Self { @@ -155,6 +161,7 @@ impl ReversibleEnergyStorage { eff_interp, min_soc, max_soc, + aux_supply_eff, state: ReversibleEnergyStorageState::default(), history: ReversibleEnergyStorageStateHistoryVec::default(), save_interval, @@ -824,6 +831,9 @@ impl Init for ReversibleEnergyStorage { self.eff_interp .validate() .map_err(|err| Error::InitError(format_dbg!(err)))?; + self.aux_supply_eff + .validate() + .map_err(|err| Error::InitError(format_dbg!(err)))?; self.state .init() .map_err(|err| Error::InitError(format_dbg!(err)))?; diff --git a/fastsim-core/src/vehicle/vehicle_model.rs b/fastsim-core/src/vehicle/vehicle_model.rs index d54dfe37..e13e3b9e 100644 --- a/fastsim-core/src/vehicle/vehicle_model.rs +++ b/fastsim-core/src/vehicle/vehicle_model.rs @@ -22,6 +22,14 @@ pub enum AuxSource { impl SerdeAPI for AuxSource {} impl Init for AuxSource {} +/// Efficiency model for aux load power source +#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, IsVariant, TryInto)] +pub enum AuxSupplyEfficiency { + Constant(Interp0D), +} + +impl_efficiency_enum!(AuxSupplyEfficiency { Constant }); + #[serde_api] #[cfg_attr(feature = "pyo3", pyclass(module = "fastsim", subclass, eq))] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, StateMethods)] @@ -1567,6 +1575,7 @@ pub(crate) mod tests { )?, // eff_interp_from_pwr_out 0.4 * 211088.0 * uc::W, // pwr_for_peak_eff 0.0 * uc::W, // pwr_idle_fuel + Default::default(), // aux_supply_eff None, )?; let tx = Transmission::new( @@ -1660,6 +1669,7 @@ pub(crate) mod tests { RESEfficiency::Constant(Interp0D(0.9)), // eff_interp 0.0 * uc::R, // min_soc 1.0 * uc::R, // max_soc + Default::default(), // aux_supply_eff None, )?; let fs = FuelStorage::new( @@ -1702,6 +1712,7 @@ pub(crate) mod tests { )?, // eff_interp_from_pwr_out 0.4 * 211088.0 * uc::W, // pwr_for_peak_eff 0.0 * uc::W, // pwr_idle_fuel + Default::default(), None, )?; let em = ElectricMachine::new(