From f2ffb5fe0f750882ae3254541e55440f32053f04 Mon Sep 17 00:00:00 2001 From: David Blum Date: Wed, 6 Sep 2023 07:44:59 -0700 Subject: [PATCH] Delete old models --- .../BaseClasses/PartialBuildingWFloDis.mo | 490 ------------------ .../DHC/Loads/BaseClasses/package.order | 1 - .../Loads/DHW/BaseClasses/DELETE/package.mo | 4 - .../DHC/Loads/DHW/BaseClasses/package.order | 1 - 4 files changed, 496 deletions(-) delete mode 100644 Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWFloDis.mo delete mode 100644 Buildings/Experimental/DHC/Loads/DHW/BaseClasses/DELETE/package.mo diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWFloDis.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWFloDis.mo deleted file mode 100644 index e70455e7bd7..00000000000 --- a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWFloDis.mo +++ /dev/null @@ -1,490 +0,0 @@ -within Buildings.Experimental.DHC.Loads.BaseClasses; -partial model PartialBuildingWFloDis - "Partial class for building model with flow distribution" - replaceable package Medium=Buildings.Media.Water - constrainedby Modelica.Media.Interfaces.PartialMedium - "Medium in the building distribution system"; - parameter Integer nPorts_aHeaWat=0 - "Number of heating water inlet ports" - annotation (Evaluate=true,Dialog(connectorSizing=true)); - parameter Integer nPorts_bHeaWat=0 - "Number of heating water outlet ports" - annotation (Evaluate=true,Dialog(connectorSizing=true)); - parameter Integer nPorts_aChiWat=0 - "Number of chilled water inlet ports" - annotation (Evaluate=true,Dialog(connectorSizing=true)); - parameter Integer nPorts_bChiWat=0 - "Number of chilled water outlet ports" - annotation (Evaluate=true,Dialog(connectorSizing=true)); - parameter Boolean have_heaWat=false - "Set to true if the building has heating water system" - annotation (Evaluate=true, Dialog(group="Configuration")); - parameter Boolean have_chiWat=false - "Set to true if the building has chilled water system" - annotation (Evaluate=true, Dialog(group="Configuration")); - parameter Boolean have_eleHea=false - "Set to true if the building has decentralized electric heating system" - annotation (Evaluate=true, Dialog(group="Configuration")); - parameter Boolean have_eleCoo=false - "Set to true if the building has decentralized electric cooling system" - annotation (Evaluate=true, Dialog(group="Configuration")); - parameter Boolean have_fan=false - "Set to true if fan power is computed" - annotation (Evaluate=true, Dialog(group="Configuration")); - parameter Boolean have_pum=false - "Set to true if pump power is computed" - annotation (Evaluate=true, Dialog(group="Configuration")); - parameter Boolean have_weaBus=false - "Set to true to use a weather bus" - annotation (Evaluate=true, Dialog(group="Configuration")); - parameter Real facMul(min=Modelica.Constants.eps)=1 - "Multiplier factor" - annotation (Evaluate=true, Dialog(group="Scaling")); - parameter Modelica.Units.SI.Temperature TSetHw "Temperature setpoint of hot water supply from heater"; - parameter Modelica.Units.SI.Temperature TDHw "Temperature setpoint of hot water supply from district"; - parameter Modelica.Units.SI.Temperature TSetTw "Temperature setpoint of tempered water supply at fixture"; - parameter Modelica.Units.SI.Temperature TDcw "Temperature setpoint of domestic cold water supply"; - parameter Modelica.Units.SI.MassFlowRate mHw_flow_nominal "Nominal mass flow rate of hot water supply"; - parameter Modelica.Units.SI.MassFlowRate mDH_flow_nominal "Nominal mass flow rate of district heating water"; - parameter Modelica.Units.SI.MassFlowRate mDhw_flow_nominal "Nominal mass flow rate of tempered water"; - parameter Modelica.Units.SI.PressureDifference dpValve_nominal(min=0, displayUnit="Pa") "Pressure difference"; - parameter Real k(min=0) "Gain of controller"; - parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small) "Time constant of Integrator block" annotation (Dialog(enable= - controllerType == Modelica.Blocks.Types.SimpleController.PI or - controllerType == Modelica.Blocks.Types.SimpleController.PID)); - parameter Boolean haveER = true "Flag that specifies whether electric resistance booster is present"; - parameter Boolean allowFlowReversal=false - "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)" - annotation (Dialog(tab="Assumptions"),Evaluate=true); - final parameter Boolean have_heaLoa=have_heaWat or have_eleHea - "Set to true if the building has heating loads" - annotation (Evaluate=true, Dialog(group="Configuration")); - final parameter Boolean have_cooLoa=have_chiWat or have_eleCoo - "Set to true if the building has cooling loads" - annotation (Evaluate=true, Dialog(group="Configuration")); - // IO CONNECTORS - Buildings.BoundaryConditions.WeatherData.Bus weaBus if have_weaBus - "Weather data bus" - annotation (Placement(transformation(extent={{-16,284},{18,316}}), - iconTransformation(extent={{-16,198},{18,230}}))); - Modelica.Fluid.Interfaces.FluidPorts_a ports_aHeaWat[nPorts_aHeaWat]( - redeclare each package Medium=Medium, - each m_flow( - min= - if allowFlowReversal then - -Modelica.Constants.inf - else - 0), - each h_outflow( - start=Medium.h_default, - nominal=Medium.h_default)) if have_heaWat - "Heating water inlet ports" - annotation (Placement(transformation(extent={{-310,-100},{-290,-20}}), - iconTransformation(extent={{-310,-100},{-290,-20}}))); - Modelica.Fluid.Interfaces.FluidPorts_b ports_bHeaWat[nPorts_bHeaWat]( - redeclare each package Medium=Medium, - each m_flow( - max= - if allowFlowReversal then - +Modelica.Constants.inf - else - 0), - each h_outflow( - start=Medium.h_default, - nominal=Medium.h_default)) if have_heaWat - "Heating water outlet ports" - annotation (Placement(transformation(extent={{290,-100},{310,-20}}), - iconTransformation(extent={{290,-100},{310,-20}}))); - Modelica.Fluid.Interfaces.FluidPorts_a ports_aChiWat[nPorts_aChiWat]( - redeclare each package Medium=Medium, - each m_flow( - min= - if allowFlowReversal then - -Modelica.Constants.inf - else - 0), - each h_outflow( - start=Medium.h_default, - nominal=Medium.h_default)) if have_chiWat - "Chilled water inlet ports" - annotation (Placement(transformation(extent={{-310,-300},{-290,-220}}), - iconTransformation(extent={{-310,-220},{-290,-140}}))); - Modelica.Fluid.Interfaces.FluidPorts_b ports_bChiWat[nPorts_bChiWat]( - redeclare each package Medium=Medium, - each m_flow( - max= - if allowFlowReversal then - +Modelica.Constants.inf - else - 0), - each h_outflow( - start=Medium.h_default, - nominal=Medium.h_default)) if have_chiWat - "Chilled water outlet ports" - annotation (Placement(transformation(extent={{290,-300},{310,-220}}), - iconTransformation(extent={{290,-220},{310,-140}}))); - Modelica.Blocks.Interfaces.RealOutput QHea_flow( - final unit="W") if have_heaLoa - "Total heating heat flow rate transferred to the loads (>=0)" - annotation (Placement(transformation(extent={{300,260},{340,300}}), - iconTransformation(extent={{300,240},{340,280}}))); - Modelica.Blocks.Interfaces.RealOutput QCoo_flow( - final unit="W") if have_cooLoa - "Total cooling heat flow rate transferred to the loads (<=0)" - annotation (Placement(transformation(extent={{300,220},{340,260}}), - iconTransformation(extent={{300,200},{340,240}}))); - Modelica.Blocks.Interfaces.RealOutput PHea( - final unit="W") if have_eleHea - "Power drawn by decentralized heating system" - annotation (Placement(transformation(extent={{300,180},{340,220}}), - iconTransformation(extent={{300,160},{340,200}}))); - Modelica.Blocks.Interfaces.RealOutput PCoo( - final unit="W") if have_eleCoo - "Power drawn by decentralized cooling system" - annotation (Placement(transformation(extent={{300,140},{340,180}}), - iconTransformation(extent={{300,120},{340,160}}))); - Modelica.Blocks.Interfaces.RealOutput PFan( - final quantity="Power", - final unit="W") if have_fan - "Power drawn by fan motors" - annotation (Placement(transformation(extent={{300,100},{340,140}}), - iconTransformation(extent={{300,80},{340,120}}))); - Modelica.Blocks.Interfaces.RealOutput PPum( - final quantity="Power", - final unit="W") if have_pum - "Power drawn by pump motors" - annotation (Placement(transformation(extent={{300,60},{340,100}}), - iconTransformation(extent={{300,40},{340,80}}))); - Fluid.BaseClasses.MassFlowRateMultiplier mulHeaWatInl[nPorts_aHeaWat]( - redeclare each final package Medium = Medium, - each final k=1/facMul, - each final allowFlowReversal=allowFlowReversal) if have_heaWat - "Mass flow rate multiplier" - annotation (Placement(transformation(extent={{-280,-70},{-260,-50}}))); - Fluid.BaseClasses.MassFlowRateMultiplier mulChiWatInl[nPorts_aChiWat]( - redeclare each final package Medium = Medium, - each final k=1/facMul, - each final allowFlowReversal=allowFlowReversal) if have_chiWat - "Mass flow rate multiplier" - annotation (Placement(transformation(extent={{-280,-270},{-260,-250}}))); - Fluid.BaseClasses.MassFlowRateMultiplier mulHeaWatOut[nPorts_bHeaWat]( - redeclare each final package Medium = Medium, - each final k=facMul, - each final allowFlowReversal=allowFlowReversal) if have_heaWat - "Mass flow rate multiplier" - annotation (Placement(transformation(extent={{260,-70},{280,-50}}))); - Fluid.BaseClasses.MassFlowRateMultiplier mulChiWatOut[nPorts_bChiWat]( - redeclare each final package Medium = Medium, - each final k=facMul, - each final allowFlowReversal=allowFlowReversal) if have_chiWat - "Mass flow rate multiplier" - annotation (Placement(transformation(extent={{260,-270},{280,-250}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter mulQHea_flow(u( - final unit="W"), final k=facMul) if have_heaLoa "Scaling" - annotation (Placement(transformation(extent={{270,270},{290,290}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter mulQCoo_flow(u( - final unit="W"), final k=facMul) if have_cooLoa "Scaling" - annotation (Placement(transformation(extent={{270,230},{290,250}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter mulPHea(u(final - unit="W"), final k=facMul) if have_eleHea "Scaling" - annotation (Placement(transformation(extent={{270,190},{290,210}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter mulPCoo(u(final - unit="W"), final k=facMul) if have_eleCoo "Scaling" - annotation (Placement(transformation(extent={{270,150},{290,170}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter mulPFan(u(final - unit="W"), final k=facMul) if have_fan "Scaling" - annotation (Placement(transformation(extent={{270,110},{290,130}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter mulPPum(u(final - unit="W"), final k=facMul) if have_pum "Scaling" - annotation (Placement(transformation(extent={{270,70},{290,90}}))); - FlowDistribution disFloHea( - redeclare final package Medium = Medium, - final allowFlowReversal=allowFlowReversal, - m_flow_nominal=mHeaWat_flow_nominal, - have_pum=true, - typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead, - dp_nominal=100000, - nPorts_a1=1, - nPorts_b1=1) if have_heaWat - "Heating water distribution system" - annotation (Placement(transformation(extent={{120,-70},{140,-50}}))); - - FlowDistribution disFloCoo( - redeclare final package Medium = Medium, - final allowFlowReversal=allowFlowReversal, - m_flow_nominal=mChiWat_flow_nominal, - typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater, - have_pum=true, - typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead, - dp_nominal=100000, - nPorts_b1=1, - nPorts_a1=1) if have_chiWat - "Chilled water distribution system" - annotation (Placement(transformation(extent={{120,-270},{140,-250}}))); - - Fluid.FixedResistances.Junction spl( - redeclare package Medium = Medium, - m_flow_nominal=mHw_flow_nominal*{1,-1,-1}, - dp_nominal=0*{1,1,1}) - annotation (Placement(transformation(extent={{-220,-70},{-200,-50}}))); - Fluid.FixedResistances.Junction mix( - redeclare package Medium = Medium, - m_flow_nominal=mHw_flow_nominal*{1,-1,1}, - dp_nominal=0*{1,1,1}) - annotation (Placement(transformation(extent={{200,-70},{220,-50}}))); - DHW.BaseClasses.DELETE.DirectHeatExchangerWaterHeaterWithAuxHeatOLD genDHW( - TSetHw=TSetHw, - mHw_flow_nominal=mHw_flow_nominal, - mDH_flow_nominal=mDH_flow_nominal, - haveER=true) - annotation (Placement(transformation(extent={{-106,-120},{-86,-100}}))); - Fluid.Sources.Boundary_pT souDcw( - redeclare package Medium = Medium, - T(displayUnit="degC") = TDcw, - nPorts=2) "Source of domestic cold water" - annotation (Placement(transformation(extent={{-170,-128},{-150,-108}}))); - DHW.BaseClasses.DomesticWaterMixer tmv( - redeclare package Medium = Medium, - TSet(displayUnit="degC") = TSetTw, - mDhw_flow_nominal=mDhw_flow_nominal, - dpValve_nominal=dpValve_nominal, - k=k, - Ti=Ti) "Ideal thermostatic mixing valve" - annotation (Placement(transformation(extent={{-40,-130},{-20,-110}}))); - Modelica.Blocks.Interfaces.RealOutput PDhw(final unit="W") - if have_eleHea - "Power drawn by decentralized water heating system" annotation (Placement( - transformation(extent={{300,20},{340,60}}), iconTransformation(extent={{ - 300,160},{340,200}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter mulPDhw(u(final - unit="W"), final k=facMul) if have_eleHea "Scaling" - annotation (Placement(transformation(extent={{272,30},{292,50}}))); - Fluid.Sources.MassFlowSource_T sinDhw( - redeclare package Medium = Medium, - use_m_flow_in=true, - nPorts=1) "Sink for domestic hot water supply" - annotation (Placement(transformation(extent={{40,-130},{20,-110}}))); - Modelica.Blocks.Continuous.Integrator watCon(k=-1) - "Integrated hot water consumption" - annotation (Placement(transformation(extent={{120,-170},{140,-150}}))); - Modelica.Blocks.Math.Gain gaiDhw(k=-0.3234) - "Gain for multiplying domestic hot water schedule" - annotation (Placement(transformation(extent={{132,-126},{120,-114}}))); - Modelica.Blocks.Sources.Sine sine(f=0.001, offset=1) - annotation (Placement(transformation(extent={{180,-130},{160,-110}}))); - Modelica.Blocks.Interfaces.RealOutput TTw(final unit="K", displayUnit="degC") "Temperature of the outlet tempered water" - annotation (Placement(transformation(extent={{300,-120},{340,-80}}))); - Modelica.Blocks.Interfaces.RealOutput mDhw(displayUnit="kg") "Total hot water consumption" - annotation (Placement(transformation(extent={{300,-180},{340,-140}}), - iconTransformation(extent={{378,-162},{418,-122}}))); -protected - final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= - Medium.specificHeatCapacityCp(Medium.setState_pTX( - p=Medium.p_default, - T=Medium.T_default, - X=Medium.X_default)) - "Specific heat capacity of medium at default medium state"; -initial equation - assert( - nPorts_aHeaWat == nPorts_bHeaWat, - "In "+getInstanceName()+": The numbers of heating water inlet ports ("+String( - nPorts_aHeaWat)+") and outlet ports ("+String( - nPorts_bHeaWat)+") must be equal."); - assert( - nPorts_aChiWat == nPorts_bChiWat, - "In "+getInstanceName()+": The numbers of chilled water inlet ports ("+String( - nPorts_aChiWat)+") and outlet ports ("+String( - nPorts_bChiWat)+") must be equal."); -equation - connect(mulQHea_flow.y, QHea_flow) - annotation (Line(points={{292,280},{320,280}}, color={0,0,127})); - connect(mulQCoo_flow.y, QCoo_flow) - annotation (Line(points={{292,240},{320,240}}, color={0,0,127})); - connect(mulPHea.y, PHea) - annotation (Line(points={{292,200},{320,200}}, color={0,0,127})); - connect(mulPCoo.y, PCoo) - annotation (Line(points={{292,160},{320,160}}, color={0,0,127})); - connect(mulPFan.y, PFan) - annotation (Line(points={{292,120},{320,120}}, color={0,0,127})); - connect(mulPPum.y, PPum) - annotation (Line(points={{292,80},{320,80}}, color={0,0,127})); - connect(ports_aChiWat,mulChiWatInl. port_a) - annotation (Line(points={{-300,-260},{-280,-260}}, color={0,127,255})); - connect(ports_aHeaWat,mulHeaWatInl. port_a) - annotation (Line(points={{-300,-60},{-280,-60}}, color={0,127,255})); - connect(mulHeaWatOut.port_b, ports_bHeaWat) - annotation (Line(points={{280,-60},{300,-60}}, color={0,127,255})); - connect(mulChiWatOut.port_b, ports_bChiWat) - annotation (Line(points={{280,-260},{300,-260}}, color={0,127,255})); - connect(mulChiWatOut[1].port_a, disFloCoo.port_b) - annotation (Line(points={{260,-260},{140,-260}}, color={0,127,255})); - connect(mulChiWatInl[1].port_b, disFloCoo.port_a) - annotation (Line(points={{-260,-260},{120,-260}}, color={0,127,255})); - connect(mulHeaWatInl[1].port_b, spl.port_1) - annotation (Line(points={{-260,-60},{-220,-60}}, color={0,127,255})); - connect(mix.port_2, mulHeaWatOut[1].port_a) - annotation (Line(points={{220,-60},{260,-60}}, color={0,127,255})); - connect(disFloHea.port_b, mix.port_1) - annotation (Line(points={{140,-60},{200,-60}}, color={0,127,255})); - connect(disFloHea.port_a, spl.port_2) - annotation (Line(points={{120,-60},{-200,-60}}, color={0,127,255})); - connect(genDHW.port_dhr, mix.port_3) annotation (Line(points={{-104,-100},{-120, - -100},{-120,-140},{210,-140},{210,-70}}, color={0,127,255})); - connect(spl.port_3, genDHW.port_dhs) annotation (Line(points={{-210,-70},{-210, - -80},{-100,-80},{-100,-100}}, color={0,127,255})); - connect(souDcw.ports[1], genDHW.port_cw) annotation (Line(points={{-150,-116}, - {-140,-116},{-140,-110},{-106,-110}}, color={0,127,255})); - connect(tmv.port_cw, souDcw.ports[2]) annotation (Line(points={{-40,-126},{-140, - -126},{-140,-120},{-150,-120}}, color={0,127,255})); - connect(genDHW.port_hw, tmv.port_hw) annotation (Line(points={{-86,-110},{-60, - -110},{-60,-114},{-40,-114}}, color={0,127,255})); - connect(genDHW.PEle, mulPDhw.u) annotation (Line(points={{-85.4,-106},{-60,-106}, - {-60,40},{270,40}}, color={0,0,127})); - connect(mulPDhw.y, PDhw) - annotation (Line(points={{294,40},{320,40}}, color={0,0,127})); - connect(PDhw, PDhw) - annotation (Line(points={{320,40},{320,40}}, color={0,0,127})); - connect(tmv.port_tw, sinDhw.ports[1]) - annotation (Line(points={{-20,-120},{20,-120}}, color={0,127,255})); - connect(gaiDhw.u, sine.y) - annotation (Line(points={{133.2,-120},{159,-120}}, color={0,0,127})); - connect(gaiDhw.y, sinDhw.m_flow_in) annotation (Line(points={{119.4,-120},{80, - -120},{80,-112},{42,-112}}, color={0,0,127})); - connect(sinDhw.m_flow_in, watCon.u) annotation (Line(points={{42,-112},{80,-112}, - {80,-160},{118,-160}}, color={0,0,127})); - connect(watCon.y, mDhw) - annotation (Line(points={{141,-160},{320,-160}}, color={0,0,127})); - connect(tmv.TTw, TTw) annotation (Line(points={{-19,-112},{0,-112},{0,-100},{320, - -100}}, color={0,0,127})); - annotation ( - Documentation( - info=" -

