Revert "Merge pull request #293 from lbl-srg/issue290_tabs"

This reverts commit ec77526, reversing changes made to 07ddc7e.
lbl-srg · Oct 10, 2014 · 82e4105 · 82e4105
1 parent ec77526
commit 82e4105
Show file tree

Hide file tree

Showing 16 changed files with 153 additions and 398 deletions.
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo b/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo
@@ -8,7 +8,7 @@ model Pipe
   extends Buildings.Fluid.Interfaces.TwoPortFlowResistanceParameters(
     final computeFlowResistance=(abs(dp_nominal) > Modelica.Constants.eps));
 
-  parameter Integer nSeg(min=1) = 10 "Number of volume segments";
+  parameter Integer nSeg(min=2) = 10 "Number of volume segments";
   parameter Modelica.SIunits.Length thicknessIns "Thickness of insulation";
   parameter Modelica.SIunits.ThermalConductivity lambdaIns
     "Heat conductivity of insulation";
@@ -62,10 +62,9 @@ protected
       T=Medium.T_default,
       p=Medium.p_default,
       X=Medium.X_default[1:Medium.nXi]) "Default state";
-  parameter Modelica.SIunits.Density rho_default = Medium.density(state_default)
-    "Mass density at default medium state";
+  parameter Modelica.SIunits.Density rho_default = Medium.density(state_default);
   parameter Modelica.SIunits.DynamicViscosity mu_default = Medium.dynamicViscosity(state_default)
