Maint 7.0.x issue2798 data center kWh (#2800)

* Merged files from issue2798_dataCenter_kWh * Updated release notes
lbl-srg · Dec 7, 2021 · 26e4532 · 26e4532
1 parent 2afa252
commit 26e4532
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 23 deletions.
diff --git a/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo b/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo
@@ -10,7 +10,7 @@ model Battery "Simple model of a battery"
   parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9
     "Efficiency during discharging";
   parameter Real SOC_start(start=0.1) "Initial charge";
-  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kW.h")
     "Maximum available charge";
   parameter Modelica.SIunits.Voltage V_nominal(start = 110)
     "Nominal voltage (V_nominal >= 0)";
@@ -185,6 +185,12 @@ and that the state of charge remains between zero and one.
         revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Corrected wrong unit string.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 April 2, 2020 by Michael Wetter:<br/>
 Corrected model and improved the documentation. The previous model extracted from
 the AC connector the input power <code>P</code> plus the AC/DC conversion losses, but <code>P</code>

diff --git a/Buildings/Electrical/DC/Storage/BaseClasses/Charge.mo b/Buildings/Electrical/DC/Storage/BaseClasses/Charge.mo
@@ -7,7 +7,7 @@ model Charge "Model to compute the battery charge"
     "Efficiency during discharging";
   parameter Real SOC_start(min=0, max=1, unit="1")=0.1
     "Initial state of charge";
-  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+  parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kW.h")
     "Maximum available charge";
   Modelica.SIunits.Power PAct "Actual power";
   Modelica.Blocks.Interfaces.RealInput P(final quantity="Power",
@@ -83,6 +83,12 @@ exceeding the range between 0 and 1.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Corrected wrong unit string.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 June 2, 2014, by Marco Bonvini:<br/>
 Revised documentation.
 </li>

diff --git a/Buildings/Electrical/DC/Storage/Battery.mo b/Buildings/Electrical/DC/Storage/Battery.mo
@@ -5,7 +5,7 @@ model Battery "Simple model of a battery"
  parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9
     "Efficiency during discharging";
  parameter Real SOC_start(min=0, max=1, unit="1")=0.1 "Initial state of charge";
- parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+ parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kW.h")
     "Maximum available charge";
  parameter Modelica.SIunits.Voltage V_nominal
     "Nominal voltage (V_nominal >= 0)";
@@ -150,6 +150,12 @@ and that the state of charge remains between zero and one.
         revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Corrected wrong unit string.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 September 24, 2015 by Michael Wetter:<br/>
 Removed binding of <code>P_nominal</code> as
 this parameter is disabled and assigned a value

diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/DataCenter.mo b/Buildings/Examples/ChillerPlant/BaseClasses/DataCenter.mo
@@ -40,7 +40,7 @@ partial model DataCenter
     m2_flow(start=mAir_flow_nominal),
     dp2_nominal=249*3,
     UA_nominal=mAir_flow_nominal*1006*5,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     dp1_nominal(displayUnit="Pa") = 1000 + 89580)
     "Cooling coil"
     annotation (Placement(transformation(extent={{300,-180},{280,-160}})));
@@ -80,7 +80,7 @@ partial model DataCenter
     TAirInWB_nominal(displayUnit="degC") = 283.15,
     TApp_nominal=6,
     dp_nominal=14930 + 14930 + 74650,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial)
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Cooling tower"                                   annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
@@ -146,7 +146,7 @@ partial model DataCenter
     dp2_nominal=0,
     dp1_nominal=0,
     per=Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_Carrier_19XR_742kW_5_42COP_VSD(),
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial)
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     annotation (Placement(transformation(extent={{274,83},{254,103}})));
   Buildings.Fluid.Actuators.Valves.TwoWayLinear val6(
     redeclare package Medium = MediumW,
@@ -602,6 +602,12 @@ Buildings.Examples.ChillerPlant</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2021, by Michael Wetter:<br/>
+Changed initialization from steady-state initial to fixed initial.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">issue 2798</a>.
+</li>
+<li>
 November 18, 2021, by Michael Wetter:<br/>
 Set <code>dp_nominal</code> for pumps and fan to a realistic value.<br/>
 This is for

diff --git a/...ferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterContinuousTimeControl.txt b/...ferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterContinuousTimeControl.txt
@@ -1,7 +1,8 @@
-last-generated=2021-05-27
+last-generated=2021-12-06
 statistics-initialization=
 {
-  "nonlinear": "1, 2, 1, 1, 17",
+  "linear": "2",
+  "nonlinear": "1, 2, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterDiscreteTimeControl.txt b/...ReferenceResults/Dymola/Buildings_Examples_ChillerPlant_DataCenterDiscreteTimeControl.txt
@@ -1,7 +1,8 @@
-last-generated=2021-05-27
+last-generated=2021-12-06
 statistics-initialization=
 {
-  "nonlinear": "1, 2, 1, 1, 17",
+  "linear": "2",
+  "nonlinear": "1, 2, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -12,7 +13,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1.30464e+07, 1.36512e+07]
-TAirSup.T=[2.931499938964844e+02, 3.000118408203125e+02, 3.002850952148438e+02, 2.999788208007812e+02, 3.000184631347656e+02, 3.008482055664062e+02, 2.999417114257812e+02, 3.000575866699219e+02, 3.002469787597656e+02, 2.997608032226562e+02, 3.008482055664062e+02, 2.999416198730469e+02, 3.000575866699219e+02, 3.002467041015625e+02, 2.997608337402344e+02, 3.008482055664062e+02, 2.999416198730469e+02, 3.000575866699219e+02, 3.002467041015625e+02, 2.997608032226562e+02, 3.008482971191406e+02, 2.999417114257812e+02, 3.000575866699219e+02, 3.002469787597656e+02, 2.997608032226562e+02, 3.008482971191406e+02, 2.99941650390625e+02, 3.000576171875e+02, 3.002467041015625e+02, 2.997608337402344e+02, 3.008482360839844e+02, 3.002455444335938e+02, 3.001767883300781e+02, 3.002845458984375e+02, 2.998896179199219e+02, 2.99613037109375e+02, 3.006255187988281e+02, 3.001194763183594e+02, 3.002842102050781e+02, 2.998895874023438e+02, 2.996129760742188e+02, 3.006256103515625e+02, 3.001194763183594e+02, 3.002844543457031e+02, 2.998897094726562e+02, 2.999432678222656e+02, 3.001430358886719e+02, 3.002892456054688e+02, 3.000545959472656e+02, 3.006559753417969e+02, 2.99709228515625e+02, 2.998655395507812e+02, 3.004558410644531e+02, 3.000545959472656e+02, 3.006558532714844e+02, 2.997091674804688e+02, 3.002256774902344e+02, 3.002518920898438e+02, 3.002503967285156e+02, 3.001264953613281e+02, 3.001675109863281e+02, 2.998656005859375e+02, 3.004558715820312e+02, 3.000545959472656e+02, 3.006559448242188e+02, 2.997091979980469e+02, 2.998655700683594e+02, 3.004558410644531e+02, 3.000545959472656e+02, 3.006558532714844e+02, 2.997091674804688e+02, 2.998655090332031e+02, 2.992843017578125e+02, 3.00068603515625e+02, 3.003787231445312e+02, 3.002118225097656e+02, 2.999416198730469e+02, 3.000575866699219e+02, 3.002469482421875e+02, 2.997608032226562e+02, 3.008482971191406e+02, 2.999416809082031e+02, 3.000576171875e+02, 3.002467041015625e+02, 2.997608337402344e+02, 3.001391296386719e+02, 3.000281982421875e+02, 3.003760375976562e+02, 3.00104248046875e+02, 3.001494445800781e+02, 2.997094116210938e+02, 2.99865478515625e+02, 3.004558410644531e+02, 3.000545959472656e+02, 3.006559753417969e+02, 2.99709228515625e+02, 2.99865478515625e+02, 3.004558715820312e+02, 3.002991638183594e+02, 2.9991748046875e+02, 3.003031005859375e+02]
+TAirSup.T=[2.931499938964844e+02, 3.000107727050781e+02, 3.002842102050781e+02, 2.9997802734375e+02, 3.000176391601562e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 3.002315979003906e+02, 3.001759948730469e+02, 3.0028369140625e+02, 2.998889465332031e+02, 2.996123046875e+02, 3.006250305175781e+02, 3.001188659667969e+02, 3.002835998535156e+02, 2.998889465332031e+02, 2.996123046875e+02, 3.00625e+02, 3.001188659667969e+02, 3.002835693359375e+02, 2.99888916015625e+02, 2.999425354003906e+02, 3.001419677734375e+02, 3.002884521484375e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 3.002250061035156e+02, 3.002510986328125e+02, 3.002492980957031e+02, 3.001258544921875e+02, 3.001667785644531e+02, 2.998648681640625e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 2.992835998535156e+02, 3.000678100585938e+02, 3.003779602050781e+02, 3.002110290527344e+02, 2.999408874511719e+02, 3.000569763183594e+02, 3.002462463378906e+02, 2.997601623535156e+02, 3.008475952148438e+02, 2.999408874511719e+02, 3.000569763183594e+02, 3.002462463378906e+02, 2.997601623535156e+02, 3.001383972167969e+02, 3.000271301269531e+02, 3.00375244140625e+02, 3.001034240722656e+02, 3.001484985351562e+02, 2.997086791992188e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.0005419921875e+02, 3.006553039550781e+02, 2.9970849609375e+02, 2.9986474609375e+02, 3.004551391601562e+02, 3.002982482910156e+02, 2.999165649414062e+02, 3.0030224609375e+02]
 wseCon.TWetBul=[2.844858093261719e+02, 2.834715576171875e+02, 2.830081176757812e+02, 2.828131103515625e+02, 2.849400634765625e+02, 2.8767724609375e+02, 2.8843408203125e+02, 2.897018127441406e+02, 2.908985595703125e+02, 2.890965576171875e+02, 2.873750610351562e+02, 2.870310668945312e+02, 2.850565490722656e+02, 2.844025268554688e+02, 2.846215209960938e+02, 2.85584716796875e+02, 2.844925842285156e+02, 2.850927429199219e+02, 2.872787780761719e+02, 2.895964050292969e+02, 2.900821838378906e+02, 2.907142028808594e+02, 2.902919311523438e+02, 2.930731811523438e+02, 2.90821044921875e+02, 2.897002868652344e+02, 2.878292541503906e+02, 2.864308776855469e+02, 2.858257446289062e+02, 2.848772583007812e+02, 2.845028381347656e+02, 2.841003723144531e+02, 2.848956604003906e+02, 2.86788330078125e+02, 2.895969543457031e+02, 2.904920654296875e+02, 2.898047180175781e+02, 2.892393188476562e+02, 2.886691284179688e+02, 2.876924133300781e+02, 2.86109130859375e+02, 2.854310913085938e+02, 2.85067138671875e+02, 2.846211547851562e+02, 2.8425341796875e+02, 2.839706420898438e+02, 2.83714111328125e+02, 2.850740661621094e+02, 2.861065368652344e+02, 2.872113342285156e+02, 2.876419067382812e+02, 2.873104553222656e+02, 2.873970031738281e+02, 2.86239013671875e+02, 2.8519189453125e+02, 2.844321594238281e+02, 2.840808715820312e+02, 2.840713806152344e+02, 2.836410827636719e+02, 2.833737182617188e+02, 2.843021850585938e+02, 2.866591186523438e+02, 2.888963012695312e+02, 2.899041748046875e+02, 2.917620544433594e+02, 2.920389709472656e+02, 2.900023498535156e+02, 2.879818725585938e+02, 2.860729370117188e+02, 2.851282043457031e+02, 2.844984436035156e+02, 2.84646240234375e+02, 2.840837097167969e+02, 2.839063415527344e+02, 2.838663330078125e+02, 2.845386047363281e+02, 2.870115661621094e+02, 2.886986083984375e+02, 2.89677734375e+02, 2.908424682617188e+02, 2.89357666015625e+02, 2.880846862792969e+02, 2.865106201171875e+02, 2.850302429199219e+02, 2.841634216308594e+02, 2.842227783203125e+02, 2.844867553710938e+02, 2.843226013183594e+02, 2.840713806152344e+02, 2.842268371582031e+02, 2.857822875976562e+02, 2.865521240234375e+02, 2.869639282226562e+02, 2.870909118652344e+02, 2.867579345703125e+02, 2.865088195800781e+02, 2.860401611328125e+02, 2.847579345703125e+02, 2.838851928710938e+02, 2.837900695800781e+02, 2.835923156738281e+02]
 wseCon.y1=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 chiCon.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00]