Merge pull request #2299 from lbl-srg/issue2293_chiller_plant_seq

Chiller plant sequences

Author: mwetter

.travis.yml

@@ -46,9 +46,12 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Air,Examples}\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Controls\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Controls\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Controls\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Controls.{Continuous,DemandResponse,Discrete,Predictors,SetPoints,Sources}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Controls.{Continuous,DemandResponse,Discrete,Predictors,SetPoints,Sources}\" SINGLEPROC=\"true\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Controls.{Continuous,DemandResponse,Discrete,Predictors,SetPoints,Sources}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Controls.OBC\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Controls.OBC\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Controls.OBC\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""

Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo

@@ -177,18 +177,15 @@ partial model PartialDataCenter
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},
         rotation=90,
         origin={-50,-150})));
-  Buildings.Examples.ChillerPlant.BaseClasses.SimplifiedRoom roo(
+  Buildings.Examples.ChillerPlant.DataCenter.BaseClasses.SimplifiedRoom roo(
     redeclare replaceable package Medium = MediumA,
     rooLen=50,
     rooWid=30,
     rooHei=3,
     m_flow_nominal=mAir_flow_nominal,
     QRoo_flow=500000,
-    nPorts=2)
-    "Room model"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        origin={4,-180})));
+    nPorts=2) "Room model" annotation (Placement(transformation(extent={{10,-10},
+            {-10,10}}, origin={4,-180})));
   Buildings.Fluid.Actuators.Valves.TwoWayLinear val[numChi](
     redeclare each package Medium = MediumW,
     each m_flow_nominal=m1_flow_chi_nominal,

Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo

@@ -39,7 +39,7 @@ model DXCooledAirsideEconomizer
   parameter Real minSpeFan = 0.2
     "Minimum fan speed ratio required by variable speed fans";
 
-  Buildings.Examples.ChillerPlant.BaseClasses.SimplifiedRoom roo(
+  Buildings.Examples.ChillerPlant.DataCenter.BaseClasses.SimplifiedRoom roo(
     redeclare package Medium = Medium,
     rooLen=50,
     rooHei=3,