Further improvements of the battery models BuildingSystems.Technologies.ElectricalStorages.BatterySimple

nytschgeusen · nytschgeusen · commit d278a0423336 · 2018-11-21T15:06:54.000+01:00
diff --git a/BuildingSystems/Technologies/ElectricalStorages/BaseClasses/Battery.mo b/BuildingSystems/Technologies/ElectricalStorages/BaseClasses/Battery.mo
@@ -39,6 +39,8 @@ partial model Battery "partial model of a battery"
     "Capacity relation available to bound energy";
   final parameter Real k(unit="1/s") = batteryData.k
     "Battery rate";
+  final parameter Real a_mcr(unit="W/J") = batteryData.a_mcr
+    "Maximum charge rate parameter";
   Modelica.SIunits.Power PChargeEff
     "Effective power of the electrical source";
   Modelica.SIunits.Power PLoadEff
@@ -83,6 +85,18 @@ equation
   der(E_charged) = PChargeEff;
   der(E_discharged) = PLoadEff;
 
+  PChargeEff = BuildingSystems.Utilities.Math.Functions.smoothLimit(
+               0.5*(1.0-Modelica.Math.tanh(100000.0*(SOC-1.0)))*PNet*etaCharge,
+               0.0,
+               BuildingSystems.Utilities.Math.Functions.smoothLimit(a_mcr*(E_nominal-E),
+                   0.0,
+                   PCharge_max,
+                   0.001),
+               0.001);
+
+  PGrid = 0.5*(1.0-Modelica.Math.tanh(100000.0*(PNet)))*(PNet + PLoadEff*etaLoad)+
+          0.5*(1.0+Modelica.Math.tanh(100000.0*(PNet)))*(PNet - PChargeEff/etaCharge);               
+
     annotation (defaultComponentName="battery", Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),graphics={
       Rectangle(extent={{-60,60},{60,-60}},
         lineColor={215,215,215},
diff --git a/BuildingSystems/Technologies/ElectricalStorages/BatteryComplex.mo b/BuildingSystems/Technologies/ElectricalStorages/BatteryComplex.mo
@@ -3,8 +3,6 @@ model BatteryComplex
   extends BaseClasses.Battery;
   final parameter Real p(unit="1") = batteryData.p
     "Peukert coefficient";
-  final parameter Real a_mcr(unit="W/J") = batteryData.a_mcr
-    "Maximum charge rate parameter";
   Modelica.SIunits.Power PLoadAva
     "Discharging power using available electrons in EAva";
   Modelica.SIunits.Power PLoadBou
@@ -29,14 +27,6 @@ equation
               0.0,
               E_max,
               0.001);
-  PChargeEff = BuildingSystems.Utilities.Math.Functions.smoothLimit(
-               0.5*(1.0-Modelica.Math.tanh(100000.0*(SOC-1.0)))*PNet*etaCharge,
-               0.0,
-               BuildingSystems.Utilities.Math.Functions.smoothLimit(a_mcr*(E_nominal-E),
-                   0.0,
-                   PCharge_max,
-                   0.001),
-               0.001);
   PLoadBou = BuildingSystems.Utilities.Math.Functions.smoothLimit(
                0.5*(1.0-Modelica.Math.tanh(100000.0*(SOC_min-SOC)))*(-PNet/etaLoad - PLoadAva)+fDis*E,
                0.0,
@@ -53,9 +43,7 @@ equation
                0.0,
                PLoad_max,
                0.001);
-  PGrid = 0.5*(1.0-Modelica.Math.tanh(100000.0*(PNet)))*(PNet + PLoadEff*etaLoad)+
-          0.5*(1.0+Modelica.Math.tanh(100000.0*(PNet)))*(PNet - PChargeEff/etaCharge);
-
+  
     annotation (Documentation(info="<html>
   <p>
   Extended model for an eletrical battery based on the Kinetic Battery Model (KiBaM) of Manwell and McGowan
diff --git a/BuildingSystems/Technologies/ElectricalStorages/BatterySimple.mo b/BuildingSystems/Technologies/ElectricalStorages/BatterySimple.mo
@@ -6,21 +6,12 @@ equation
   der(EAva) = PChargeEff - PLoadEff + k*(h2 - h1);
   der(EBou) = -k*(h2 - h1) - fDis * E;
 
-  PChargeEff = BuildingSystems.Utilities.Math.Functions.smoothLimit(
-               0.5*(1.0-Modelica.Math.tanh(100000.0*(SOC-1.0)))*PNet*etaCharge,
-               0.0,
-               PCharge_max,
-               0.001);
-
   PLoadEff = BuildingSystems.Utilities.Math.Functions.smoothLimit(
              -0.5*(1.0+Modelica.Math.tanh(100000.0*(SOC-1.0*SOC_min)))*PNet/etaLoad,
              0.0,
              PLoad_max,
              0.001);
 
-  PGrid = 0.5*(1.0-Modelica.Math.tanh(100000.0*(PNet)))*(PNet + PLoadEff*etaLoad)+
-          0.5*(1.0+Modelica.Math.tanh(100000.0*(PNet)))*(PNet - PChargeEff/etaCharge);
-          
     annotation (Documentation(info="<html>
   <p>
   Model for an eletrical battery based on the Kinetic Battery Model (KiBaM) of Manwell and McGowan
