Renamed fluidHeatTransfer to heatTransfer

For #290

Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/PipeToSlabConductance.mo

@@ -5,9 +5,9 @@ model PipeToSlabConductance
     Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choicesAllMatching = true);
 
-  parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer
-    fluidHeatTransfer=
-    Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.EpsilonNTU
+  parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer
+    heatTransfer=
+    Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.EpsilonNTU
     "Model for heat transfer between fluid and slab";
   parameter Modelica.SIunits.Area APip "Pipe inside surface area";
 
@@ -76,7 +76,7 @@ equation
      IN_con=kc_IN_con, IN_var=kc_IN_var);
   RTot = 1/hCon/APip + RFic + RWal;
 
-  if fluidHeatTransfer == Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.EpsilonNTU then
+  if heatTransfer == Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.EpsilonNTU then
     Q_flow = Functions.heatFlowRate(T_a=T_a,
                           T_b=T_b,
                           T_s=solid.T,

Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuitFiniteDifference.mo

@@ -3,9 +3,9 @@ model SingleCircuitMultipleCircuitFiniteDifference
   "Model that tests the radiant slab with multiple parallel circuits"
   extends
     Buildings.Fluid.HeatExchangers.RadiantSlabs.Examples.SingleCircuitMultipleCircuitEpsilonNTU(
-    sla1(fluidHeatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.FiniteDifference),
-    sla2(fluidHeatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.FiniteDifference),
-    sla3(fluidHeatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.FiniteDifference));
+    sla1(heatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.FiniteDifference),
+    sla2(heatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.FiniteDifference),
+    sla3(heatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.FiniteDifference));
 
  annotation(__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/RadiantSlabs/Examples/SingleCircuitMultipleCircuitFiniteDifference.mos"
         "Simulate and plot"),

Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponseEpsilonNTU.mo

@@ -30,7 +30,7 @@ model StepResponseEpsilonNTU
     disPip=0.2,
     A=A,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    fluidHeatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.FiniteDifference)
+    heatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.FiniteDifference)
     "Slabe with embedded pipes"
     annotation (Placement(transformation(extent={{10,-30},{30,-10}})));
 

Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponseFiniteDifference.mo

@@ -2,7 +2,7 @@ within Buildings.Fluid.HeatExchangers.RadiantSlabs.Examples;
 model StepResponseFiniteDifference "Model that tests the radiant slab"
   extends
     Buildings.Fluid.HeatExchangers.RadiantSlabs.Examples.StepResponseEpsilonNTU(
-      sla(fluidHeatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer.FiniteDifference));
+      sla(heatTransfer=Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer.FiniteDifference));
  annotation(__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponseFiniteDifference.mos"
         "Simulate and plot"),
           Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100,-120},

Buildings/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo

@@ -21,7 +21,7 @@ model ParallelCircuitsSlab
       m_flow_small=m_flow_small/nCir));
 
   parameter Integer nCir(min=1) = 1 "Number of parallel circuits";
-  parameter Integer nSeg(min=1) = if fluidHeatTransfer==Types.FluidHeatTransfer.EpsilonNTU then 1 else 5
+  parameter Integer nSeg(min=1) = if heatTransfer==Types.HeatTransfer.EpsilonNTU then 1 else 5
     "Number of volume segments in each circuit (along flow path)";
 
   parameter Modelica.SIunits.Area A
@@ -45,8 +45,8 @@ model ParallelCircuitsSlab
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
-  parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer
-    fluidHeatTransfer=Types.FluidHeatTransfer.EpsilonNTU
+  parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer
+    heatTransfer=Types.HeatTransfer.EpsilonNTU
     "Model for heat transfer between fluid and slab";
 
   // Diagnostics
