diff --git a/Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupPolynomial.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupPolynomial.mos similarity index 80% rename from Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupPolynomial.mos rename to Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupPolynomial.mos index b8003cd7303..9cd9ca35493 100644 --- a/Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupPolynomial.mos +++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupPolynomial.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.Templates.HeatingPlants.HotWater.Components.Validation.BoilerGroupPolynomial", +simulateModel("Buildings.Templates.Plants.Boilers.HotWater.Components.Validation.BoilerGroupPolynomial", method="cvode", tolerance=1e-6, stopTime=2000.0, @@ -18,4 +18,4 @@ createPlot(id=1, y={"mHeaWat_flow_nominal", "mHeaWat_flow.m_flow"}, subPlot=103, autoscale=true, - grid=true); \ No newline at end of file + grid=true); diff --git a/Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupTable.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupTable.mos similarity index 80% rename from Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupTable.mos rename to Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupTable.mos index 3c3fc4f8855..879fdcddac2 100644 --- a/Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupTable.mos +++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupTable.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.Templates.HeatingPlants.HotWater.Components.Validation.BoilerGroupTable", +simulateModel("Buildings.Templates.Plants.Boilers.HotWater.Components.Validation.BoilerGroupTable", method="cvode", tolerance=1e-6, stopTime=2000.0, @@ -18,4 +18,4 @@ createPlot(id=1, y={"mHeaWat_flow_nominal", "mHeaWat_flow.m_flow"}, subPlot=103, autoscale=true, - grid=true); \ No newline at end of file + grid=true); diff --git a/Buildings/Templates/AirHandlersFans/Validation/package.order b/Buildings/Templates/AirHandlersFans/Validation/package.order index 5ea601f5bec..4549b7665c0 100644 --- a/Buildings/Templates/AirHandlersFans/Validation/package.order +++ b/Buildings/Templates/AirHandlersFans/Validation/package.order @@ -1,2 +1 @@ -VAVMultiZone UserProject diff --git a/Buildings/Templates/Components/Data/package.order b/Buildings/Templates/Components/Data/package.order index 810b9a28824..2fb8639f65a 100644 --- a/Buildings/Templates/Components/Data/package.order +++ b/Buildings/Templates/Components/Data/package.order @@ -1,3 +1,4 @@ +BoilerHotWater Chiller Coil Cooler diff --git a/Buildings/Templates/Components/Interfaces/package.order b/Buildings/Templates/Components/Interfaces/package.order index a462d8d4b4c..8e455d9e41b 100644 --- a/Buildings/Templates/Components/Interfaces/package.order +++ b/Buildings/Templates/Components/Interfaces/package.order @@ -1,4 +1,5 @@ Bus +PartialBoilerHotWater PartialChiller PartialCoil PartialCooler diff --git a/Buildings/Templates/Components/Routing/MultipleToSingle.mo b/Buildings/Templates/Components/Routing/MultipleToSingle.mo index 329c3f17d5a..3f13bf61a4e 100644 --- a/Buildings/Templates/Components/Routing/MultipleToSingle.mo +++ b/Buildings/Templates/Components/Routing/MultipleToSingle.mo @@ -166,24 +166,24 @@ equation pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply then LinePattern.Solid else LinePattern.Dash, thickness=5), - Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None, + Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None, points=if icon_offset*icon_dy>=0 then {{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}} elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then {{0, 0},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}} else {{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}}, color={0,0,0}, - pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply + pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply then LinePattern.Solid else LinePattern.Dash, thickness=5), - Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None, + Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None, points=if icon_offset*icon_dy>=0 then {{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}} elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then {{0, 0},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}} else {{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}}, color={0,0,0}, - pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply + pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply then LinePattern.Solid else LinePattern.Dash, thickness=5)}), Diagram( diff --git a/Buildings/Templates/Components/Routing/SingleToMultiple.mo b/Buildings/Templates/Components/Routing/SingleToMultiple.mo index 3c98dab7c1e..73eee57b60e 100644 --- a/Buildings/Templates/Components/Routing/SingleToMultiple.mo +++ b/Buildings/Templates/Components/Routing/SingleToMultiple.mo @@ -169,24 +169,24 @@ equation pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply then LinePattern.Solid else LinePattern.Dash, thickness=5), - Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None, + Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None, points=if icon_offset*icon_dy>=0 then {{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}} elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then {{0, 0},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}} else {{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}}, color={0,0,0}, - pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply + pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply then LinePattern.Solid else LinePattern.Dash, thickness=5), - Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None, + Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None, points=if icon_offset*icon_dy>=0 then {{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}} elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then {{0, 0},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}} else {{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}}, color={0,0,0}, - pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply + pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply then LinePattern.Solid else LinePattern.Dash, thickness=5)}), Diagram( diff --git a/Buildings/Templates/Components/Types.mo b/Buildings/Templates/Components/Types.mo index 235c9486ce2..842a7e2d479 100644 --- a/Buildings/Templates/Components/Types.mo +++ b/Buildings/Templates/Components/Types.mo @@ -1,6 +1,12 @@ within Buildings.Templates.Components; package Types "Package with type definitions" extends Modelica.Icons.TypesPackage; + type BoilerHotWaterModel = enumeration( + Polynomial + "Efficiency described by a polynomial", + Table + "Efficiency described by a table") + "Enumeration to specify the type of hot water boiler model"; type Chiller = enumeration( AirCooled "Air-cooled compression chiller", diff --git a/Buildings/Templates/Components/Validation/BoilerHotWater.mo b/Buildings/Templates/Components/Validation/BoilerHotWater.mo index 286a5076694..9313d822145 100644 --- a/Buildings/Templates/Components/Validation/BoilerHotWater.mo +++ b/Buildings/Templates/Components/Validation/BoilerHotWater.mo @@ -30,14 +30,14 @@ model BoilerHotWater "Test model for the hot water boiler model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); Fluid.Sources.Boundary_pT retHeaWat( redeclare final package Medium = Medium, - p=Buildings.Templates.Data.Defaults.pHeaWat_rel_min + boiTab.dpHeaWat_nominal, + p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + boiTab.dpHeaWat_nominal, use_T_in=true, T=datBoiTab.THeaWatSup_nominal - 15, nPorts=2) "Boundary conditions for HW distribution system" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); Fluid.Sources.Boundary_pT supHeaWat(redeclare final package Medium =Medium, - p=Buildings.Templates.Data.Defaults.pHeaWat_rel_min, + p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal, nPorts=2) "Boundary conditions for HW distribution system" annotation (Placement(transformation(extent={{90,-30},{70,-10}}))); diff --git a/Buildings/Templates/Components/package.order b/Buildings/Templates/Components/package.order index 6bc319b7f9a..dd7bed5ff8d 100644 --- a/Buildings/Templates/Components/package.order +++ b/Buildings/Templates/Components/package.order @@ -1,4 +1,5 @@ Actuators +Boilers Chillers Coils Controls diff --git a/Buildings/Templates/HeatingPlants/HotWater/Components/Interfaces/package.mo b/Buildings/Templates/HeatingPlants/HotWater/Components/Interfaces/package.mo deleted file mode 100644 index 5a2ce480088..00000000000 --- a/Buildings/Templates/HeatingPlants/HotWater/Components/Interfaces/package.mo +++ /dev/null @@ -1,13 +0,0 @@ -<<<<<<<< HEAD:Buildings/Templates/HeatingPlants/HotWater/Components/Interfaces/package.mo -within Buildings.Templates.HeatingPlants.HotWater.Components; -======== -within Buildings.Templates.Plants.HeatPumps; ->>>>>>>> 0c2e878137e9b6b42ca6a566af979d0afb672894:Buildings/Templates/Plants/HeatPumps/Interfaces/package.mo -package Interfaces "Interface classes" - extends Modelica.Icons.InterfacesPackage; - annotation (Documentation(info=" -

-This package contains interface classes. -

-")); -end Interfaces; diff --git a/Buildings/Templates/HeatingPlants/HotWater/Interfaces/package.mo b/Buildings/Templates/HeatingPlants/HotWater/Interfaces/package.mo deleted file mode 100644 index f0d0319b10f..00000000000 --- a/Buildings/Templates/HeatingPlants/HotWater/Interfaces/package.mo +++ /dev/null @@ -1,13 +0,0 @@ -<<<<<<<< HEAD:Buildings/Templates/HeatingPlants/HotWater/Interfaces/package.mo -within Buildings.Templates.HeatingPlants.HotWater; -======== -within Buildings.Templates.Plants.Chillers; ->>>>>>>> 0c2e878137e9b6b42ca6a566af979d0afb672894:Buildings/Templates/Plants/Chillers/Interfaces/package.mo -package Interfaces "Interface classes" - extends Modelica.Icons.InterfacesPackage; - annotation (Documentation(info=" -

-This package contains interface classes. -

-")); -end Interfaces; diff --git a/Buildings/Templates/HeatingPlants/package.mo b/Buildings/Templates/HeatingPlants/package.mo deleted file mode 100644 index 334ef6dcce8..00000000000 --- a/Buildings/Templates/HeatingPlants/package.mo +++ /dev/null @@ -1,6 +0,0 @@ -within Buildings.Templates; -package HeatingPlants "Heating plants" - annotation (Documentation(info=" -

This package contains templates for heating plants.

-")); -end HeatingPlants; diff --git a/Buildings/Templates/HeatingPlants/HotWater/BoilerPlant.mo b/Buildings/Templates/Plants/Boilers/HotWater/BoilerPlant.mo similarity index 86% rename from Buildings/Templates/HeatingPlants/HotWater/BoilerPlant.mo rename to Buildings/Templates/Plants/Boilers/HotWater/BoilerPlant.mo index c6238f5ebfb..0af7bb831b5 100644 --- a/Buildings/Templates/HeatingPlants/HotWater/BoilerPlant.mo +++ b/Buildings/Templates/Plants/Boilers/HotWater/BoilerPlant.mo @@ -1,7 +1,7 @@ -within Buildings.Templates.HeatingPlants.HotWater; +within Buildings.Templates.Plants.Boilers.HotWater; model BoilerPlant "Boiler plant" extends - Buildings.Templates.HeatingPlants.HotWater.Interfaces.PartialBoilerPlant( + Buildings.Templates.Plants.Boilers.HotWater.Interfaces.PartialBoilerPlant( final typCtl=ctl.typ, final nAirHan=ctl.nAirHan, final nEquZon=ctl.nEquZon, @@ -10,7 +10,7 @@ model BoilerPlant "Boiler plant" nSenDpHeaWatRem=ctl.nSenDpHeaWatRem, have_senVHeaWatSec=ctl.have_senVHeaWatSec)); - Buildings.Templates.HeatingPlants.HotWater.Components.BoilerGroup boiCon( + Buildings.Templates.Plants.Boilers.HotWater.Components.BoilerGroup boiCon( redeclare final package Medium = Medium, final typMod=typMod, final nBoi=nBoiCon, @@ -23,7 +23,7 @@ model BoilerPlant "Boiler plant" "Condensing boilers" annotation (Placement(transformation(extent={{-220,-260},{-140,-120}}))); - Buildings.Templates.HeatingPlants.HotWater.Components.BoilerGroup boiNon( + Buildings.Templates.Plants.Boilers.HotWater.Components.BoilerGroup boiNon( redeclare final package Medium=Medium, final typMod=typMod, final nBoi=nBoiNon, @@ -46,7 +46,7 @@ model BoilerPlant "Boiler plant" final allowFlowReversal=allowFlowReversal, icon_offset=900, icon_dy=-300, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) if have_boiCon + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) if have_boiCon "Condensing boiler inlet manifold" annotation (Placement(transformation(extent={{-120,-250},{-140,-230}}))); Buildings.Templates.Components.Routing.MultipleToMultiple inlPumHeaWatPriCon( @@ -59,7 +59,7 @@ model BoilerPlant "Boiler plant" final energyDynamics=energyDynamics, final tau=tau, final allowFlowReversal=allowFlowReversal, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_xinl=-400, icon_dy=-300) if have_boiCon "Primary HW pumps inlet manifold" @@ -82,12 +82,13 @@ model BoilerPlant "Boiler plant" final energyDynamics=energyDynamics, final tau=tau, final allowFlowReversal=allowFlowReversal, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_dy=-300) if have_boiCon "Primary HW pumps outlet manifold" annotation (Placement(transformation(extent={{-70,-150},{-50,-130}}))); - Buildings.Templates.Components.Valves.TwoWayModulating valHeaWatMinBypCon( + Buildings.Templates.Components.Actuators.Valve valHeaWatMinBypCon( redeclare final package Medium = Medium, + final typ=Buildings.Templates.Components.Types.Valve.TwoWayModulating, final dat=dat.valHeaWatMinBypCon, final allowFlowReversal=allowFlowReversal) if have_valHeaWatMinBypCon "HW minimum flow bypass valve - Condensing boilers" @@ -101,10 +102,10 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriCon_flow_nominal, final allowFlowReversal=allowFlowReversal, final have_sen=ctl.have_senVHeaWatPriCon and ctl.locSenVHeaWatPri == - Buildings.Templates.HeatingPlants.HotWater.Types.SensorLocation.Supply, + Buildings.Templates.Plants.Boilers.HotWater.Types.SensorLocation.Supply, final text_flip=false, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply) if have_boiCon "Primary HW volume flow rate - Condensing boilers" annotation (Placement(transformation(extent={{-40,-150},{-20,-130}}))); @@ -113,10 +114,10 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriCon_flow_nominal, final allowFlowReversal=allowFlowReversal, final have_sen=ctl.have_senVHeaWatPriCon and ctl.locSenVHeaWatPri == - Buildings.Templates.HeatingPlants.HotWater.Types.SensorLocation.Return, + Buildings.Templates.Plants.Boilers.HotWater.Types.SensorLocation.Return, final text_flip=true, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) if have_boiCon "Primary HW volume flow rate - Condensing boilers" annotation (Placement(transformation(extent={{-20,-250},{-40,-230}}))); @@ -127,7 +128,7 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriCon_flow_nominal, final allowFlowReversal=allowFlowReversal, final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply) if have_boiCon "Primary HW supply temperature - Condensing boilers" annotation (Placement( @@ -142,7 +143,7 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriCon_flow_nominal, final allowFlowReversal=allowFlowReversal, final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) if have_boiCon "Plant HW return temperature - Condensing boilers" annotation (Placement( @@ -155,11 +156,11 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWat_flow_nominal, final allowFlowReversal=true, final have_sen=have_varPumHeaWatPriCon - and typPumHeaWatSec<>Buildings.Templates.HeatingPlants.HotWater.Types.PumpsSecondary.None - and ctl.typMeaCtlHeaWatPri==Buildings.Templates.HeatingPlants.HotWater.Types.PrimaryOverflowMeasurement.FlowDecoupler, + and typPumHeaWatSec<>Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsSecondary.None + and ctl.typMeaCtlHeaWatPri==Buildings.Templates.Plants.Boilers.HotWater.Types.PrimaryOverflowMeasurement.FlowDecoupler, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.Supply) if have_bypHeaWatFixCon "Decoupler HW volume flow rate / Fixed HW bypass - Condensing boilers" annotation (Placement( @@ -180,13 +181,13 @@ model BoilerPlant "Boiler plant" Modelica.Fluid.Types.PortFlowDirection.Bidirectional else Modelica.Fluid.Types.PortFlowDirection.Leaving, final portFlowDirection_3=Modelica.Fluid.Types.PortFlowDirection.Bidirectional, - icon_pipe1=Buildings.Templates.Components.Types.IconPipe.Return, - icon_pipe2=if have_boiCon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.None, + icon_pipe1=Buildings.Templates.Components.Types.IntegrationPoint.Return, + icon_pipe2=if have_boiCon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.None, icon_pipe3=if have_bypHeaWatFixCon or have_valHeaWatMinBypCon then - (if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.Supply) else - Buildings.Templates.Components.Types.IconPipe.None) + (if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.Supply) else + Buildings.Templates.Components.Types.IntegrationPoint.None) "Fluid junction" annotation (Placement(transformation( extent={{10,10},{-10,-10}}, @@ -204,13 +205,13 @@ model BoilerPlant "Boiler plant" final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional else Modelica.Fluid.Types.PortFlowDirection.Entering, icon_pipe1=if have_bypHeaWatFixCon or have_valHeaWatMinBypCon then - (if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.Supply) else - Buildings.Templates.Components.Types.IconPipe.None, - icon_pipe2=if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.Supply, - icon_pipe3=if have_boiCon then Buildings.Templates.Components.Types.IconPipe.Supply - else Buildings.Templates.Components.Types.IconPipe.None) + (if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.Supply) else + Buildings.Templates.Components.Types.IntegrationPoint.None, + icon_pipe2=if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.Supply, + icon_pipe3=if have_boiCon then Buildings.Templates.Components.Types.IntegrationPoint.Supply + else Buildings.Templates.Components.Types.IntegrationPoint.None) "Fluid junction" annotation (Placement(transformation( extent={{10,-10},{-10,10}}, @@ -219,12 +220,12 @@ model BoilerPlant "Boiler plant" Buildings.Templates.Components.Sensors.Temperature THeaWatIntSup( redeclare final package Medium = Medium, - final have_sen=typ == Buildings.Templates.HeatingPlants.HotWater.Types.Boiler.Hybrid, + final have_sen=typ == Buildings.Templates.Plants.Boilers.HotWater.Types.Boiler.Hybrid, final m_flow_nominal=mHeaWat_flow_nominal, final allowFlowReversal=allowFlowReversal, final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell, - icon_pipe=if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.Supply) "Intermediate HW supply temperature" annotation (Placement(transformation( extent={{-10,-10},{10,10}}, @@ -241,7 +242,7 @@ model BoilerPlant "Boiler plant" final allowFlowReversal=allowFlowReversal, icon_offset=900, icon_dy=-300, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) if have_boiNon + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) if have_boiNon "Non-condensing boiler inlet manifold" annotation (Placement(transformation(extent={{-120,-110},{-140,-90}}))); Buildings.Templates.Components.Routing.MultipleToMultiple inlPumHeaWatPriNon( @@ -254,7 +255,7 @@ model BoilerPlant "Boiler plant" final energyDynamics=energyDynamics, final tau=tau, final allowFlowReversal=allowFlowReversal, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_xinl=-400, icon_dy=-300) if have_boiNon "Primary HW pumps inlet manifold" @@ -277,12 +278,13 @@ model BoilerPlant "Boiler plant" final energyDynamics=energyDynamics, final tau=tau, final allowFlowReversal=allowFlowReversal, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_dy=-300) if have_boiNon "Primary HW pumps outlet manifold" annotation (Placement(transformation(extent={{-70,-10},{-50,10}}))); - Buildings.Templates.Components.Valves.TwoWayModulating valHeaWatMinBypNon( + Buildings.Templates.Components.Actuators.Valve valHeaWatMinBypNon( redeclare final package Medium = Medium, + final typ=Buildings.Templates.Components.Types.Valve.TwoWayModulating, final dat=dat.valHeaWatMinBypNon, final allowFlowReversal=allowFlowReversal) if have_valHeaWatMinBypNon "HW minimum flow bypass valve - Non-condensing boilers" @@ -296,10 +298,10 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriNon_flow_nominal, final allowFlowReversal=allowFlowReversal, final have_sen=ctl.have_senVHeaWatPriNon and ctl.locSenVHeaWatPri == - Buildings.Templates.HeatingPlants.HotWater.Types.SensorLocation.Supply, + Buildings.Templates.Plants.Boilers.HotWater.Types.SensorLocation.Supply, final text_flip=false, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply) if have_boiNon "Primary HW volume flow rate - Non-condensing boilers" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); @@ -308,10 +310,10 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriNon_flow_nominal, final allowFlowReversal=allowFlowReversal, final have_sen=ctl.have_senVHeaWatPriNon and ctl.locSenVHeaWatPri == - Buildings.Templates.HeatingPlants.HotWater.Types.SensorLocation.Return, + Buildings.Templates.Plants.Boilers.HotWater.Types.SensorLocation.Return, final text_flip=true, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) if have_boiNon "Primary HW volume flow rate - Non-condensing boilers" annotation (Placement(transformation(extent={{-20,-110},{-40,-90}}))); @@ -322,7 +324,7 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriNon_flow_nominal, final allowFlowReversal=allowFlowReversal, final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply) if have_boiNon "Primary HW supply temperature - Non-condensing boilers" annotation (Placement( transformation( @@ -336,7 +338,7 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWatPriNon_flow_nominal, final allowFlowReversal=allowFlowReversal, final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) if have_boiNon "Plant HW return temperature - Non-condensing boilers" annotation (Placement( @@ -349,10 +351,10 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWat_flow_nominal, final allowFlowReversal=true, final have_sen=have_varPumHeaWatPriNon - and typPumHeaWatSec<>Buildings.Templates.HeatingPlants.HotWater.Types.PumpsSecondary.None - and ctl.typMeaCtlHeaWatPri==Buildings.Templates.HeatingPlants.HotWater.Types.PrimaryOverflowMeasurement.FlowDecoupler, + and typPumHeaWatSec<>Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsSecondary.None + and ctl.typMeaCtlHeaWatPri==Buildings.Templates.Plants.Boilers.HotWater.Types.PrimaryOverflowMeasurement.FlowDecoupler, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply) if have_bypHeaWatFixNon "Decoupler HW volume flow rate / Fixed HW bypass - Non-condensing boilers" annotation (Placement( @@ -373,13 +375,13 @@ model BoilerPlant "Boiler plant" final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional else Modelica.Fluid.Types.PortFlowDirection.Leaving, - icon_pipe1=if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe1=if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_pipe2=if have_bypHeaWatFixNon or have_valHeaWatMinBypNon then - Buildings.Templates.Components.Types.IconPipe.Supply else - Buildings.Templates.Components.Types.IconPipe.None, - icon_pipe3=if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Return - else Buildings.Templates.Components.Types.IconPipe.None) + Buildings.Templates.Components.Types.IntegrationPoint.Supply else + Buildings.Templates.Components.Types.IntegrationPoint.None, + icon_pipe3=if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Return + else Buildings.Templates.Components.Types.IntegrationPoint.None) "Fluid junction" annotation ( Placement( @@ -402,12 +404,12 @@ model BoilerPlant "Boiler plant" final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional else Modelica.Fluid.Types.PortFlowDirection.Leaving, - icon_pipe1=if have_boiNon then Buildings.Templates.Components.Types.IconPipe.Supply - else Buildings.Templates.Components.Types.IconPipe.None, - icon_pipe2=Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe1=if have_boiNon then Buildings.Templates.Components.Types.IntegrationPoint.Supply + else Buildings.Templates.Components.Types.IntegrationPoint.None, + icon_pipe2=Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_pipe3=if have_bypHeaWatFixNon or have_valHeaWatMinBypNon then - Buildings.Templates.Components.Types.IconPipe.Supply else - Buildings.Templates.Components.Types.IconPipe.None) + Buildings.Templates.Components.Types.IntegrationPoint.Supply else + Buildings.Templates.Components.Types.IntegrationPoint.None) "Fluid junction" annotation ( Placement( @@ -423,7 +425,7 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWat_flow_nominal, final energyDynamics=energyDynamics, final allowFlowReversal=allowFlowReversal, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_dy=-300) if have_pumHeaWatSec "Secondary HW pumps inlet manifold" @@ -447,7 +449,7 @@ model BoilerPlant "Boiler plant" final energyDynamics=energyDynamics, final tau=tau, final allowFlowReversal=allowFlowReversal, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply, + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply, icon_dy=-300) if have_pumHeaWatSec "Secondary HW pumps outlet manifold" @@ -474,10 +476,10 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWat_flow_nominal, final allowFlowReversal=allowFlowReversal, final have_sen=ctl.have_senVHeaWatSec and ctl.locSenVHeaWatSec == - Buildings.Templates.HeatingPlants.HotWater.Types.SensorLocation.Supply, + Buildings.Templates.Plants.Boilers.HotWater.Types.SensorLocation.Supply, final text_flip=false, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply) "Secondary HW volume flow rate" annotation (Placement(transformation(extent={{180,-10},{200,10}}))); Buildings.Templates.Components.Sensors.VolumeFlowRate VHeaWatSecRet_flow( @@ -485,10 +487,10 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWat_flow_nominal, final allowFlowReversal=allowFlowReversal, final have_sen=ctl.have_senVHeaWatSec and ctl.locSenVHeaWatSec == - Buildings.Templates.HeatingPlants.HotWater.Types.SensorLocation.Return, + Buildings.Templates.Plants.Boilers.HotWater.Types.SensorLocation.Return, final text_flip=true, final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) "Secondary HW volume flow rate" annotation (Placement(transformation(extent={{240,-250},{220,-230}}))); Buildings.Templates.Components.Sensors.Temperature THeaWatSecRet( @@ -497,7 +499,7 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWat_flow_nominal, final allowFlowReversal=allowFlowReversal, final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Return) "Secondary HW return temperature" annotation (Placement(transformation(extent={{10,-10},{-10,10}}, rotation=0, @@ -508,7 +510,7 @@ model BoilerPlant "Boiler plant" final m_flow_nominal=mHeaWat_flow_nominal, final allowFlowReversal=allowFlowReversal, final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell, - icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply) + icon_pipe=Buildings.Templates.Components.Types.IntegrationPoint.Supply) "Secondary HW supply temperature" annotation (Placement(transformation( extent={{-10,-10},{10,10}}, @@ -516,9 +518,9 @@ model BoilerPlant "Boiler plant" origin={228,0}))); // Controls - replaceable Buildings.Templates.HeatingPlants.HotWater.Components.Controls.Guideline36 ctl + replaceable Buildings.Templates.Plants.Boilers.HotWater.Components.Controls.Guideline36 ctl constrainedby - Buildings.Templates.HeatingPlants.HotWater.Components.Interfaces.PartialController( + Buildings.Templates.Plants.Boilers.HotWater.Components.Interfaces.PartialController( final dat=dat.ctl, final have_boiCon=have_boiCon, final have_boiNon=have_boiNon, @@ -871,8 +873,8 @@ Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Controller.

Some input control points are required in addition to the ones already connected inside this model, see the documentation of - -Buildings.Templates.HeatingPlants.HotWater.Components.Controls.Guideline36. + +Buildings.Templates.Plants.Boilers.HotWater.Components.Controls.Guideline36.

References