Skip to content

Commit

Permalink
Merge pull request #188 from NREL/f3/thermal
Browse files Browse the repository at this point in the history
F3/thermal
  • Loading branch information
robinsteuteville authored Feb 4, 2025
2 parents 781119a + 4911a61 commit 5cd5568
Show file tree
Hide file tree
Showing 126 changed files with 12,326 additions and 4,299 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2010 Mazda 3 i-Stop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3301
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2012 Ford Focus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.304
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2012 Ford Fusion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.875
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.393
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 AUDI A3 4cyl 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.395
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 BMW 328d 4cyl 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.33
frontal_area_square_meters: 2.357
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 FORD C-MAX HEV.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ pt_type:
frac_res_chrg_for_fc: 0.0
frac_res_dschrg_for_fc: 0.0
aux_cntrl: AuxOnResPriority
mass: ~
mass_kilograms: ~
sim_params:
res_per_fuel_lim: 0.005
soc_balance_iter_err: 5
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 FORD Escape 4cyl 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.355
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 FORD Explorer 4cyl 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.34
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 HYUNDAI Elantra 4cyl 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 Hyundai Tucson Fuel Cell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ pt_type:
frac_res_chrg_for_fc: 0.0
frac_res_dschrg_for_fc: 0.0
aux_cntrl: AuxOnResPriority
mass: ~
mass_kilograms: ~
sim_params:
res_per_fuel_lim: 0.005
soc_balance_iter_err: 5
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ pt_type:
frac_res_chrg_for_fc: 0.0
frac_res_dschrg_for_fc: 0.0
aux_cntrl: AuxOnResPriority
mass: ~
mass_kilograms: ~
sim_params:
res_per_fuel_lim: 0.005
soc_balance_iter_err: 5
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.315
frontal_area_square_meters: 2.755
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.34
frontal_area_square_meters: 2.56
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 Nissan Leaf 30 kWh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.315
frontal_area_square_meters: 2.755
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 TESLA Model S60 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.3
frontal_area_square_meters: 2.832
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Camry 4cyl 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Corolla 4cyl 2WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.3
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 TOYOTA Highlander Hybrid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ pt_type:
frac_res_chrg_for_fc: 0.0
frac_res_dschrg_for_fc: 0.0
aux_cntrl: AuxOnResPriority
mass: ~
mass_kilograms: ~
sim_params:
res_per_fuel_lim: 0.005
soc_balance_iter_err: 5
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2016 Toyota Prius Two FWD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ pt_type:
frac_res_chrg_for_fc: 0.0
frac_res_dschrg_for_fc: 1.0
aux_cntrl: AuxOnResPriority
mass: ~
mass_kilograms: ~
sim_params:
res_per_fuel_lim: 0.005
soc_balance_iter_err: 5
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2017 CHEVROLET Bolt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.29
frontal_area_square_meters: 2.845
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2017 Maruti Dzire VDI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.95
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.375
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2017 Toyota Highlander 3.5 L.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.875
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.1966
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.4
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2020 Hero Splendor+ 100cc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.78
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2020 VW Golf 1.5TSI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.275
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2020 VW Golf 2.0TDI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.275
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2021 BMW iX xDrive40.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.25
frontal_area_square_meters: 2.82
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2021 Cupra Born.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.27
frontal_area_square_meters: 2.31
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2021 Fiat Panda Mild Hybrid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.95
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.4
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2021 Honda N-Box G.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.95
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.38
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2021 Peugot 3008.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.95
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.33
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Ford F-150 Lightning 4WD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.44
frontal_area_square_meters: 3.435086194
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.3261816574680473
frontal_area_square_meters: 2.4
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Renault Megane E-Tech.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.305
frontal_area_square_meters: 2.21
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Renault Zoe ZE50 R135.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.92
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.33
frontal_area_square_meters: 2.5121646
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Tesla Model 3 RWD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.23
frontal_area_square_meters: 2.22
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Tesla Model Y RWD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.23
frontal_area_square_meters: 2.45
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Toyota RAV4 Hybrid LE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ pt_type:
frac_res_chrg_for_fc: 0.3
frac_res_dschrg_for_fc: 0.3
aux_cntrl: AuxOnResPriority
mass: ~
mass_kilograms: ~
sim_params:
res_per_fuel_lim: 0.005
soc_balance_iter_err: 5
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Toyota Yaris Hybrid Mid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ pt_type:
frac_res_chrg_for_fc: 0.3
frac_res_dschrg_for_fc: 0.3
aux_cntrl: AuxOnResPriority
mass: ~
mass_kilograms: ~
sim_params:
res_per_fuel_lim: 0.005
soc_balance_iter_err: 5
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2022 Volvo XC40 Recharge twin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pt_type:
eff_interp:
Interp0D: 0.98
save_interval: 1
mass: ~
mass_kilograms: ~
chassis:
drag_coef: 0.381485332
frontal_area_square_meters: 2.56
Expand Down
2 changes: 1 addition & 1 deletion cal_and_val/f3-vehicles/2023 Mitsubishi Pajero Sport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pt_type:
eff_interp:
Interp0D: 0.9
save_interval: 1
mass: ~
mass_kilograms: ~
alt_eff: 1.0
chassis:
drag_coef: 0.4
Expand Down
Loading

0 comments on commit 5cd5568

Please sign in to comment.