Skip to content
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

F3/thermal #175

Merged
merged 14 commits into from
Dec 23, 2024
Merged

F3/thermal #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3eea0c4
working on differencing two temperatures
calbaker Nov 22, 2024
890d9da
FC and cabin thermal models are built and being implemented
calbaker Nov 25, 2024
b4a7d87
cabin and hvac are mostly implemented. no errors but failing tests
calbaker Nov 27, 2024
d251089
Merge branch 'fastsim-3' of github.com:NREL/fastsim into f3/thermal
calbaker Nov 27, 2024
41d9c29
cabin is hypothetically set up correctly
calbaker Dec 4, 2024
71361af
added various TODO comments
calbaker Dec 4, 2024
55e494c
battery thermal model is mostly implemented.
calbaker Dec 4, 2024
50df430
updated version
calbaker Dec 4, 2024
249cf7e
added HVACOption and CabinOption match combinations
calbaker Dec 9, 2024
12b4ea6
Merge branch 'fastsim-3' of github.com:NREL/fastsim into f3/thermal
calbaker Dec 16, 2024
eca8d19
provisioned for HVAC that connects to cabin and battery
calbaker Dec 17, 2024
95a2d03
almost to the point of being ready to merge into fastsim-3
calbaker Dec 18, 2024
8cd096e
battery thermal and cabin are connected
calbaker Dec 23, 2024
b1520ec
HEV engine now has temperature-sensitive on/off controls
calbaker Dec 23, 2024
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
5 changes: 2 additions & 3 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.

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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.61
wheel_base_meters: 2.6
mass_kilograms: 1473.9
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.61
wheel_base_meters: 2.6
mass_kilograms: 1473.9
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.72
mass_kilograms: 1644.2724500334996
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.875
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1606.0927171041076
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1950.3695157008785
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1666.874756172356
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
5 changes: 3 additions & 2 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 @@ -14,7 +14,7 @@ pt_type:
max_soc: 0.98
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -93,7 +93,7 @@ chassis:
drive_axle_weight_frac: 0.7
wheel_base_meters: 2.38
mass_kilograms: 1435.996
pwr_aux_watts: 250.0
pwr_aux_base_watts: 250.0
trans_eff: 0.98
save_interval: 1
state:
Expand Down Expand Up @@ -122,4 +122,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
10 changes: 6 additions & 4 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 @@ -232,7 +232,7 @@ pt_type:
pwr_idle_fuel_watts: 0.0
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -654,9 +654,10 @@ pt_type:
save_interval: 1
pt_cntrl:
RGWDB:
speed_soc_accel_buffer: 17.8816
speed_soc_accel_buffer_coeff: 1.0
speed_soc_disch_buffer: 17.8816
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer: 19.66976
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer: 13.4112
speed_soc_regen_buffer_coeff: 1.0
fc_min_time_on: 5.0
Expand Down Expand Up @@ -685,7 +686,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1950.3693212520827
pwr_aux_watts: 500.0
pwr_aux_base_watts: 500.0
trans_eff: 0.95
save_interval: 1
state:
Expand Down Expand Up @@ -714,4 +715,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1893.6704171330643
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 2403.9617607817445
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
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 @@ -241,7 +241,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1610.1752055806355
pwr_aux_watts: 700.0
pwr_aux_base_watts: 700.0
trans_eff: 0.92
save_interval: 1
state:
Expand Down Expand Up @@ -270,4 +270,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
10 changes: 6 additions & 4 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 @@ -232,7 +232,7 @@ pt_type:
pwr_idle_fuel_watts: 0.0
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -654,9 +654,10 @@ pt_type:
save_interval: 1
pt_cntrl:
RGWDB:
speed_soc_accel_buffer: 17.8816
speed_soc_accel_buffer_coeff: 1.0
speed_soc_disch_buffer: 17.8816
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer: 19.66976
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer: 13.4112
speed_soc_regen_buffer_coeff: 1.0
fc_min_time_on: 5.0
Expand Down Expand Up @@ -685,7 +686,7 @@ chassis:
drive_axle_weight_frac: 0.53
wheel_base_meters: 2.69
mass_kilograms: 2177.165764419529
pwr_aux_watts: 280.0
pwr_aux_base_watts: 280.0
trans_eff: 0.98
save_interval: 1
state:
Expand Down Expand Up @@ -714,4 +715,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
10 changes: 6 additions & 4 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 @@ -232,7 +232,7 @@ pt_type:
pwr_idle_fuel_watts: 0.0
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -654,9 +654,10 @@ pt_type:
save_interval: 1
pt_cntrl:
RGWDB:
speed_soc_accel_buffer: 17.8816
speed_soc_accel_buffer_coeff: 1.0
speed_soc_disch_buffer: 17.8816
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer: 19.66976
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer: 13.4112
speed_soc_regen_buffer_coeff: 1.0
fc_min_time_on: 5.0
Expand Down Expand Up @@ -685,7 +686,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1893.6707541501114
pwr_aux_watts: 500.0
pwr_aux_base_watts: 500.0
trans_eff: 0.95
save_interval: 1
state:
Expand Down Expand Up @@ -714,4 +715,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
5 changes: 3 additions & 2 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 @@ -14,7 +14,7 @@ pt_type:
max_soc: 0.95
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -93,7 +93,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1612.897
pwr_aux_watts: 250.0
pwr_aux_base_watts: 250.0
trans_eff: 0.98
save_interval: 1
state:
Expand Down Expand Up @@ -122,4 +122,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
5 changes: 3 additions & 2 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 @@ -14,7 +14,7 @@ pt_type:
max_soc: 0.95
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -93,7 +93,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1440.0778
pwr_aux_watts: 250.0
pwr_aux_base_watts: 250.0
trans_eff: 0.98
save_interval: 1
state:
Expand Down Expand Up @@ -122,4 +122,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
5 changes: 3 additions & 2 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 @@ -14,7 +14,7 @@ pt_type:
max_soc: 0.95
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -93,7 +93,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.6
mass_kilograms: 1636.03
pwr_aux_watts: 250.0
pwr_aux_base_watts: 250.0
trans_eff: 0.98
save_interval: 1
state:
Expand Down Expand Up @@ -122,4 +122,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
5 changes: 3 additions & 2 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 @@ -14,7 +14,7 @@ pt_type:
max_soc: 0.9
save_interval: 1
em:
eff_interp_fwd:
eff_interp_achieved:
Interp1D:
x:
- 0.0
Expand Down Expand Up @@ -93,7 +93,7 @@ chassis:
drive_axle_weight_frac: 0.59
wheel_base_meters: 2.96
mass_kilograms: 2270.152
pwr_aux_watts: 250.0
pwr_aux_base_watts: 250.0
trans_eff: 0.98
save_interval: 1
state:
Expand Down Expand Up @@ -122,4 +122,5 @@ state:
speed_ach_meters_per_second: 0.0
dist_meters: 0.0
grade_curr: 0.0
elev_curr_meters: .nan
mass_kilograms: .nan
Loading
Loading