Merge pull request modelica#4112 from henrikt-ma/cccvcharging-unit-error

Fix unit error in CCCVcharging
casella · Nov 14, 2023 · 402662a · 402662a
2 parents 73dc2c0 + abb35f2
commit 402662a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/Modelica/Electrical/Batteries/Examples/BatteryDischargeCharge.mo b/Modelica/Electrical/Batteries/Examples/BatteryDischargeCharge.mo
@@ -9,11 +9,12 @@ model BatteryDischargeCharge "Discharge and charge idealized battery"
     Tp=60,
     startTime=60)
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  parameter Modelica.Units.SI.Current Isc = 1200 "Short-circuit current of cell at OCVmax";
   parameter Modelica.Electrical.Batteries.ParameterRecords.CellData cellData1(
     Qnom=18000,
     OCVmax=4.2,
     OCVmin=2.5,
-    Ri=cellData1.OCVmax/1200)
+    Ri=cellData1.OCVmax/Isc)
     annotation (Placement(transformation(extent={{60,20},{80,40}})));
   Modelica.Electrical.Batteries.BatteryStacks.CellStack battery1(
     Ns=10,
@@ -38,7 +39,7 @@ model BatteryDischargeCharge "Discharge and charge idealized battery"
   parameter Modelica.Electrical.Batteries.ParameterRecords.TransientData.ExampleData cellData2(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=cellData2.OCVmax/1200,
+    Ri=cellData2.OCVmax/Isc,
     Idis=0.1,
     nRC=2,
     rcData={Modelica.Electrical.Batteries.ParameterRecords.TransientData.RCData(

diff --git a/Modelica/Electrical/Batteries/Examples/CCCV_Cell.mo b/Modelica/Electrical/Batteries/Examples/CCCV_Cell.mo
@@ -2,10 +2,11 @@ within Modelica.Electrical.Batteries.Examples;
 model CCCV_Cell
   "Charge a cell with constant current - constant voltage characteristic"
   extends Modelica.Icons.Example;
+  parameter Modelica.Units.SI.Current Isc = 1200 "Short-circuit current of cell at OCVmax";
   parameter Modelica.Electrical.Batteries.ParameterRecords.ExampleData cellData(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=4.2/1200,
+    Ri=cellData.OCVmax/Isc,
     Idis=0.001) "Cell data"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
   Modelica.Electrical.Batteries.Utilities.CCCVcharger cccvCharger(I=25, Vend=4.2) annotation (Placement(

diff --git a/Modelica/Electrical/Batteries/Examples/CCCV_CellRC.mo b/Modelica/Electrical/Batteries/Examples/CCCV_CellRC.mo
@@ -2,10 +2,11 @@ within Modelica.Electrical.Batteries.Examples;
 model CCCV_CellRC
   "Charge a transient cell with constant current - constant voltage characteristic"
   extends Modelica.Icons.Example;
+  parameter Modelica.Units.SI.Current Isc = 1200 "Short-circuit current of cell at OCVmax";
   parameter Modelica.Electrical.Batteries.ParameterRecords.TransientData.ExampleData cellData(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=4.2/1200,
+    Ri=cellData.OCVmax/Isc,
     Idis=0.001) "Cell data"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
   Modelica.Electrical.Batteries.Utilities.CCCVcharger cccvCharger(I=25, Vend=4.2) annotation (Placement(

diff --git a/Modelica/Electrical/Batteries/Examples/CCCV_Stack.mo b/Modelica/Electrical/Batteries/Examples/CCCV_Stack.mo
@@ -2,16 +2,17 @@ within Modelica.Electrical.Batteries.Examples;
 model CCCV_Stack
   "Charge a stack with constant current - constant voltage characteristic"
   extends Modelica.Icons.Example;
+  parameter Modelica.Units.SI.Current Isc = 1200 "Short-circuit current of cell at OCVmax";
   parameter Modelica.Electrical.Batteries.ParameterRecords.ExampleData cellDataOriginal(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=4.2/1200,
+    Ri=cellDataOriginal.OCVmax/Isc,
     Idis=0.001) "Original cell data"
     annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
   parameter Modelica.Electrical.Batteries.ParameterRecords.ExampleData cellDataDegraded(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=2*4.2/1200,
+    Ri=2*cellDataDegraded.OCVmax/Isc,
     Idis=0.001) "Degraded cell data"
     annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
   parameter Modelica.Electrical.Batteries.ParameterRecords.StackData

diff --git a/Modelica/Electrical/Batteries/Examples/CCCV_StackRC.mo b/Modelica/Electrical/Batteries/Examples/CCCV_StackRC.mo
@@ -2,16 +2,17 @@ within Modelica.Electrical.Batteries.Examples;
 model CCCV_StackRC
   "Charge a transient stack with constant current - constant voltage characteristic"
   extends Modelica.Icons.Example;
+  parameter Modelica.Units.SI.Current Isc = 1200 "Short-circuit current of cell at OCVmax";
   parameter Modelica.Electrical.Batteries.ParameterRecords.TransientData.ExampleData cellDataOriginal(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=4.2/1200,
+    Ri=cellDataOriginal.OCVmax/Isc,
     Idis=0.001) "Original cell data"
     annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
   parameter Modelica.Electrical.Batteries.ParameterRecords.TransientData.ExampleData cellDataDegraded(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=2*4.2/1200,
+    Ri=2*cellDataDegraded.OCVmax/Isc,
     Idis=0.001) "Degraded cell data"
     annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
   parameter Modelica.Electrical.Batteries.ParameterRecords.TransientData.StackData

diff --git a/Modelica/Electrical/Batteries/Examples/CCCVcharging.mo b/Modelica/Electrical/Batteries/Examples/CCCVcharging.mo
@@ -2,10 +2,11 @@ within Modelica.Electrical.Batteries.Examples;
 model CCCVcharging
   "Charge a battery with constant current - constant voltage characteristic"
   extends Modelica.Icons.Example;
+  parameter Modelica.Units.SI.Current Isc = 1200 "Short-circuit current of cell at OCVmax";
   parameter Modelica.Electrical.Batteries.ParameterRecords.TransientData.ExampleData cellData(
     Qnom=18000,
     useLinearSOCDependency=false,
-    Ri=cellData.OCVmax/1200,
+    Ri=cellData.OCVmax/Isc,
     Idis=0.001)
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
   Modelica.Electrical.Batteries.BatteryStacks.CellRCStack battery(