-Partial model to be used for modeling the thermal loads on an energy -transfer station or a dedicated plant. -Models extending this class are typically used in conjunction with - -Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution -and models extending - -Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit -as described in the schematics here under. -The fluid ports represent the connection between the production system and -the building distribution system. -

-

Scaling

-

-Scaling is implemented by means of a multiplier factor facMul. -Each extensive quantity (mass and heat flow rate, electric power) -flowing out through fluid ports, or connected to an -output connector is multiplied by facMul. -Each extensive quantity (mass and heat flow rate, electric power) -flowing in through fluid ports, or connected to an -input connector is multiplied by 1/facMul. -This allows modeling, with a single instance, -multiple identical buildings served by the same energy transfer station. -

-

Examples

-

-See various use cases in - -Buildings.Experimental.DHC.Loads.BaseClasses.Examples. -

-

-
-\"image\" -

-", -revisions=" - -"), - Icon( - coordinateSystem( - extent={{-300,-300},{300,300}}, - preserveAspectRatio=false), - graphics={ - Rectangle( - extent={{-300,-300},{300,300}}, - lineColor={0,0,127}, - 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}}, - lineColor={0,0,255}, - pattern=LinePattern.None, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{18,-38},{46,-10}}, - lineColor={255,255,255}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Text( - extent={{-150,-328},{150,-368}}, - 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}}, - lineColor={0,0,255}, - pattern=LinePattern.None, - fillColor={255,0,0}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-180,180},{174,-220}}, - lineColor={150,150,150}, - fillPattern=FillPattern.Sphere, - fillColor={255,255,255}), - Rectangle( - extent={{36,42},{108,114}}, - lineColor={255,255,255}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-124,42},{-52,114}}, - lineColor={255,255,255}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-126,-122},{-54,-50}}, - lineColor={255,255,255}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{40,-122},{112,-50}}, - lineColor={255,255,255}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Polygon( - points={{0,264},{-218,164},{220,164},{0,264}}, - lineColor={95,95,95}, - smooth=Smooth.None, - fillPattern=FillPattern.Solid, - fillColor={95,95,95})}), - Diagram( - coordinateSystem( - preserveAspectRatio=false, - extent={{-300,-300},{300,300}}))); -end PartialBuildingWFloDis; diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/package.order b/Buildings/Experimental/DHC/Loads/BaseClasses/package.order index c8884970fe6..52d611fc112 100644 --- a/Buildings/Experimental/DHC/Loads/BaseClasses/package.order +++ b/Buildings/Experimental/DHC/Loads/BaseClasses/package.order @@ -1,7 +1,6 @@ ConstraintViolation FlowDistribution PartialBuilding -PartialBuildingWFloDis PartialBuildingWithPartialETS PartialTerminalUnit SimpleRoomODE diff --git a/Buildings/Experimental/DHC/Loads/DHW/BaseClasses/DELETE/package.mo b/Buildings/Experimental/DHC/Loads/DHW/BaseClasses/DELETE/package.mo deleted file mode 100644 index 1cc1c8b6ec7..00000000000 --- a/Buildings/Experimental/DHC/Loads/DHW/BaseClasses/DELETE/package.mo +++ /dev/null @@ -1,4 +0,0 @@ -within Buildings.Experimental.DHC.Loads.DHW.BaseClasses; -package DELETE "These models are outdated" - -end DELETE; diff --git a/Buildings/Experimental/DHC/Loads/DHW/BaseClasses/package.order b/Buildings/Experimental/DHC/Loads/DHW/BaseClasses/package.order index eb2a1333c46..ce75a1a8901 100644 --- a/Buildings/Experimental/DHC/Loads/DHW/BaseClasses/package.order +++ b/Buildings/Experimental/DHC/Loads/DHW/BaseClasses/package.order @@ -1,2 +1 @@ PartialFourPortDHW -DELETE