Add all-electric plant model to DHC package

Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialETS.mo

@@ -327,7 +327,7 @@ First implementation.
           extent={{20,-288},{300,-272}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={255,0,0},
+          fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
           visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
                or typ == TypDisSys.Cooling),
@@ -372,17 +372,18 @@ First implementation.
           extent={{58,-248},{300,-232}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={0,0,255},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5),
         Rectangle(
-          extent={{-45,-9},{45,9}},
+          extent={{-45,-8},{45,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={0,0,255},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5,
-          origin={67,-187},
+
+          origin={66,-187},
           rotation=90),
         Rectangle(
           extent={{-45,-8},{45,8}},
@@ -391,17 +392,18 @@ First implementation.
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5,
+
           origin={-66,-187},
           rotation=90),
         Rectangle(
-          extent={{-66,-8},{66,8}},
+          extent={{-65,-8},{65,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={255,0,0},
+          fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
           visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
                or typ == TypDisSys.Cooling,
-          origin={28,-208},
+          origin={28,-207},
           rotation=90),
         Rectangle(
           extent={{-302,-288},{-22,-272}},
@@ -441,9 +443,9 @@ First implementation.
           rotation=0),
         Rectangle(
           extent={{-130,-8},{130,8}},
-          lineColor={0,0,255},
+          lineColor={255,0,0},
           pattern=LinePattern.None,
-          fillColor={0,0,255},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           visible=have_heaWat,
           origin={-170,260},
@@ -452,7 +454,7 @@ First implementation.
           extent={{-102,-8},{102,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
           origin={-198,160},
           rotation=0,
@@ -461,7 +463,7 @@ First implementation.
           extent={{-6,-8},{6,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
           origin={-104,146},
           rotation=90,
@@ -470,7 +472,7 @@ First implementation.
           extent={{-130,-8},{130,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           origin={170,260},
           rotation=0,
@@ -479,7 +481,7 @@ First implementation.
           extent={{-56,-9},{56,9}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           origin={49,196},
           rotation=90,
@@ -488,7 +490,7 @@ First implementation.
           extent={{-56,-9},{56,9}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={0,0,255},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           origin={-49,196},
           rotation=90,

Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PIDWithEnable.mo

@@ -26,6 +26,8 @@ block PIDWithEnable
     "Set to true for reverse acting, or false for direct acting control action";
   parameter Real y_reset=yMin
     "Value to which the controller output is reset if the boolean trigger has a rising edge";
+  parameter Real y_neutral=y_reset
+    "Value to which the controller output is reset when the controller is disabled";
   Buildings.Controls.OBC.CDL.Interfaces.RealInput u_s
     "Connector of setpoint input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),iconTransformation(extent={{-140,-20},{-100,20}})));
@@ -54,7 +56,7 @@ block PIDWithEnable
   Buildings.Controls.OBC.CDL.Continuous.Switch swi1
     annotation (Placement(transformation(extent={{72,-10},{92,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant valDis(
-    final k=0)
+    final k=y_neutral)
     "Value when disabled"
     annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
 equation

Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuilding.mo

@@ -287,13 +287,7 @@ First implementation.
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{20,-188},{300,-172}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,0,0},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-300,-172},{-20,-188}},
+          extent={{-300,-172},{300,-188}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
@@ -308,13 +302,7 @@ First implementation.
           textColor={0,0,255},
           textString="%name"),
         Rectangle(
-          extent={{20,-52},{300,-68}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-300,-68},{-20,-52}},
+          extent={{-300,-68},{300,-52}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},

Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo

@@ -514,14 +514,14 @@ equation
           extent={{40,-34},{100,-46}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={0,0,255},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5),
         Rectangle(
           extent={{-100,-34},{-40,-46}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5),
         Rectangle(
@@ -538,7 +538,7 @@ equation
           extent={{-14,-6},{14,6}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
           origin={28,-60},
           rotation=90,
@@ -548,7 +548,7 @@ equation
           extent={{22,-86},{100,-74}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
           visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
                or typ == TypDisSys.Cooling)}),

Buildings/Experimental/DHC/Plants/BaseClasses/PartialPlant.mo

@@ -47,7 +47,7 @@ partial model PartialPlant
  if have_serAmb
     "Fluid connector for ambient water service supply line"
     annotation (
-      Placement(transformation(extent={{-310,30},{-290,50}}),
+      Placement(transformation(extent={{-390,30},{-370,50}}),
         iconTransformation(extent={{-310,30},{-290,50}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_bSerAmb(
     redeclare package Medium = Medium,
@@ -56,69 +56,70 @@ partial model PartialPlant
  if have_serAmb
     "Fluid connector for ambient water service return line"
     annotation (
-      Placement(transformation(extent={{290,30},{310,50}}),
+      Placement(transformation(extent={{370,30},{390,50}}),
         iconTransformation(extent={{290,30},{310,50}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_aSerHea(
     redeclare package Medium = Medium,
     m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
     h_outflow(start=Medium.h_default, nominal=Medium.h_default)) if have_hea
     "Fluid connector for heating service supply line"
     annotation (Placement(
-      transformation(extent={{-310,-10},{-290,10}}),    iconTransformation(
+      transformation(extent={{-390,-10},{-370,10}}),    iconTransformation(
         extent={{-310,-10},{-290,10}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_bSerHea(
     redeclare package Medium = MediumHea_b,
     m_flow(max=if allowFlowReversal then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumHea_b.h_default, nominal=MediumHea_b.h_default)) if have_hea
     "Fluid connector for heating service return line"
     annotation (Placement(
-        transformation(extent={{290,-10},{310,10}}),    iconTransformation(
+        transformation(extent={{370,-10},{390,10}}),    iconTransformation(
           extent={{290,-10},{310,10}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_aSerCoo(
     redeclare package Medium = Medium,
     m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
     h_outflow(start=Medium.h_default, nominal=Medium.h_default))
  if have_coo
     "Fluid connector for cooling service supply line"
-    annotation (Placement(transformation(extent={{-310,-50},{-290,-30}})));
+    annotation (Placement(transformation(extent={{-390,-50},{-370,-30}}),
+        iconTransformation(extent={{-310,-50},{-290,-30}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_bSerCoo(
     redeclare package Medium = Medium,
     m_flow(max=if allowFlowReversal then +Modelica.Constants.inf else 0),
     h_outflow(start=Medium.h_default, nominal=Medium.h_default))
  if have_coo
     "Fluid connector for cooling service return line"
     annotation (Placement(
-      transformation(extent={{290,-50},{310,-30}}),   iconTransformation(
+      transformation(extent={{370,-50},{390,-30}}),   iconTransformation(
         extent={{290,-50},{310,-30}})));
   Buildings.BoundaryConditions.WeatherData.Bus weaBus if have_weaBus
     "Weather data bus"
-    annotation (Placement(transformation(extent={{-16,250},{18,282}}),
-      iconTransformation(extent={{-16,250},{18,282}})));
+    annotation (Placement(transformation(extent={{-20,360},{20,400}}),
+      iconTransformation(extent={{-10,290},{10,310}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput PHea(
     final unit="W") if have_eleHea
     "Power drawn by heating system"
-    annotation (Placement(transformation(extent={{300,260},{340,300}}),
+    annotation (Placement(transformation(extent={{380,260},{420,300}}),
       iconTransformation(extent={{300,240},{380,320}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput PCoo(
     final unit="W") if have_eleCoo
     "Power drawn by cooling system"
-    annotation (Placement(transformation(extent={{300,220},{340,260}}),
+    annotation (Placement(transformation(extent={{380,220},{420,260}}),
       iconTransformation(extent={{300,200},{380,280}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput PFan(
     final unit="W") if have_fan
     "Power drawn by fan motors"
-    annotation (Placement(transformation(extent={{300,180},{340,220}}),
+    annotation (Placement(transformation(extent={{380,180},{420,220}}),
       iconTransformation(extent={{300,160},{380,240}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
     final unit="W") if have_pum
     "Power drawn by pump motors"
-    annotation (Placement(transformation(extent={{300,140},{340,180}}),
+    annotation (Placement(transformation(extent={{380,140},{420,180}}),
       iconTransformation(extent={{300,120},{380,200}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput QFue_flow[nFue](
     each final unit="W") if nFue>0
     "Fuel energy input rate"
     annotation (
-      Placement(transformation(extent={{300,100},{340,140}}),
+      Placement(transformation(extent={{380,100},{420,140}}),
         iconTransformation(extent={{300,80},{380,160}})));
 protected
   final parameter Boolean have_hea=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
@@ -188,14 +189,7 @@ First implementation.
           color={0,0,255},
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-300,-8},{-140,8}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,255},
-          fillPattern=FillPattern.Solid,
-          visible=have_hea),
-        Rectangle(
-          extent={{140,-48},{300,-32}},
+          extent={{-300,-48},{300,-32}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
@@ -216,26 +210,19 @@ First implementation.
           fillPattern=FillPattern.Solid,
           visible=have_serAmb),
         Rectangle(
-          extent={{-140,140},{140,-142}},
-          lineColor={27,0,55},
-          fillColor={170,213,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{140,-8},{300,8}},
+          extent={{-300,-8},{300,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
-          fillColor={238,46,47},
+          fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           visible=have_hea),
         Rectangle(
-          extent={{-300,-48},{-140,-32}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          visible=have_coo)}),
+          extent={{-140,140},{140,-142}},
+          lineColor={27,0,55},
+          fillColor={170,213,255},
+          fillPattern=FillPattern.Solid)}),
     Diagram(
       coordinateSystem(
         preserveAspectRatio=false,
-        extent={{-300,-300},{300,300}})));
+        extent={{-380,-380},{380,380}})));
 end PartialPlant;