From c29e56289fa02209ed49e72c06a1788dc9e00db6 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Thu, 14 Jun 2018 09:16:35 -0700 Subject: [PATCH] Merged IBPSA, issue951_cleanup, commit c5e5cb79e3731cf24076cea2c14bb188f78c2893 --- .../PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo | 12 ++++++------ .../PlugFlowPipes/Data/BaseClasses/package.mo | 7 +++++++ .../PlugFlowPipes/Data/PipeDataULg160104_2.mo | 1 - .../Validation/PlugFlowPipes/MSLAIT.mo | 12 +++++------- .../Validation/PlugFlowPipes/MSLAIT2Nodes.mo | 12 +++++------- .../Validation/PlugFlowPipes/PlugFlowAIT.mo | 13 ++++++------- .../Fluid/MassExchangers/Validation/package.mo | 15 +++++++++++++++ Buildings/Fluid/MassExchangers/package.mo | 2 ++ .../Validation/CoupledVolumesWater.mo | 1 - .../StratifiedUnloadAtMinimumTemperature.mo | 3 +-- 10 files changed, 47 insertions(+), 31 deletions(-) diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo index c74117eaa64..badce6eda71 100644 --- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo +++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo @@ -25,16 +25,16 @@ carried out at the University of Liège.

Before to perform a test, the water city network is pushed inside the approximately 39 meter long studied pipe during about 10 minutes -to be sure that it is at the same temperature. +to be sure that it is at the same temperature. During this time period, valves V3 and V1 are opened, the boiler is off and the valve V2 is closed.

-Then, the valve V1 is closed and the valve V2 and V3 are opened. -The boiler is started to reach the setpoint hot water temperature. +Then, the valve V1 is closed and the valve V2 and V3 are opened. +The boiler is started to reach the setpoint hot water temperature. When the temperature setpoint is achieved, data starts to be recorded, the valve V1 is opened and the valve V2 is closed at the same time -to supply the studied pipe in hot water. +to supply the studied pipe in hot water. After the outlet pipe temperature is stabilized, the boiler is shut off.

