Added full path

lbl-srg · Dec 2, 2016 · f059ec7 · f059ec7
1 parent 3f845e5
commit f059ec7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/Buildings/Experimental/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo b/Buildings/Experimental/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo
@@ -103,111 +103,111 @@ model HeatingCoolingHotWater3Clusters
     m_flow_nominal=m_flow_nominal/3)
     annotation (Placement(transformation(extent={{160,-210},{140,-190}})));
 
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup1(
+  Buildings.Fluid.FixedResistances.Junction splSup1(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{-330,130},{-310,150}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet1(
+  Buildings.Fluid.FixedResistances.Junction splRet1(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{-250,30},{-230,10}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup2(
+  Buildings.Fluid.FixedResistances.Junction splSup2(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{-210,130},{-190,150}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet2(
+  Buildings.Fluid.FixedResistances.Junction splRet2(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{-130,30},{-110,10}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup3(
+  Buildings.Fluid.FixedResistances.Junction splSup3(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{-90,130},{-70,150}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet3(
+  Buildings.Fluid.FixedResistances.Junction splRet3(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{-10,30},{10,10}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup5(
+  Buildings.Fluid.FixedResistances.Junction splSup5(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{190,130},{210,150}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet5(
+  Buildings.Fluid.FixedResistances.Junction splRet5(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{270,30},{290,10}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup6(
+  Buildings.Fluid.FixedResistances.Junction splSup6(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{330,130},{350,150}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet6(
+  Buildings.Fluid.FixedResistances.Junction splRet6(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{410,30},{430,10}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup4(
+  Buildings.Fluid.FixedResistances.Junction splSup4(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{50,130},{70,150}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet4(
+  Buildings.Fluid.FixedResistances.Junction splRet4(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{90,10},{110,30}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup7(
+  Buildings.Fluid.FixedResistances.Junction splSup7(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{180,-90},{200,-70}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet7(
+  Buildings.Fluid.FixedResistances.Junction splRet7(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},

diff --git a/Buildings/Experimental/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo b/Buildings/Experimental/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo
@@ -87,15 +87,15 @@ model HeatingCoolingHotWaterSmall
         transformation(extent={{-168,100},{-152,116}}), iconTransformation(
           extent={{-328,64},{-308,84}})));
 
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splSup(
+  Buildings.Fluid.FixedResistances.Junction splSup(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false) "Flow splitter"
     annotation (Placement(transformation(extent={{-40,50},{-20,70}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop splRet(
+  Buildings.Fluid.FixedResistances.Junction splRet(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},

diff --git a/Buildings/Experimental/DistrictHeatingCooling/Validation/IdealSmallSystem.mo b/Buildings/Experimental/DistrictHeatingCooling/Validation/IdealSmallSystem.mo
@@ -87,47 +87,47 @@ model IdealSmallSystem "Validation model for a small system"
         -50E3; 18*3600,-50E3; 18*3600,-150E3; 24*3600,-100E3], extrapolation=
         Modelica.Blocks.Types.Extrapolation.Periodic) "Cooling demand"
     annotation (Placement(transformation(extent={{220,80},{240,100}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop spl(
+  Buildings.Fluid.FixedResistances.Junction spl(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false)
     annotation (Placement(transformation(extent={{-40,50},{-20,70}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop spl1(
+  Buildings.Fluid.FixedResistances.Junction spl1(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false)
     annotation (Placement(transformation(extent={{50,50},{70,70}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop spl2(
+  Buildings.Fluid.FixedResistances.Junction spl2(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false)
     annotation (Placement(transformation(extent={{210,50},{230,70}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop spl3(
+  Buildings.Fluid.FixedResistances.Junction spl3(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false)
     annotation (Placement(transformation(extent={{20,-30},{40,-50}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop spl4(
+  Buildings.Fluid.FixedResistances.Junction spl4(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=5*60,
     from_dp=false)
     annotation (Placement(transformation(extent={{120,-30},{140,-50}})));
-  Buildings.Fluid.FixedResistances.SplitterPressureDrop spl5(
+  Buildings.Fluid.FixedResistances.Junction spl5(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal*{1,1,1},
     dp_nominal=40*R_nominal*{0,1,1},