Revised slab models.

This is for #290. Introduced enumeration for fluidHeatTransfer. Moved documentation to UsersGuide.
lbl-srg · Oct 10, 2014 · 0bf554e · 0bf554e
1 parent be428e8
commit 0bf554e
Show file tree

Hide file tree

Showing 20 changed files with 543 additions and 705 deletions.
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo
@@ -4,8 +4,11 @@ model PipeToSlabConductance
   replaceable package Medium =
     Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choicesAllMatching = true);
-  parameter Boolean use_epsilon_NTU = false
-    "Set to true to use an epsilon-NTU model for the heat conduction";
+
+  parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer
+    fluidHeatTransfer=
+    Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.EpsilonNTU
+    "Model for heat transfer between fluid and slab";
   parameter Modelica.SIunits.Area APip "Pipe inside surface area";
 
   parameter
@@ -73,7 +76,7 @@ equation
      IN_con=kc_IN_con, IN_var=kc_IN_var);
   RTot = 1/hCon/APip + RFic + RWal;
 
-  if use_epsilon_NTU then
+  if fluidHeatTransfer == Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.EpsilonNTU then
     Q_flow = Functions.heatFlowRate(T_a=T_a,
                           T_b=T_b,
                           T_s=solid.T,

diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Types.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Types.mo
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/package.order b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/package.order
@@ -3,5 +3,4 @@ MassFlowRateMultiplier
 PipeToSlabConductance
 Slab
 Functions
-Types
 
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuit.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuit.mo