diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo b/Buildings/Fluid/FixedResistances/BaseClasses/Pipe.mo index feba2bad96d..db8afb70616 100644 --- 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. ", revisions=" ")); -end PipeToSlabConductance; +end InternalFlowConvection; diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/package.order b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/package.order index 48f48bf0901..16deffe1c91 100644 --- 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 index baeb258160e..1d19b2543e5 100644 --- 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, diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponse.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponse.mo index 0e9a67054f4..f8373400e48 100644 --- a/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponse.mo +++ b/Buildings/Fluid/HeatExchangers/RadiantSlabs/Examples/StepResponse.mo @@ -18,7 +18,8 @@ model StepResponse "Model that tests the radiant slab" amplitude=-m_flow_nominal, offset=m_flow_nominal) annotation (Placement(transformation(extent={{-80,-22},{-60,-2}}))); - Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab sla( + Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab + sla( m_flow_nominal=m_flow_nominal, redeclare package Medium = Medium, layers=layers, diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo index edaa223f480..9776fdc2cee 100644 --- a/Buildings/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo +++ b/Buildings/Fluid/HeatExchangers/RadiantSlabs/ParallelCircuitsSlab.mo @@ -21,6 +21,8 @@ model ParallelCircuitsSlab m_flow_small=m_flow_small/nCir)); parameter Integer nCir(min=1) = 1 "Number of parallel circuits"; + parameter Integer nSeg(min=2) = 10 + "Number of volume segments in each circuit (along flow path)"; parameter Modelica.SIunits.Area A "Surface area of radiant slab (all circuits combined)" @@ -103,6 +105,7 @@ model ParallelCircuitsSlab final dp_nominal=dp_nominal, final linearizeFlowResistance=linearizeFlowResistance, final deltaM=deltaM, + final nSeg=nSeg, final length=length, final ReC=4000) "Single parallel circuit of the radiant slab" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); @@ -231,17 +234,6 @@ Buildings.Fluid.Interfaces.PartialTwoPortInterface. ", revisions=" -"), - Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ - 100,100}}), - graphics)); +")); end SingleCircuitSlab; diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_RadiantSlabs_BaseClasses_Functions_Examples_HeatFlowRate.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_RadiantSlabs_BaseClasses_Functions_Examples_HeatFlowRate.txt deleted file mode 100644 index 48df64ff12a..00000000000 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_RadiantSlabs_BaseClasses_Functions_Examples_HeatFlowRate.txt +++ /dev/null @@ -1 +0,0 @@ -last-generated=2014-10-07 diff --git a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_1.6_to_1.7.mos b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_1.6_to_1.7.mos index d126ee652f6..53190ae6164 100644 --- a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_1.6_to_1.7.mos +++ b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_1.6_to_1.7.mos @@ -4,6 +4,7 @@ clear convertClear(); + // Buildings.Airflow.Multizone.ZonalFlow_ACS // Buildings.Airflow.Multizone.ZonalFlow_m_flow // Removed parameter forceErrorControlOnFlow as it was not used. @@ -36,8 +37,3 @@ convertClear(); // Removed energyDynamics1 energyDynamics2, and ductConnectionDynamics, // used instead the value // of the parameter energyDynamics - - -// Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab -// Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab -// Removed parameter nSeg as it is no longer used. \ No newline at end of file diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/HeatFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/HeatFlowRate.mos deleted file mode 100644 index 2585306c6c2..00000000000 --- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/Examples/HeatFlowRate.mos +++ /dev/null @@ -1,13 +0,0 @@ -// Script generated by Dymola Tue Oct 7 14:56:25 2014 -// Plot commands -simulateModel("Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions.Examples.HeatFlowRate", method="dassl", tolerance=1e-05, resultFile="HeatFlowRate"); -createPlot(id=1, position={15, 10, 866, 489}, -x="m_flow", -y={"Q_flow"}, -range={-0.1, 0.1, -5.0, 20.0}, grid=true, filename="HeatFlowRate.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}}); -createPlot(id=1, -position={15, 10, 866, 241}, -x="m_flow", -y={"T_s", "T_a", "T_b", "T_f"}, -range={-0.1, 0.1, 20.0, 50.0}, grid=true, subPlot=2, leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}}); - diff --git a/Buildings/package.mo b/Buildings/package.mo index f16be01527d..0663d53af5f 100644 --- a/Buildings/package.mo +++ b/Buildings/package.mo @@ -333,25 +333,6 @@ have been improved in a - -Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab
- Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab - - Changed the models to use an epsilon-NTU approach for - the heat transfer between the fluid and the slab - rather than a finite difference scheme along the - flow path. - This has shown to lead to about five times faster - computation on several test cases including the models in - - Buildings.Rooms.FLEXLAB.Rooms.Examples. - This required removing the parameter nSeg - as it is no longer used.
- For Dymola, the conversion script will automatically - update existing models. - - - Buildings.Fluid.HeatExchangers.BaseClasses.DuctManifoldFixedResistance Reformulated flow splitter in the model to reduce