test replacing the safety factor with a charging efficiency

NREL · Dec 9, 2022 · ee4e71e · ee4e71e
1 parent faf015e
commit ee4e71e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/shared/lib_battery_dispatch.cpp b/shared/lib_battery_dispatch.cpp
@@ -681,7 +681,7 @@ dispatch_automatic_t::dispatch_automatic_t(
 
     _mode = dispatch_mode;
     _weather_forecast_mode = weather_forecast_mode;
-    _safety_factor = 0.03;
+    _safety_factor = 0.0;
 
 	m_batteryPower->canClipCharge = can_clip_charge;
 	m_batteryPower->canSystemCharge = can_charge;

diff --git a/shared/lib_battery_dispatch_automatic_btm.cpp b/shared/lib_battery_dispatch_automatic_btm.cpp
@@ -446,7 +446,7 @@ void dispatch_automatic_behind_the_meter_t::target_power(double E_useful, size_t
 				if (sorted_grid[ii].Grid() > P_target_min)
 					break;
 
-				E_charge += (P_target_min - sorted_grid[ii].Grid())*_dt_hour;
+				E_charge += (P_target_min - sorted_grid[ii].Grid()) * _dt_hour * m_batteryPower->singlePointEfficiencyACToDC;
 			}
 			E_charge_vec.push_back(E_charge);
 			if (debug)