@@ -85,7 +85,7 @@ model ParallelCircuitsSlab
 
   Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab sla(
     redeclare final package Medium = Medium,
-    final fluidHeatTransfer=fluidHeatTransfer,
+    final heatTransfer=heatTransfer,
     final sysTyp=sysTyp,
     final A=A/nCir,
     final disPip=disPip,

Buildings/Fluid/HeatExchangers/RadiantSlabs/SingleCircuitSlab.mo

@@ -2,7 +2,7 @@ within Buildings.Fluid.HeatExchangers.RadiantSlabs;
 model SingleCircuitSlab "Model of a single circuit of a radiant slab"
   extends Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Slab;
   extends Buildings.Fluid.FixedResistances.BaseClasses.Pipe(
-     nSeg=if fluidHeatTransfer==Types.FluidHeatTransfer.EpsilonNTU then 1 else 5,
+     nSeg=if heatTransfer==Types.HeatTransfer.EpsilonNTU then 1 else 5,
      final diameter=pipe.dIn,
      length=A/disPip,
      final thicknessIns=0,
@@ -22,8 +22,8 @@ model SingleCircuitSlab "Model of a single circuit of a radiant slab"
   parameter Modelica.SIunits.Area A "Surface area of radiant slab"
   annotation(Dialog(group="Construction"));
 
-  parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.FluidHeatTransfer
-    fluidHeatTransfer=Types.FluidHeatTransfer.EpsilonNTU
+  parameter Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.HeatTransfer
+    heatTransfer=Types.HeatTransfer.EpsilonNTU
     "Model for heat transfer between fluid and slab";
   parameter Modelica.SIunits.Temperature T_c_start=
     (T_a_start*con_b[1].layers.R+T_b_start*con_a[1].layers.R)/layers.R
@@ -102,7 +102,7 @@ protected
         d_hyd=pipe.dIn,
         L=length/nSeg,
         K=pipe.roughness),
-    each fluidHeatTransfer=fluidHeatTransfer)
+    each heatTransfer=heatTransfer)
     "Conductance between fluid and the slab"
     annotation (Placement(transformation(extent={{-28,-80},{-8,-60}})));
 

Buildings/Fluid/HeatExchangers/RadiantSlabs/Types.mo

@@ -1,7 +1,7 @@
 within Buildings.Fluid.HeatExchangers.RadiantSlabs;
 package Types "Package with type definitions"
 
-  type FluidHeatTransfer = enumeration(
+  type HeatTransfer = enumeration(
       EpsilonNTU "Epsilon-NTU",
       FiniteDifference "Finite difference")
     "Model for the heat transfer along the fluid flow direction" annotation (

Buildings/Fluid/HeatExchangers/RadiantSlabs/UsersGuide.mo

@@ -80,33 +80,33 @@ we set <code>iLayPip=1</code>.
 
 <h4>Discretization along the flow path</h4>
 <p>
-If the parameter <code>fluidHeatTransfer=EpsilonNTU</code>, then the heat transfer between the fluid
+If the parameter <code>heatTransfer=EpsilonNTU</code>, then the heat transfer between the fluid
 and the fictitious layer temperature is computed using an <i>&epsilon;-NTU</i> model.
-If <code>fluidHeatTransfer=FiniteDifference</code>, then the pipe and the slab is
+If <code>heatTransfer=FiniteDifference</code>, then the pipe and the slab is
 discretized along the water flow direction and a finite difference model is used
 to compute the heat transfer. The parameter <code>nSeg</code> determines
 how many times the resistance network is instantiated along the flow path.
 However, all instances connect to the same surface temperature heat ports 
 <code>surf_a</code> and <code>surf_b</code>.
 </p>
 <p>
-The default value for is <code>nSeg=1</code> if <code>fluidHeatTransfer=EpsilonNTU</code>
-and  <code>nSeg=5</code> if <code>fluidHeatTransfer=FiniteDifference</code>.
+The default value for is <code>nSeg=1</code> if <code>heatTransfer=EpsilonNTU</code>
+and  <code>nSeg=5</code> if <code>heatTransfer=FiniteDifference</code>.
 For a typical building simulation, we recommend to use the default settings of
-<code>fluidHeatTransfer=EpsilonNTU</code> and <code>nSeg=1</code>, as these lead to
+<code>heatTransfer=EpsilonNTU</code> and <code>nSeg=1</code>, as these lead to
 fastest computing time. 
 However, for feedback control design in which the outlet temperature of the slab
-is used, one may want to use <code>fluidHeatTransfer=FiniteDifference</code> and <code>nSeg=5</code>.
+is used, one may want to use <code>heatTransfer=FiniteDifference</code> and <code>nSeg=5</code>.
 This will cause the model to use <i>5</i> parallel segments in which heat is conducted between the 
 control volume of the pipe fluid and the surfaces of the slab.
 While the heat flow rate at the surface does not change noticeably between these
 two configurations, the dynamics of
 the water outlet temperature from the slab is significantly different. The
 figure below shows the water outlet temperature response to a step change in the 
 volume flow rate at <i>t=720</i> minutes. One can see that if 
-<code>fluidHeatTransfer=EpsilonNTU</code> and <code>nSeg=1</code>, 
+<code>heatTransfer=EpsilonNTU</code> and <code>nSeg=1</code>, 
 the response looks like a first order response (because <code>nSeg=1</code>),
-while with <code>fluidHeatTransfer=FiniteDifference</code> and <code>nSeg=5</code>,
+while with <code>heatTransfer=FiniteDifference</code> and <code>nSeg=5</code>,
 the response is higher order. This figure was generated using
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.RadiantSlabs.Examples.StepResponseFiniteDifference\">
 Buildings.Fluid.HeatExchangers.RadiantSlabs.Examples.StepResponse</a> and