From 71f5f0fc0896d6f1a7832c802fe2951e69961ddb Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Tue, 7 Dec 2021 10:32:14 -0800 Subject: [PATCH] Maint 8.1.x issue2798 data center kWh (#2801) * Merged files from issue2798_dataCenter_kWh * Updated release notes --- .../Electrical/AC/OnePhase/Storage/Battery.mo | 8 +++++++- .../Electrical/DC/Storage/BaseClasses/Charge.mo | 8 +++++++- Buildings/Electrical/DC/Storage/Battery.mo | 8 +++++++- .../ChillerPlant/BaseClasses/DataCenter.mo | 12 +++++++++--- .../GeojsonExportRC/OfficeBuilding/Floor.mo | 4 ---- .../GeojsonExportRC/OfficeBuilding/ICT.mo | 4 ---- .../GeojsonExportRC/OfficeBuilding/Meeting.mo | 4 ---- .../GeojsonExportRC/OfficeBuilding/Office.mo | 4 ---- .../GeojsonExportRC/OfficeBuilding/Restroom.mo | 4 ---- .../GeojsonExportRC/OfficeBuilding/Storage.mo | 4 ---- ...illerPlant_DataCenterContinuousTimeControl.txt | 5 +++-- ...ChillerPlant_DataCenterDiscreteTimeControl.txt | 7 ++++--- ...Examples_ChillerPlant_DataCenterRenewables.txt | 9 +++++---- Buildings/package.mo | 15 ++++++++++++++- 14 files changed, 56 insertions(+), 40 deletions(-) diff --git a/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo b/Buildings/Electrical/AC/OnePhase/Storage/Battery.mo index 4b39c5f3fdc..00fce81f273 100644 --- 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="