-    "Dynamic viscosity at default medium state";
+    "Dynamic viscosity at nominal condition";
 equation
   connect(port_a, res.port_a) annotation (Line(
       points={{-100,5.55112e-16},{-72,5.55112e-16},{-72,1.16573e-15},{-58,
@@ -76,11 +75,9 @@ equation
       points={{-10,6.10623e-16},{7,6.10623e-16},{7,-18}},
       color={0,127,255},
       smooth=Smooth.None));
-  if nSeg > 1 then
-    for i in 1:(nSeg - 1) loop
-      connect(vol[i].ports[2], vol[i + 1].ports[1]);
-    end for;
-  end if;
+  for i in 1:(nSeg - 1) loop
+    connect(vol[i].ports[2], vol[i + 1].ports[1]);
+  end for;
   connect(vol[nSeg].ports[2], port_b) annotation (Line(
       points={{11,-18},{12,-18},{12,5.55112e-16},{100,5.55112e-16}},
       color={0,127,255},
@@ -115,11 +112,6 @@ Buildings.Fluid.MixingVolumes.MixingVolume</a>.
 </html>", revisions="<html>
 <ul>
 <li>
-October 7, 2014, by Michael Wetter:<br/>
-Changed minimum attribute for <code>nSeg</code> from 2 to 1.
-This is required for the radiant slab model.
-</li>
-<li>
 October 8, 2013, by Michael Wetter:<br/>
 Removed parameter <code>show_V_flow</code>.
 </li>

diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/HeatFlowRate.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/HeatFlowRate.mo
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/package.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/package.mo
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/package.order b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/package.order
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/heatFlowRate.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/heatFlowRate.mo
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/package.order b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/package.order
@@ -1,3 +1 @@
 AverageResistance
-heatFlowRate
-Examples
diff --git a/...labs/BaseClasses/PipeToSlabConductance.mo → ...abs/BaseClasses/InternalFlowConvection.mo b/...labs/BaseClasses/PipeToSlabConductance.mo → ...abs/BaseClasses/InternalFlowConvection.mo
@@ -1,18 +1,25 @@
 within Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses;
-model PipeToSlabConductance
-  "Convective heat transfer in pipes and fictitious resistance to average slab temperature"
+model InternalFlowConvection "Convective heat transfer in pipes"
   replaceable package Medium =
     Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choicesAllMatching = true);
-  parameter Boolean use_epsilon_NTU = true
-    "Set to true to use an epsilon-NTU model for the heat conduction";
-  parameter Modelica.SIunits.Area APip "Pipe inside surface area";
-
+  Modelica.SIunits.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid";
+  Modelica.SIunits.TemperatureDifference dT "= solid.T - fluid.T";
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a solid
+    "Heat port at solid interface"
+   annotation (
+      Placement(transformation(extent={{-110,-10},{-90,10}}, rotation=0),
+        iconTransformation(extent={{-114,-10},{-94,10}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b fluid
+    "Heat port at fluid interface"
+   annotation (
+      Placement(transformation(extent={{90,-10},{110,10}}, rotation=0),
+        iconTransformation(extent={{86,-10},{106,10}})));
+  parameter Modelica.SIunits.Area A "Pipe inside surface area";
   parameter
     Modelica.Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_IN_con
     kc_IN_con "Parameters for convective heat transfer calculation"
     annotation (Placement(transformation(extent={{-90,84},{-78,96}})));
-
   Modelica.Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_IN_var
     kc_IN_var(
     cp=Medium.specificHeatCapacityCp(fluSta),
@@ -21,89 +28,38 @@ model PipeToSlabConductance
     rho=Medium.density(fluSta),
     m_flow=m_flow) "Variables for convective heat transfer calculation"
     annotation (Placement(transformation(extent={{-90,68},{-78,80}})));
-
-  parameter Modelica.SIunits.ThermalResistance RFic
-    "Average fictitious thermal resistance between pipe surface and plane that contains pipe";
-  parameter Modelica.SIunits.ThermalResistance RWal
-    "Thermal resistance through the pipe wall";
-
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
-    "Nominal mass flow rate";
-
   Modelica.Blocks.Interfaces.RealInput m_flow(unit="kg/s")
-    "Fluid mass flow rate from port_a to port_b"
-    annotation (Placement(transformation(extent={{-118,32},{-100,50}}),
-        iconTransformation(extent={{-120,30},{-100,50}})));
-  Modelica.Blocks.Interfaces.RealInput T_a(unit="K")
-    "Temperature at fluid port_a"
-    annotation (Placement(transformation(extent={{-118,92},{-100,110}}),
-        iconTransformation(extent={{-120,90},{-100,110}})));
-  Modelica.Blocks.Interfaces.RealInput T_b(unit="K")
-    "Temperature at fluid port_b"
-    annotation (Placement(transformation(extent={{-118,62},{-100,80}}),
-        iconTransformation(extent={{-120,60},{-100,80}})));
-
-  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a solid
-    "Heat port at solid interface"
-   annotation (
-      Placement(transformation(extent={{-110,-10},{-90,10}}, rotation=0),
-        iconTransformation(extent={{-114,-10},{-94,10}})));
-  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b fluid
-    "Heat port at fluid interface"
-   annotation (
-      Placement(transformation(extent={{90,-10},{110,10}}, rotation=0),
-        iconTransformation(extent={{86,-10},{106,10}})));
-
-  Modelica.SIunits.TemperatureDifference dT "= solid.T - fluid.T";
-
+    "Fluid mass flow rate"
+    annotation (Placement(transformation(extent={{-118,46},{-100,64}})));
   Modelica.SIunits.CoefficientOfHeatTransfer hCon
     "Convective heat transfer coefficient";
-  Modelica.SIunits.ThermalResistance RTot
-    "Thermal resistance between the fluid and the fictious plane of heat transfer";
-
-  Modelica.SIunits.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid";
-
 protected
   Medium.ThermodynamicState fluSta = Medium.setState_pTX(p=Medium.p_default, T=fluid.T, X=Medium.X_default)
     "State of the medium";
-  Modelica.SIunits.SpecificHeatCapacity c_p = Medium.specificHeatCapacityCp(fluSta)
-    "Specific heat capacity of the fluid";
 equation
   hCon = Modelica.Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_KC(
      IN_con=kc_IN_con, IN_var=kc_IN_var);
-  RTot = 1/hCon/APip + RFic + RWal;
-
-  if use_epsilon_NTU then
-    Q_flow = Functions.heatFlowRate(T_a=T_a,
-                          T_b=T_b,
-                          T_s=solid.T,
-                          T_f=fluid.T,
-                          c_p=c_p,
-                          UA=1/RTot,
-                          m_flow=m_flow,
-                          m_flow_nominal=m_flow_nominal);
-  else
-    Q_flow = dT/RTot;
-  end if;
 
   dT = solid.T - fluid.T;
   solid.Q_flow = Q_flow;
   fluid.Q_flow = -Q_flow;
-
+  Q_flow = hCon*A*dT;
   annotation (Icon(graphics={
         Rectangle(
           extent={{-66,80},{94,-80}},
           lineColor={255,255,255},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-88,80},{2,-82}},
+          extent={{-94,80},{-64,-80}},
           lineColor={0,0,0},
           fillColor={192,192,192},
           fillPattern=FillPattern.Backward),
         Line(points={{96,0},{96,0}}, color={0,127,255}),
         Line(points={{-64,20},{72,20}}, color={191,0,0}),
         Line(points={{-64,-20},{72,-20}}, color={191,0,0}),
+        Line(points={{-38,80},{-38,-80}}, color={0,127,255}),
+        Line(points={{2,80},{2,-80}}, color={0,127,255}),
         Line(points={{36,80},{36,-80}}, color={0,127,255}),
         Line(points={{72,80},{72,-80}}, color={0,127,255}),
         Line(points={{52,-30},{72,-20}}, color={191,0,0}),
@@ -113,7 +69,7 @@ equation
         Text(
           extent={{-145,140},{155,100}},
           lineColor={0,0,255},
-          textString="%name")}),
+          textString="%name")}),                          
     Documentation(info="<html>
 <p>
 Model to compute the convective heat transfer inside a straight pipe.
@@ -136,4 +92,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end PipeToSlabConductance;
+end InternalFlowConvection;
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/package.order b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/package.order
@@ -1,7 +1,6 @@
+InternalFlowConvection
 HeatFlowRateMultiplier
 MassFlowRateMultiplier
-PipeToSlabConductance
 Slab
 Functions
 Types
-
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuit.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuit.mo
@@ -1,6 +1,5 @@
 within Buildings.Fluid.HeatExchangers.RadiantSlabs.Examples;
-model SingleCircuitMultipleCircuit
-  "Model that tests the radiant slab with multiple parallel circuits"
+model SingleCircuitMultipleCircuit "Model that tests the radiant slab"
   extends Modelica.Icons.Example;
  package Medium = Buildings.Media.ConstantPropertyLiquidWater;
       inner Modelica.Fluid.System system
@@ -24,8 +23,9 @@ model SingleCircuitMultipleCircuit
     sysTyp=Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Types.SystemType.Floor,
     disPip=0.2,
     A=A,
+    nSeg=nSeg,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Slab with embedded pipes"
+    "Slabe with embedded pipes"
     annotation (Placement(transformation(extent={{-14,10},{6,30}})));
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal=
@@ -74,8 +74,9 @@ model SingleCircuitMultipleCircuit
     sysTyp=Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Types.SystemType.Floor,
     disPip=0.2,
     A=A,
+    nSeg=nSeg,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Slab with embedded pipes"
+    "Slabe with embedded pipes"
     annotation (Placement(transformation(extent={{10,-30},{30,-10}})));
 
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor conBel2(G=20*A)
@@ -91,11 +92,12 @@ model SingleCircuitMultipleCircuit
     pipe=pipe,
     sysTyp=Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Types.SystemType.Floor,
     disPip=0.2,
+    nSeg=nSeg,
     nCir=nCir,
     A=nCir*A,
     m_flow_nominal=nCir*m_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Slab with embedded pipes"
+    "Slabe with embedded pipes"
     annotation (Placement(transformation(extent={{30,-70},{50,-50}})));
 
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor conAbo3(G=nCir*20*A)
@@ -110,6 +112,7 @@ model SingleCircuitMultipleCircuit
   Sensors.TemperatureTwoPort senTem3(redeclare package Medium = Medium,
       m_flow_nominal=nCir*m_flow_nominal) "Temperature sensor"
     annotation (Placement(transformation(extent={{70,-70},{90,-50}})));
+  parameter Integer nSeg=3 "Number of volume segments";
   Sources.Boundary_pT sou(
     redeclare package Medium = Medium,
     nPorts=3,