From 15d1158cfcf44f24f25fedf023ab6ee95cf4b911 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Fri, 17 Nov 2017 09:13:13 -0800 Subject: [PATCH 1/4] Cleaned up code --- .../Equipment/Validation/PumpParallel.mo | 3 -- .../Equipment/Validation/package.mo | 22 ++++++++---- Buildings/Controls/OBC/CDL/Types/Day.mo | 7 ++-- .../Controls/OBC/CDL/Types/Extrapolation.mo | 31 ++++++++++++++-- Buildings/Controls/OBC/CDL/Types/Init.mo | 29 +++++++-------- Buildings/Controls/OBC/CDL/Types/Reset.mo | 18 +++++----- .../OBC/CDL/Types/SimpleController.mo | 35 ++++++++++++++++++- .../Controls/OBC/CDL/Types/Smoothness.mo | 22 +++++++++++- .../Controls/Examples/RoomMixingBox.mo | 1 - .../DualFanDualDuct/Controls/RoomMixingBox.mo | 1 - .../ThermalZones/SupplyBranch.mo | 1 - .../BuildingVAV/Examples/OneFloor_OneZone.mo | 2 +- .../BuildingVAV/Examples/TwoFloor_TwoZone.mo | 2 +- .../ThermalZones/Validation/MultiZone.mo | 2 +- .../ThermalZones/Validation/ThermalZone.mo | 2 +- Buildings/Examples/VAVReheat/ASHRAE2006.mo | 6 ++-- .../ScrollWaterToWater_OneRoomRadiator.mo | 4 +-- .../HeatTransfer/Conduction/SingleLayer.mo | 3 -- 18 files changed, 133 insertions(+), 58 deletions(-) diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo index 1a453d667ea..5a09764a965 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo @@ -108,9 +108,6 @@ equation connect(dp4.port_b, sin.ports[1]) annotation (Line(points={{40,-40},{76,-40},{76,42},{82,42}}, color={0,127,255})); - - for i in 1:numPum loop - end for; connect(y.y, pumPar2.u) annotation (Line(points={{-71,80},{-28,80},{-28,-36}, {-20,-36}}, color={0,0,127})); connect(dp2.port_b, sin.ports[2]) diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/package.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/package.mo index 207f2ee452f..a6d74fb12d1 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/package.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/package.mo @@ -2,12 +2,20 @@ within Buildings.Applications.DataCenters.ChillerCooled.Equipment; package Validation "Collection of models that validate the Buildings.Applications.DataCenters.ChillerCooled package" extends Modelica.Icons.ExamplesPackage; - - - - - - - +annotation (preferredView="info", Documentation(info=" +

+This package contains validation models for the classes in + +Buildings.Applications.DataCenters.ChillerCooled.Equipment. +

+

+Note that most validation models contain simple input data +which may not be realistic, but for which the correct +output can be obtained through an analytic solution. +The examples plot various outputs, which have been verified against these +solutions. These model outputs are stored as reference data and +used for continuous validation whenever models in the library change. +

+")); end Validation; diff --git a/Buildings/Controls/OBC/CDL/Types/Day.mo b/Buildings/Controls/OBC/CDL/Types/Day.mo index 29a94b12158..87a4c0abb2d 100644 --- a/Buildings/Controls/OBC/CDL/Types/Day.mo +++ b/Buildings/Controls/OBC/CDL/Types/Day.mo @@ -3,10 +3,10 @@ type Day = enumeration( WorkingDay "Working day, such as Monday through Friday", NonWorkingDay "Non-working day, such as week-ends, but not holidays", Holiday "Holiday") "Enumeration for the day types" annotation ( - Documentation(info = " + Documentation(info="

Enumeration for the type of days. -The possible values are +The possible values are:

  1. @@ -19,8 +19,7 @@ NonWorkingDay Holiday
-", - revisions=" +", revisions="