Reverted examples folder to last verified commit

Buildings/Examples/VAVReheat/BaseClasses/Controls/RoomVAV.mo

@@ -154,17 +154,17 @@ block RoomVAV "Controller for room VAV box"
     Ni=10) if not have_preIndDam
            "Damper position setpoint"
     annotation (Placement(transformation(extent={{80,10},{100,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor if
-       not have_preIndDam
+  Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor
+    if not have_preIndDam
     "Normalized discharge volume flow rate"
     annotation (Placement(transformation(extent={{10,-150},{30,-130}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant norFlo(
     final k=V_flow_nominal) if not have_preIndDam
     "Norminal airflow rate"
     annotation (Placement(transformation(extent={{-80,-170},{-60,-150}})));
   Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai(
-    final k=1) if
-       have_preIndDam "Dummy block to enable or disable connection"
+    final k=1)
+    if have_preIndDam "Dummy block to enable or disable connection"
     annotation (Placement(transformation(extent={{80,50},{100,70}})));
 
 protected

Buildings/Examples/VAVReheat/BaseClasses/Controls/SupplyAirTemperature.mo

@@ -103,26 +103,16 @@ block SupplyAirTemperature
     k=limSupOA.k)
     "Inferior limit of the control signal for cooling coil control "
     annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
-  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset con1(
-    final controllerType=controllerType,
-    final k=0.05,
-    final Ti=5000,
-    final Td=Td,
-    final yMax=1,
-    final yMin=if have_heating then -1 else 0,
-    y_reset=if have_heating then limSupHea.k else limInfOA.k,
-    u_s(final unit="K", displayUnit="degC"),
-    u_m(final unit="K", displayUnit="degC"))
-    "Supply temperature controller"
-    annotation (Placement(transformation(extent={{-80,14},{-60,34}})));
 equation
   connect(TSup, con.u_s) annotation (Line(points={{-160,0},{-112,0}},
                color={0,0,127}));
   connect(TSupSet, con.u_m) annotation (Line(points={{-160,-40},{-100,-40},{-100,
           -12}},                color={0,0,127}));
+  connect(con.y, mapOA.u)
+    annotation (Line(points={{-89,0},{8,0}}, color={0,0,127}));
   connect(con.y, mapCoo.u)
-    annotation (Line(points={{-88,0},{0,0},{0,-80},{8,-80}}, color={0,0,127}));
-  connect(con.y, mapHea.u) annotation (Line(points={{-88,0},{0,0},{0,80},{8,80}},
+    annotation (Line(points={{-89,0},{0,0},{0,-80},{8,-80}}, color={0,0,127}));
+  connect(con.y, mapHea.u) annotation (Line(points={{-89,0},{0,0},{0,80},{8,80}},
                  color={0,0,127}));
   connect(limInfHea.y, mapHea.x1) annotation (Line(points={{-28,120},{0,120},{0,
           88},{8,88}},    color={0,0,127}));
@@ -176,14 +166,6 @@ equation
           -4,-72},{8,-72}}, color={0,0,127}));
   connect(uEna, con.trigger) annotation (Line(points={{-160,-100},{-106,-100},{-106,
           -12}}, color={255,0,255}));
-  connect(con1.y, mapOA.u)
-    annotation (Line(points={{-58,24},{2,24},{2,0},{8,0}}, color={0,0,127}));
-  connect(con1.u_s, TSup) annotation (Line(points={{-82,24},{-130,24},{-130,0},
-          {-160,0}}, color={0,0,127}));
-  connect(con1.u_m, TSupSet)
-    annotation (Line(points={{-70,12},{-70,-40},{-160,-40}}, color={0,0,127}));
-  connect(con1.trigger, uEna) annotation (Line(points={{-76,12},{-76,-46},{-106,
-          -46},{-106,-100},{-160,-100}}, color={255,0,255}));
   annotation (
   defaultComponentName="conTSup",
   Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(

Buildings/Examples/VAVReheat/BaseClasses/Controls/package.order

@@ -12,5 +12,4 @@ State
 SupplyAirTemperature
 SupplyAirTemperatureSetpoint
 SystemHysteresis
-opeMod_ASHRAE2006toG36
 Examples

Buildings/Examples/VAVReheat/BaseClasses/HVACBuilding.mo

@@ -133,28 +133,28 @@ equation
           96,61.6667},{96,92},{-60,92},{-60,16.4444},{-48.75,16.4444}},
                                                             color={0,0,127}));
   connect(hvac.port_supAir[1], flo.portsSou[1]) annotation (Line(points={{42.275,
-          19.2222},{46.3261,19.2222},{46.3261,49.3333}}, color={0,127,255}));
+          19.2222},{45.5652,19.2222},{45.5652,49.3333}}, color={0,127,255}));
   connect(hvac.port_supAir[2], flo.portsEas[1]) annotation (Line(points={{42.275,
-          19.2222},{81.0217,19.2222},{81.0217,62.6667}}, color={0,127,255}));
+          19.2222},{80.2609,19.2222},{80.2609,62.6667}}, color={0,127,255}));
   connect(hvac.port_supAir[3], flo.portsNor[1]) annotation (Line(points={{42.275,
-          19.2222},{56,19.2222},{56,74},{46.3261,74}},           color={0,127,255}));
+          19.2222},{56,19.2222},{56,74},{45.5652,74}},           color={0,127,255}));
   connect(hvac.port_supAir[4], flo.portsWes[1]) annotation (Line(points={{42.275,
-          19.2222},{56,19.2222},{56,36},{27.4565,36},{27.4565,62.6667}}, color={
+          19.2222},{56,19.2222},{56,36},{26.6957,36},{26.6957,62.6667}}, color={
           0,127,255}));
   connect(hvac.port_supAir[5], flo.portsCor[1]) annotation (Line(points={{42.275,
-          19.2222},{56,19.2222},{56,62.6667},{46.3261,62.6667}}, color={0,127,255}));
+          19.2222},{56,19.2222},{56,62.6667},{45.5652,62.6667}}, color={0,127,255}));
   connect(hvac.port_retAir[1], flo.portsSou[2]) annotation (Line(points={{42.275,
-          -4.38889},{47.8478,-4.38889},{47.8478,49.3333}}, color={0,127,255}));
+          -4.38889},{48.6087,-4.38889},{48.6087,49.3333}}, color={0,127,255}));
   connect(hvac.port_retAir[2], flo.portsEas[2]) annotation (Line(points={{42.275,
-          -4.38889},{82.5435,-4.38889},{82.5435,62.6667}}, color={0,127,255}));
+          -4.38889},{83.3043,-4.38889},{83.3043,62.6667}}, color={0,127,255}));
   connect(hvac.port_retAir[3], flo.portsNor[2]) annotation (Line(points={{42.275,
-          -4.38889},{58,-4.38889},{58,74},{47.8478,74}},           color={0,127,
+          -4.38889},{58,-4.38889},{58,74},{48.6087,74}},           color={0,127,
           255}));
   connect(hvac.port_retAir[4], flo.portsWes[2]) annotation (Line(points={{42.275,
-          -4.38889},{60,-4.38889},{60,34},{28.9783,34},{28.9783,62.6667}},
+          -4.38889},{60,-4.38889},{60,34},{29.7391,34},{29.7391,62.6667}},
         color={0,127,255}));
   connect(hvac.port_retAir[5], flo.portsCor[2]) annotation (Line(points={{42.275,
-          -4.38889},{60,-4.38889},{60,58},{47.8478,58},{47.8478,62.6667}},
+          -4.38889},{60,-4.38889},{60,58},{48.6087,58},{48.6087,62.6667}},
         color={0,127,255}));
   connect(weaDat.weaBus, flo.weaBus) annotation (Line(
       points={{-70,10},{-66,10},{-66,90},{64.1304,90}},

Buildings/Examples/VAVReheat/Validation/BaseClasses/Floor.mo

@@ -1,4 +1,4 @@
-within Buildings.Examples.VAVReheat.Validation.BaseClasses;
+within Buildings.Examples.VAVReheat.Validation.BaseClasses;
 model Floor
   "Extends Buildings.Examples.VAVReheat.BaseClasses.Floor with CO2 generation from people and CO2 from outside air."
   extends Buildings.Examples.VAVReheat.BaseClasses.Floor(