diff --git a/cal_and_val/thermal/cal_hev.py b/cal_and_val/thermal/cal_hev.py index e055966f..cf847802 100644 --- a/cal_and_val/thermal/cal_hev.py +++ b/cal_and_val/thermal/cal_hev.py @@ -499,23 +499,23 @@ def get_fc_temp_too_hot(sd_dict): (10, 250), # new_cab_htc_to_amb_stop (100e3, 350e3), # new_cab_tm (1.5, 7), # new_cab_length - (5, 50), # new_speed_soc_disch_buffer_meters_per_second + (5, 100), # new_speed_soc_disch_buffer_meters_per_second (0.25, 5.0), # new_speed_soc_disch_buffer_coeff (5, 100), # new_speed_soc_fc_on_buffer_meters_per_second - (0.25, 2.0), # new_speed_soc_fc_on_buffer_coeff - (5, 30), # new_fc_min_time_on_seconds + (0.25, 5.0), # new_speed_soc_fc_on_buffer_coeff + (3, 30), # new_fc_min_time_on_seconds (0.3, 0.8), # new_frac_pwr_demand_fc_forced_on (0.1, 1.0), # new_frac_of_most_eff_pwr_to_run_fc - (5, 1000), # new_hvac_p_watts_per_kelvin + (5, 1_000), # new_hvac_p_watts_per_kelvin (1, 100), # new_hvac_i - (0.05, 0.25), # new_hvac_frac_of_ideal_cop + (0.05, 0.35), # new_hvac_frac_of_ideal_cop (50e3, 300e3), # new_fc_thrml_heat_capacitance_joules_per_kelvin, - (0.2, 2), # new_fc_thrml_length_for_convection_meters, - (10, 100), # new_fc_thrml_htc_to_amb_stop_watts_per_square_meter_kelvin, - (10, 1000), # new_fc_thrml_conductance_from_comb_watts_per_kelvin, + (0.2, 3), # new_fc_thrml_length_for_convection_meters, + (5, 100), # new_fc_thrml_htc_to_amb_stop_watts_per_square_meter_kelvin, + (5, 5_000), # new_fc_thrml_conductance_from_comb_watts_per_kelvin, # (), # new_fc_thrml_max_frac_from_comb, - (3, 200), # new_fc_thrml_radiator_effectiveness, - (220, 300), # new_fc_thrml_fc_eff_model_Exponential_offset, + (3, 300), # new_fc_thrml_radiator_effectiveness, + (220, 350), # new_fc_thrml_fc_eff_model_Exponential_offset, (10, 60), # new_fc_thrml_fc_eff_model_Exponential_lag, (0.15, 0.35), # new_fc_thrml_fc_eff_model_Exponential_minimum, ), diff --git a/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml b/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml index 01f659cc..3f8ec9cc 100644 --- a/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml +++ b/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml @@ -237,15 +237,15 @@ hvac: te_set_kelvin: 295.15 te_deadband_kelvin: 1.5 p_watts_per_kelvin: 100.0 - i: 10.0 + i: 50.0 # TODO: bump this up - pwr_i_max_watts: 5000.0 + pwr_i_max_watts: 10000.0 d: 5.0 - pwr_thrml_max_watts: 10000.0 + pwr_thrml_max_watts: 15000.0 frac_of_ideal_cop: 0.15 heat_source: FuelConverter # TODO: bump this up - pwr_aux_for_hvac_max_watts: 5000.0 + pwr_aux_for_hvac_max_watts: 8000.0 mass_kilograms: 1508.195 pwr_aux_base_watts: 500.0 trans_eff: 0.98 diff --git a/cal_and_val/thermal/val_hev.py b/cal_and_val/thermal/val_hev.py index 308e9e03..3a030cf4 100644 --- a/cal_and_val/thermal/val_hev.py +++ b/cal_and_val/thermal/val_hev.py @@ -19,8 +19,8 @@ best_row_fuel_energy, :len(cal_mod_obj.param_fns)].to_numpy() -res_df['euclidean'] = ( - res_df.iloc[:, len(cal_mod_obj.param_fns):] ** 2).sum(1).pow(1/2) +# res_df['euclidean'] = ( +# res_df.iloc[:, len(cal_mod_obj.param_fns):] ** 2).sum(1).pow(1/2) best_row = res_df["euclidean"].argmin() best_df = res_df.iloc[best_row, :] param_vals_euclidean = res_df.iloc[