Refactor after merge [ci skip]

lbl-srg · Feb 12, 2025 · 9f02685 · 9f02685
1 parent e99200b
commit 9f02685
Show file tree

Hide file tree

Showing 61 changed files with 416 additions and 431 deletions.
diff --git a/...ents/Validation/BoilerGroupPolynomial.mos → ...ents/Validation/BoilerGroupPolynomial.mos b/...ents/Validation/BoilerGroupPolynomial.mos → ...ents/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);
+  grid=true);
diff --git a/...omponents/Validation/BoilerGroupTable.mos → ...omponents/Validation/BoilerGroupTable.mos b/...omponents/Validation/BoilerGroupTable.mos → ...omponents/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);
+  grid=true);
diff --git 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
@@ -1,3 +1,4 @@
+BoilerHotWater
 Chiller
 Coil
 Cooler

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/Buildings/Templates/HeatingPlants/HotWater/Interfaces/package.mo b/Buildings/Templates/HeatingPlants/HotWater/Interfaces/package.mo
diff --git a/Buildings/Templates/HeatingPlants/package.mo b/Buildings/Templates/HeatingPlants/package.mo
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    BoilerHotWater
     Chiller
     Coil
     Cooler
@@ Expand Down @@