Merge pull request #175 from NREL/f3/thermal

F3/thermal
NREL · Dec 23, 2024 · 836146c · 836146c
2 parents fcde5a1 + b1520ec
commit 836146c
Show file tree

Hide file tree

Showing 106 changed files with 4,334 additions and 2,265 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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
@@ -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:
@@ -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
diff --git a/cal_and_val/f3-vehicles/2012 Ford Focus.yaml b/cal_and_val/f3-vehicles/2012 Ford Focus.yaml
@@ -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:
@@ -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
diff --git a/cal_and_val/f3-vehicles/2012 Ford Fusion.yaml b/cal_and_val/f3-vehicles/2012 Ford Fusion.yaml
@@ -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:
@@ -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
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
@@ -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:
@@ -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
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
@@ -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:
@@ -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
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
@@ -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:
@@ -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
diff --git a/cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml b/cal_and_val/f3-vehicles/2016 CHEVROLET Spark EV.yaml
@@ -14,7 +14,7 @@ pt_type:
       max_soc: 0.98
       save_interval: 1
     em:
-      eff_interp_fwd:
+      eff_interp_achieved:
         Interp1D:
           x:
             - 0.0
@@ -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:
@@ -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
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
@@ -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
@@ -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
@@ -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:
@@ -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
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
@@ -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:
@@ -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
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
@@ -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:
@@ -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
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
@@ -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:
@@ -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
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
@@ -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
@@ -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
@@ -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:
@@ -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
diff --git a/cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml b/cal_and_val/f3-vehicles/2016 KIA Optima Hybrid.yaml
@@ -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
@@ -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
@@ -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:
@@ -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
diff --git a/cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml b/cal_and_val/f3-vehicles/2016 Leaf 24 kWh.yaml
@@ -14,7 +14,7 @@ pt_type:
       max_soc: 0.95
       save_interval: 1
     em:
-      eff_interp_fwd:
+      eff_interp_achieved:
         Interp1D:
           x:
             - 0.0
@@ -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:
@@ -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
diff --git a/cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml b/cal_and_val/f3-vehicles/2016 MITSUBISHI i-MiEV.yaml
@@ -14,7 +14,7 @@ pt_type:
       max_soc: 0.95
       save_interval: 1
     em:
-      eff_interp_fwd:
+      eff_interp_achieved:
         Interp1D:
           x:
             - 0.0
@@ -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:
@@ -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
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
@@ -14,7 +14,7 @@ pt_type:
       max_soc: 0.95
       save_interval: 1
     em:
-      eff_interp_fwd:
+      eff_interp_achieved:
         Interp1D:
           x:
             - 0.0
@@ -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:
@@ -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
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
@@ -14,7 +14,7 @@ pt_type:
       max_soc: 0.9
       save_interval: 1
     em:
-      eff_interp_fwd:
+      eff_interp_achieved:
         Interp1D:
           x:
             - 0.0
@@ -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:
@@ -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