Skip to content

F3/feature/simdrivelabel #220

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
wants to merge 58 commits into
base: fastsim-3
Choose a base branch
from
Open

F3/feature/simdrivelabel #220

Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
d28adc0
added more asserts
Jul 14, 2025
230ee48
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 14, 2025
a63bff2
uncommented failing tests that need to be fixed
Jul 14, 2025
bf733be
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 15, 2025
885af0c
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 16, 2025
0d64336
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 16, 2025
8e11f96
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 16, 2025
78895eb
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 16, 2025
52087e7
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 17, 2025
4401758
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 21, 2025
3a4cba7
Merge branch 'f3/simdrivelabel-partial' into f3/feature/simdrivelabel
Jul 22, 2025
1116ce0
Fix incorrect f2 variable reference for motor/controller efficiency s…
Jul 30, 2025
187ecb7
Ensure that the state variable i is less than the length of the cycle…
Jul 31, 2025
81f7a92
Update powertrian type to be PlugInHybridElectricVehicle
Jul 31, 2025
28cf5aa
Switch to walk_once on PHEV to ensure SOC is being set; reset state v…
Jul 31, 2025
ad23630
Change to walk_once() to avoid iteration on accel
Jul 31, 2025
fbab029
Add (temporary) zeroing of aux loads.
Jul 31, 2025
4c300a0
Enable hev to run without panic.
Aug 1, 2025
bae2b39
Ensure efficiency is in valid range
Aug 1, 2025
1d93cca
Fix incorrect J/kWh value.
Aug 1, 2025
2b03e4c
Call init again to ensure EM eff map is re-generated.
Aug 5, 2025
c992d7f
Pull out pieces of calculation for easier inspection.
Aug 5, 2025
6f1e0ea
Correct detection of max output
Aug 5, 2025
fa78031
Change lookup strategy for EM to linear.
Aug 5, 2025
7040d66
Merge branch 'fastsim-3' of github.com:NREL/fastsim into f3/feature/s…
Aug 6, 2025
f7aecea
intermediate debugging state
Aug 6, 2025
2a7bcbf
Increase tolerance for conv.
Aug 6, 2025
438c54b
Remove f3veh_with_f2_eff()
Aug 6, 2025
0279918
Merge branch 'f3/feature/simdrivelabel' of https://github.com/NREL/fa…
Aug 6, 2025
6667b75
Remove printout as it causes more tests to fail
Aug 6, 2025
118dcca
Correct error string.
Aug 8, 2025
272c45e
Update defaults for hybrid controls.
Aug 8, 2025
506ad6c
Follow ruff format suggestion to add comma
Aug 8, 2025
a243675
Update Prius model with updated defaults
Aug 8, 2025
9f8f677
Hook up a checker for the RGWDB powertrain control.
Aug 8, 2025
af6a1af
Fix issue with mass query
Aug 8, 2025
512fd90
Add helper function for simdrive label fe
Aug 12, 2025
2ba6450
Rework tolerance limits for accel.
Aug 12, 2025
57f9107
Add error and tolerance to output
Aug 13, 2025
1baabc1
Implement traction limits
Aug 13, 2025
74d03c8
Update simdrive label comparison function
Aug 14, 2025
75c6f6f
Update tolerances to pass all tests.
Aug 14, 2025
b463f85
Update saved results
Aug 14, 2025
5e67b41
Add progress in separating simdrive label into a sim and post-process…
Aug 20, 2025
4538167
Fix issue with speeds and add tolerance.
Aug 20, 2025
7cd2d4d
Add check for BEV simdrive label calcs
Aug 20, 2025
c5c1e36
Interim checkin with code passing tests.
Aug 21, 2025
fca0112
All tests passing on simdrive label comparisons
Aug 21, 2025
cf27beb
Extract helper functions for running simdrive PHEV with an initial soc
Aug 21, 2025
cdb700b
Finish separating get_label_fe into simulation and post-processing fu…
Aug 22, 2025
d81bf3c
Remove commented code and rename function
Aug 22, 2025
e074b00
Rename function for clarity.
Aug 22, 2025
e464ca6
Update function name for clarity
Aug 22, 2025
cdb0a71
Annotate functions with documentation
Aug 22, 2025
473c309
Pull tolerance out to be by powertrain.
Sep 3, 2025
80ee13b
Simplify use of Interp1D.
Sep 5, 2025
a0d7ca2
fixing the try_from() function translating fastsim-2 vehicles to fast…
robinsteuteville Sep 17, 2025
9d45e36
my mistake -- thought that the PHEVs were being read in wrong but the…
robinsteuteville Sep 17, 2025
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
6 changes: 3 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
Expand Up @@ -3,7 +3,7 @@ name: 2016 BMW i3 REx PHEV
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
pt_type:
HEV:
PHEV:
res:
thrml: None
mass_kilograms: ~
Expand Down Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
6 changes: 3 additions & 3 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 @@ -3,7 +3,7 @@ name: 2016 CHEVROLET Volt
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
pt_type:
HEV:
PHEV:
res:
thrml: None
mass_kilograms: ~
Expand Down Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
6 changes: 3 additions & 3 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 @@ -3,7 +3,7 @@ name: 2016 FORD C-MAX (PHEV)
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
pt_type:
HEV:
PHEV:
res:
thrml: None
mass_kilograms: ~
Expand Down Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 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 @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
6 changes: 3 additions & 3 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 @@ -3,7 +3,7 @@ name: 2016 HYUNDAI Sonata PHEV
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
pt_type:
HEV:
PHEV:
res:
thrml: None
mass_kilograms: ~
Expand Down Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 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 @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 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 @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 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 @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 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 @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
6 changes: 3 additions & 3 deletions cal_and_val/f3-vehicles/2017 Prius Prime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: 2017 Prius Prime
doc: Generated by cal_and_val.tests.test_f2_to_f3.test_f2_to_f3
year: 2016
pt_type:
HEV:
PHEV:
res:
thrml: None
mass_kilograms: ~
Expand Down Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 deletions cal_and_val/f3-vehicles/2022 Toyota RAV4 Hybrid LE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 deletions cal_and_val/f3-vehicles/2022 Toyota Yaris Hybrid Mid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 deletions cal_and_val/f3-vehicles/Toyota Corolla Cross Hybrid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 deletions cal_and_val/f3-vehicles/Toyota Mirai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
4 changes: 2 additions & 2 deletions fastsim-core/resources/vehicles/2016_TOYOTA_Prius_Two.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ pt_type:
energy_loss_joules: []
pt_cntrl:
RGWDB:
speed_soc_disch_buffer_meters_per_second: 31.2928
speed_soc_disch_buffer_meters_per_second: 22.352
speed_soc_disch_buffer_coeff: 1.0
speed_soc_fc_on_buffer_meters_per_second: 46.9392
speed_soc_fc_on_buffer_meters_per_second: 26.8224
speed_soc_fc_on_buffer_coeff: 1.0
speed_soc_regen_buffer_meters_per_second: 13.4112
speed_soc_regen_buffer_coeff: 1.0
Expand Down
1 change: 1 addition & 0 deletions fastsim-core/src/simdrive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ impl SimDrive {
pub fn solve_step(&mut self) -> anyhow::Result<()> {
let i = *self.veh.state.i.get_fresh(|| format_dbg!())?;
let time_prev = *self.veh.state.time.get_stale(|| format_dbg!())?;
ensure!(self.cyc.time.len() > i);
self.veh.state.time.update(
*self.cyc.time.get(i).with_context(|| format_dbg!())?,
|| format_dbg!(),
Expand Down
Loading
Loading