@@ -58,9 +58,9 @@ src=\"modelica://Buildings/Resources/Images/Experimental/ULgTestBench.png\" bord to the initial temperature of the water (cooling before test)

  • Heat transfer coefficient between the pipe and the ambient is assumed -at 5 W/m2K (from internal model) due to insulation. +at 5 W/m2K (from internal model) due to insulation. The pipe is insulated by Tubolit 60/13 (13mm of thickness) whose -nominal thermal coefficient is inferior 0.04. +nominal thermal coefficient is inferior 0.04. Notice the insulation is quite aged therefore the nominal thermal coefficient could be higher
    • diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/package.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/package.mo index 73b0f0f535c..8aaec408ce2 100644 --- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/package.mo +++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/package.mo @@ -2,4 +2,11 @@ within Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.Data; package BaseClasses "BaseClasses for data records" extends Modelica.Icons.BasesPackage; +annotation (Documentation(info=" +

    +This package contains base classes that are used to construct the models in + +Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.Data. +

    +")); end BaseClasses; diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo index b1f9328e1a2..cc1149c36ce 100644 --- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo +++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo @@ -1004,7 +1004,6 @@ record PipeDataULg160104_2 "Experimental data from ULg's pipe test bench from 4 21.2; 10145.1,0.2494,22.2,22.3,21.3,21.2; 10152.7,0.2494,22.1,22.3,21.2, 21.2; 10161.2,0.2494,22.1,22.3,21.2,21.1; 10169,0.2494,22.1,22.2,21.2, 21.1; 10176.5,0.2494,22.1,22.2,21.2,21.1]); - // TODO adapt this value annotation (Documentation(revisions=" -"), - __Dymola_Commands(file= - "Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mos" - "Simulate and plot")); +")); end MSLAIT; diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo index b9b218e3a52..4f23fbb6ec6 100644 --- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo +++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo @@ -431,9 +431,10 @@ equation annotation ( Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,-160},{ 220,200}})), - experiment(StopTime=603900, Tolerance=1e-006, - __Dymola_Algorithm="Dassl"), - __Dymola_experimentSetupOutput(events=false), + experiment(StopTime=603900, Tolerance=1e-006), + __Dymola_Commands(file= + "Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mos" + "Simulate and plot"), Documentation(info="

    The example contains @@ -504,8 +505,5 @@ influence of allowFlowReversal and the presence of explicit volumes in the pipe.

  • January 26, 2016 by Carles Ribas:
    First implementation.
    • -"), - __Dymola_Commands(file= - "Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mos" - "Simulate and plot")); +")); end MSLAIT2Nodes; diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo index 63c286c2bea..57b90468a73 100644 --- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo +++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo @@ -348,8 +348,11 @@ equation experiment( StopTime=603900, Interval=900, - Tolerance=1e-006, - __Dymola_Algorithm="Dassl"), + Tolerance=1e-006), + __Dymola_Commands(file= + "Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mos" + "Simulate and plot"), + Diagram(coordinateSystem(extent={{-120,-160},{160,160}})), Documentation(info="

    The example contains @@ -408,9 +411,5 @@ influence of allowFlowReversal and the presence of explicit volumes in the pipe.

  • January 26, 2016 by Carles Ribas:
    First implementation.
    • -"), - __Dymola_Commands(file= - "Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mos" - "Simulate and plot"), - Diagram(coordinateSystem(extent={{-120,-160},{160,160}}))); +")); end PlugFlowAIT; diff --git a/Buildings/Fluid/MassExchangers/Validation/package.mo b/Buildings/Fluid/MassExchangers/Validation/package.mo index a53242b8759..5d44e18ebcd 100644 --- a/Buildings/Fluid/MassExchangers/Validation/package.mo +++ b/Buildings/Fluid/MassExchangers/Validation/package.mo @@ -2,4 +2,19 @@ within Buildings.Fluid.MassExchangers; package Validation "Validation examples" extends Modelica.Icons.ExamplesPackage; +annotation (Documentation(info=" +

    +This package contains validation models for the classes in + +Buildings.Fluid.MassExchangers. +

    +

    +Note that most validation models contain simple input data +which may not be realistic, but for which the correct +output can be obtained through an analytic solution. +The examples plot various outputs, which have been verified against these +solutions. These model outputs are stored as reference data and +used for continuous validation whenever models in the library change. +

    +")); end Validation; diff --git a/Buildings/Fluid/MassExchangers/package.mo b/Buildings/Fluid/MassExchangers/package.mo index d1d7584deb5..2150b457768 100644 --- a/Buildings/Fluid/MassExchangers/package.mo +++ b/Buildings/Fluid/MassExchangers/package.mo @@ -3,9 +3,11 @@ package MassExchangers "Package with mass exchanger models" extends Modelica.Icons.VariantsPackage; annotation (preferredView="info", Documentation(info=" +

    This package contains models for mass exchangers. For heat exchanger models without humidity transfer, see the package Buildings.Fluid.HeatExchangers. +

    ")); end MassExchangers; diff --git a/Buildings/Fluid/MixingVolumes/Validation/CoupledVolumesWater.mo b/Buildings/Fluid/MixingVolumes/Validation/CoupledVolumesWater.mo index 7401329826d..6d1eeb89625 100644 --- a/Buildings/Fluid/MixingVolumes/Validation/CoupledVolumesWater.mo +++ b/Buildings/Fluid/MixingVolumes/Validation/CoupledVolumesWater.mo @@ -1,7 +1,6 @@ within Buildings.Fluid.MixingVolumes.Validation; model CoupledVolumesWater "Validation model for two coupled volumes with water" - import Buildings; extends Modelica.Icons.Example; replaceable package Medium = Buildings.Media.Water diff --git a/Buildings/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo b/Buildings/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo index 4f5f74b79f7..2a4e6a6e7fe 100644 --- a/Buildings/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo +++ b/Buildings/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo @@ -175,8 +175,7 @@ equation "Simulate and plot"), experiment( StopTime=21600, - Tolerance=1e-06, - __Dymola_Algorithm="Cvode"), + Tolerance=1e-06), Documentation(info="

    Example for tank model that has three outlets, each with a valve.