From 48ff3d704cbbb3a458baa7783d44bceca091207a Mon Sep 17 00:00:00 2001 From: PASCAL BOREL <d54380@dsp0961716.postes.calibre.edf.fr> Date: Wed, 31 Mar 2021 21:14:00 +0200 Subject: [PATCH] add experiment annotation --- .../BaseClasses/test_Condensation.mo | 4 ++- .../test_FreeAeraulicConvection.mo | 4 ++- .../BaseClasses/test_FreeConvection.mo | 4 ++- FluidDynamics/BaseClasses/test_GasNode.mo | 10 ++++--- .../BaseClasses/test_GasNode_two_phases.mo | 4 ++- .../BaseClasses/test_Interface_liq_gas.mo | 4 ++- .../BaseClasses/test_MolecularDiffusion.mo | 4 ++- .../Buildings/test_BurstMembrane.mo | 4 ++- .../Components/Buildings/test_HalfWall.mo | 4 ++- .../Components/Buildings/test_InertMass.mo | 4 ++- .../Components/Buildings/test_Wall.mo | 4 ++- .../Components/Buildings/test_WallLeak.mo | 4 ++- .../Components/Filters/test_Filter.mo | 4 ++- .../Machines/test_ControlledVolumeFlowPump.mo | 4 ++- .../test_AnalyticWetExchanger.mo | 3 ++- .../Orifices/test_HorizontalOpening.mo | 4 ++- .../Components/Orifices/test_SimpleOpening.mo | 4 ++- .../Orifices/test_VerticalOpening.mo | 4 ++- .../Components/Pipes/test_StaticPipe.mo | 4 ++- .../Valves/test_CommissioningDamper.mo | 4 ++- .../Valves/test_Damper_opposedBlades.mo | 4 ++- .../Valves/test_Damper_parallelBlades.mo | 4 ++- .../Components/Valves/test_polynomial.mo | 4 ++- .../Functions/test_rootsPolyOrder3.mo | 4 ++- FluidDynamics/Sources/test_atmosphere.mo | 4 ++- .../BaseClasses/test_CarrollRadiation.mo | 2 +- HeatTransfer/BaseClasses/test_Conduction.mo | 22 ++++++++-------- .../BaseClasses/test_ForcedConvection.mo | 26 +++++++++---------- .../BaseClasses/test_FreeConvection.mo | 4 ++- .../test_FreeConvection_dT_decoupled.mo | 4 ++- HeatTransfer/BaseClasses/test_LumpVolume.mo | 4 ++- HeatTransfer/BaseClasses/test_PartialWall.mo | 4 ++- HeatTransfer/Components/test_CabinetPower.mo | 4 ++- .../Components/test_FanVentilation.mo | 4 ++- .../Components/test_FviewCalculator.mo | 4 ++- HeatTransfer/Components/test_HalfWall.mo | 12 ++++----- HeatTransfer/Components/test_HeatExchanger.mo | 4 ++- HeatTransfer/Components/test_InertMass.mo | 4 ++- HeatTransfer/Components/test_Ventilation.mo | 4 ++- HeatTransfer/Components/test_Wall.mo | 4 ++- .../test_from_correlations.mo | 4 ++- .../test_biotAndGeometricalGrowthGrid.mo | 4 ++- .../MeshGrid/test_biotAndUniformGrid.mo | 4 ++- .../MeshGrid/test_geometricalGrowthGrid.mo | 4 ++- .../Functions/MeshGrid/test_uniformGrid.mo | 4 ++- HeatTransfer/Sensors/test_density.mo | 10 +++---- Media/SimpleMoistAir/test_T_phX.mo | 5 ++-- Media/SimpleMoistAir/test_cp.mo | 4 ++- Media/SimpleMoistAir/test_d_phX.mo | 4 ++- Media/SimpleMoistAir/test_pressure.mo | 5 ++-- Media/SimpleMoistAir/test_r_dTX.mo | 2 +- .../SimpleMoistAir/test_saturationDensity.mo | 4 ++- .../SimpleMoistAir/test_saturationPressure.mo | 2 +- .../test_saturationPressureLiquid.mo | 4 ++- .../test_saturationPressureLiquidDer.mo | 13 +++------- .../test_sublimationPressureIce.mo | 4 ++- .../test_sublimationPressureIceDer.mo | 4 ++- PDE/test_UpwindFirstOrder.mo | 18 +++---------- 58 files changed, 194 insertions(+), 116 deletions(-) diff --git a/FluidDynamics/BaseClasses/test_Condensation.mo b/FluidDynamics/BaseClasses/test_Condensation.mo index 3954868..581867a 100644 --- a/FluidDynamics/BaseClasses/test_Condensation.mo +++ b/FluidDynamics/BaseClasses/test_Condensation.mo @@ -16,4 +16,6 @@ equation Line(points = {{60, 0}, {16, 0}, {16, 0}, {18, 0}}, color = {191, 0, 0})); connect(h_cv.y, condensation.h_cv) annotation( Line(points = {{-58, 70}, {-30, 70}, {-30, 12}, {-16, 12}, {-16, 12}}, color = {0, 0, 127})); -end test_Condensation; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Condensation; \ No newline at end of file diff --git a/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo b/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo index ed72e1b..44b8e1e 100644 --- a/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo +++ b/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo @@ -20,4 +20,6 @@ equation Line(points = {{-2, 18}, {-2, 40}, {32, 40}, {32, 0}, {60, 0}}, color = {0, 85, 255})); connect(atmosphere.Flowport, freeAeraulicConvection.flowPort_down) annotation( Line(points = {{60, 0}, {32, 0}, {32, -40}, {-2, -40}, {-2, -18}}, color = {0, 85, 255})); -end test_FreeAeraulicConvection; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_FreeAeraulicConvection; \ No newline at end of file diff --git a/FluidDynamics/BaseClasses/test_FreeConvection.mo b/FluidDynamics/BaseClasses/test_FreeConvection.mo index b72a445..d0192a4 100644 --- a/FluidDynamics/BaseClasses/test_FreeConvection.mo +++ b/FluidDynamics/BaseClasses/test_FreeConvection.mo @@ -19,4 +19,6 @@ equation Line(points = {{-40, 0}, {-20, 0}, {-20, 0}, {-20, 0}}, color = {191, 0, 0})); connect(freeConvection.port_b, atmosphere.Flowport) annotation( Line(points = {{20, 0}, {62, 0}, {62, 0}, {60, 0}}, color = {0, 85, 255})); -end test_FreeConvection; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_FreeConvection; \ No newline at end of file diff --git a/FluidDynamics/BaseClasses/test_GasNode.mo b/FluidDynamics/BaseClasses/test_GasNode.mo index a69b439..3babd8d 100644 --- a/FluidDynamics/BaseClasses/test_GasNode.mo +++ b/FluidDynamics/BaseClasses/test_GasNode.mo @@ -1,12 +1,14 @@ within TAeZoSysPro_testsuite.FluidDynamics.BaseClasses; model test_GasNode - package Medium = TAeZoSysPro.Media.Air.MoistAir ; - TAeZoSysPro.FluidDynamics.BasesClasses.GasNode gasNode(redeclare package Medium = Medium, nPorts = 1) annotation( + package Medium = TAeZoSysPro.Media.Air.MoistAir; + TAeZoSysPro.FluidDynamics.BasesClasses.GasNode gasNode(redeclare package Medium = Medium, nPorts = 1) annotation( Placement(visible = true, transformation(origin = {-3.55271e-15, 3.55271e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); - Modelica.Fluid.Sources.MassFlowSource_T boundary(redeclare package Medium = Medium, m_flow = 0.001, nPorts = 1) annotation( + Modelica.Fluid.Sources.MassFlowSource_T boundary(redeclare package Medium = Medium, m_flow = 0.001, nPorts = 1) annotation( Placement(visible = true, transformation(origin = {-62, 4}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); equation connect(boundary.ports[1], gasNode.fluidPort[1]) annotation( Line(points = {{-42, 4}, {-4, 4}, {-4, 4}, {-4, 4}}, color = {0, 127, 255})); -end test_GasNode; + annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002)); +end test_GasNode; \ No newline at end of file diff --git a/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo b/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo index d2b60fc..e1481f6 100644 --- a/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo +++ b/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo @@ -14,4 +14,6 @@ equation Line(points = {{-60, 50}, {-4, 50}, {-4, 52}, {-4, 52}}, color = {191, 0, 0})); connect(boundary.ports[1], gasNode_two_phases1.fluidPort[1]) annotation( Line(points = {{-60, -32}, {-2, -32}, {-2, -32}, {-4, -32}}, color = {0, 127, 255})); -end test_GasNode_two_phases; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_GasNode_two_phases; \ No newline at end of file diff --git a/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo b/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo index 10bd17b..8a04cb0 100644 --- a/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo +++ b/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo @@ -36,4 +36,6 @@ equation Line(points = {{40, 30}, {-2, 30}, {-2, 18}, {-2, 18}}, color = {0, 0, 127})); connect(liquidNode_simulated.port_liquidNode, interFace_liq_gas.fluidPort_a) annotation( Line(points = {{50, -50}, {12, -50}, {12, -18}, {12, -18}}, color = {0, 127, 255})); -end test_Interface_liq_gas; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Interface_liq_gas; \ No newline at end of file diff --git a/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo b/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo index 3938769..799071f 100644 --- a/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo +++ b/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo @@ -12,4 +12,6 @@ equation Line(points = {{-80, 0}, {-22, 0}, {-22, 0}, {-20, 0}}, color = {0, 85, 255})); connect(molecularDiffusion.flowPort_b, atmosphere1.Flowport) annotation( Line(points = {{20, 0}, {82, 0}, {82, 0}, {80, 0}}, color = {0, 85, 255})); -end test_MolecularDiffusion; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_MolecularDiffusion; \ No newline at end of file diff --git a/FluidDynamics/Components/Buildings/test_BurstMembrane.mo b/FluidDynamics/Components/Buildings/test_BurstMembrane.mo index ad6af05..a14d3e1 100644 --- a/FluidDynamics/Components/Buildings/test_BurstMembrane.mo +++ b/FluidDynamics/Components/Buildings/test_BurstMembrane.mo @@ -20,4 +20,6 @@ equation Line(points = {{10, 0}, {30, 0}, {30, 0}, {30, 0}}, color = {0, 127, 255})); connect(pressure_profile.y, atmosphere.p_in) annotation( Line(points = {{-78, 12}, {-60, 12}, {-60, 12}, {-58, 12}}, color = {0, 0, 127})); -end test_BurstMembrane; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_BurstMembrane; \ No newline at end of file diff --git a/FluidDynamics/Components/Buildings/test_HalfWall.mo b/FluidDynamics/Components/Buildings/test_HalfWall.mo index 4d1fc9e..0987cff 100644 --- a/FluidDynamics/Components/Buildings/test_HalfWall.mo +++ b/FluidDynamics/Components/Buildings/test_HalfWall.mo @@ -13,4 +13,6 @@ equation Line(points = {{3.4, -10.6}, {-4.6, -10.6}, {-4.6, -6.6}, {3.4, -6.6}, {3.4, -6.6}}, color = {0, 0, 127})); connect(halfWall.port_a_rad, halfWall.port_surface) annotation( Line(points = {{4, -18}, {-8, -18}, {-8, 2}, {14, 2}, {14, 2}}, color = {191, 0, 0})); -end test_HalfWall; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_HalfWall; \ No newline at end of file diff --git a/FluidDynamics/Components/Buildings/test_InertMass.mo b/FluidDynamics/Components/Buildings/test_InertMass.mo index 3553a4f..ee3b3ed 100644 --- a/FluidDynamics/Components/Buildings/test_InertMass.mo +++ b/FluidDynamics/Components/Buildings/test_InertMass.mo @@ -13,4 +13,6 @@ equation Line(points = {{-18, -10}, {-28, -10}, {-28, -6}, {-18, -6}, {-18, -6}}, color = {0, 0, 127})); connect(inertMass.port_a, atmosphere.Flowport) annotation( Line(points = {{-20, 10}, {-40, 10}, {-40, 0}, {-60, 0}, {-60, 0}}, color = {0, 85, 255})); -end test_InertMass; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_InertMass; \ No newline at end of file diff --git a/FluidDynamics/Components/Buildings/test_Wall.mo b/FluidDynamics/Components/Buildings/test_Wall.mo index 88f1818..1ed0183 100644 --- a/FluidDynamics/Components/Buildings/test_Wall.mo +++ b/FluidDynamics/Components/Buildings/test_Wall.mo @@ -21,4 +21,6 @@ equation Line(points = {{2, 14}, {-40, 14}, {-40, 0}, {-60, 0}, {-60, 0}}, color = {0, 85, 255})); connect(Wall.port_b, atmosphere.Flowport) annotation( Line(points = {{40, 14}, {60, 14}, {60, 32}, {-40, 32}, {-40, 0}, {-60, 0}, {-60, 0}}, color = {0, 85, 255})); -end test_Wall; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Wall; \ No newline at end of file diff --git a/FluidDynamics/Components/Buildings/test_WallLeak.mo b/FluidDynamics/Components/Buildings/test_WallLeak.mo index 7dfb1e5..808aa44 100644 --- a/FluidDynamics/Components/Buildings/test_WallLeak.mo +++ b/FluidDynamics/Components/Buildings/test_WallLeak.mo @@ -12,4 +12,6 @@ equation Line(points = {{-60, 8}, {-40, 8}, {-40, 0}, {-20, 0}, {-20, 0}}, color = {0, 127, 255})); connect(atmosphere1.Fluidport[1], wallLeaks.port_b) annotation( Line(points = {{60, 8}, {40, 8}, {40, 0}, {20, 0}, {20, 0}}, color = {0, 127, 255})); -end test_WallLeak; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_WallLeak; \ No newline at end of file diff --git a/FluidDynamics/Components/Filters/test_Filter.mo b/FluidDynamics/Components/Filters/test_Filter.mo index 020a7c3..7cae2bb 100644 --- a/FluidDynamics/Components/Filters/test_Filter.mo +++ b/FluidDynamics/Components/Filters/test_Filter.mo @@ -14,4 +14,6 @@ equation connect(airFilter.port_b, sink.ports[1]) annotation( Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255})); protected -end test_Filter; + annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Filter; \ No newline at end of file diff --git a/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo b/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo index 83b391e..3a9db23 100644 --- a/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo +++ b/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo @@ -14,4 +14,6 @@ equation Line(points = {{-20, 10}, {20, 10}, {20, 10}, {20, 10}}, color = {0, 127, 255})); connect(pipe.port_b, boundary.ports[2]) annotation( Line(points = {{40, 10}, {60, 10}, {60, -20}, {-80, -20}, {-80, 10}, {-80, 10}}, color = {0, 127, 255})); -end test_ControlledVolumeFlowPump; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_ControlledVolumeFlowPump; \ No newline at end of file diff --git a/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo b/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo index bf4c54c..e4c8dd1 100644 --- a/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo +++ b/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo @@ -27,4 +27,5 @@ equation Line(points = {{-40, 50}, {-16, 50}, {-16, 18}, {-16, 18}}, color = {0, 127, 255})); connect(Air_source.ports[1], analyticWetExchanger.port_in_A) annotation ( Line(points = {{0, -50}, {16, -50}, {16, -18}, {16, -18}}, color = {0, 127, 255})); -end test_AnalyticWetExchanger; + +end test_AnalyticWetExchanger; \ No newline at end of file diff --git a/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo b/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo index 472b78c..c64408c 100644 --- a/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo +++ b/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo @@ -15,4 +15,6 @@ equation Line(points = {{-80, 60}, {-60, 60}, {-60, 14}}, color = {0, 85, 255})); connect(horizontalOpening.port_b, gasNode.flowPort) annotation( Line(points = {{-60, -14}, {-60, -14}, {-60, -60}, {-44, -60}, {-44, -60}}, color = {0, 85, 255})); -end test_HorizontalOpening; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_HorizontalOpening; \ No newline at end of file diff --git a/FluidDynamics/Components/Orifices/test_SimpleOpening.mo b/FluidDynamics/Components/Orifices/test_SimpleOpening.mo index 6998546..b1cb454 100644 --- a/FluidDynamics/Components/Orifices/test_SimpleOpening.mo +++ b/FluidDynamics/Components/Orifices/test_SimpleOpening.mo @@ -12,4 +12,6 @@ equation Line(points = {{-80, 0}, {-14, 0}}, color = {0, 85, 255})); connect(simpleOpening.port_b, atmosphere1.Flowport) annotation( Line(points = {{14, 0}, {80, 0}}, color = {0, 85, 255})); -end test_SimpleOpening; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_SimpleOpening; \ No newline at end of file diff --git a/FluidDynamics/Components/Orifices/test_VerticalOpening.mo b/FluidDynamics/Components/Orifices/test_VerticalOpening.mo index 58f3776..2737d6f 100644 --- a/FluidDynamics/Components/Orifices/test_VerticalOpening.mo +++ b/FluidDynamics/Components/Orifices/test_VerticalOpening.mo @@ -22,4 +22,6 @@ equation Line(points = {{-80, -60}, {-14, -60}, {-14, -60}, {-14, -60}}, color = {0, 85, 255})); connect(verticalOpening1.port_b, atmosphere3.Flowport) annotation( Line(points = {{14, -60}, {80, -60}, {80, -60}, {80, -60}}, color = {0, 85, 255})); -end test_VerticalOpening; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_VerticalOpening; \ No newline at end of file diff --git a/FluidDynamics/Components/Pipes/test_StaticPipe.mo b/FluidDynamics/Components/Pipes/test_StaticPipe.mo index e2c8a42..d1c322a 100644 --- a/FluidDynamics/Components/Pipes/test_StaticPipe.mo +++ b/FluidDynamics/Components/Pipes/test_StaticPipe.mo @@ -12,4 +12,6 @@ equation Line(points = {{-80, 8}, {-60, 8}, {-60, 0}, {-20, 0}, {-20, 0}}, color = {0, 127, 255})); connect(pipe.port_b, atmosphere1.Fluidport[1]) annotation( Line(points = {{20, 0}, {60, 0}, {60, 8}, {80, 8}, {80, 8}}, color = {0, 127, 255})); -end test_StaticPipe; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_StaticPipe; \ No newline at end of file diff --git a/FluidDynamics/Components/Valves/test_CommissioningDamper.mo b/FluidDynamics/Components/Valves/test_CommissioningDamper.mo index a8e487c..dfd23ee 100644 --- a/FluidDynamics/Components/Valves/test_CommissioningDamper.mo +++ b/FluidDynamics/Components/Valves/test_CommissioningDamper.mo @@ -14,4 +14,6 @@ equation connect(commissioningDamper.port_b, sink.ports[1]) annotation( Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255})); -end test_CommissioningDamper; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_CommissioningDamper; \ No newline at end of file diff --git a/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo b/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo index a5babd0..74b0ac2 100644 --- a/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo +++ b/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo @@ -18,4 +18,6 @@ equation connect(damper.port_b, sink.ports[1]) annotation( Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255})); -end test_Damper_opposedBlades; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Damper_opposedBlades; \ No newline at end of file diff --git a/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo b/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo index 120f449..18e004f 100644 --- a/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo +++ b/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo @@ -18,4 +18,6 @@ equation connect(damper.port_b, sink.ports[1]) annotation( Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255})); -end test_Damper_parallelBlades; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Damper_parallelBlades; \ No newline at end of file diff --git a/FluidDynamics/Components/Valves/test_polynomial.mo b/FluidDynamics/Components/Valves/test_polynomial.mo index 659dff4..da91cf8 100644 --- a/FluidDynamics/Components/Valves/test_polynomial.mo +++ b/FluidDynamics/Components/Valves/test_polynomial.mo @@ -12,4 +12,6 @@ equation pos = ramp.y ; rc = TAeZoSysPro.FluidDynamics.Components.Valves.BaseClasses.ValveCharacteristics.polynomial(pos = pos, c={0,0,1}) ; -end test_polynomial; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_polynomial; \ No newline at end of file diff --git a/FluidDynamics/Functions/test_rootsPolyOrder3.mo b/FluidDynamics/Functions/test_rootsPolyOrder3.mo index 2050c7b..e06e8ab 100644 --- a/FluidDynamics/Functions/test_rootsPolyOrder3.mo +++ b/FluidDynamics/Functions/test_rootsPolyOrder3.mo @@ -15,4 +15,6 @@ equation roots_3rd = TAeZoSysPro.FluidDynamics.Functions.rootsPolyOrder3(a=a, b=b, c=c, d=d) ; roots_2nd = TAeZoSysPro.FluidDynamics.Functions.rootsPolyOrder3(a=0, b=e, c=f, d=g) ; -end test_rootsPolyOrder3; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_rootsPolyOrder3; \ No newline at end of file diff --git a/FluidDynamics/Sources/test_atmosphere.mo b/FluidDynamics/Sources/test_atmosphere.mo index fbb9487..57cc193 100644 --- a/FluidDynamics/Sources/test_atmosphere.mo +++ b/FluidDynamics/Sources/test_atmosphere.mo @@ -22,4 +22,6 @@ equation Line(points = {{-78, -82}, {-22, -82}, {-22, -82}, {-18, -82}}, color = {0, 0, 127})); connect(T.y, atmosphere2.T_in) annotation( Line(points = {{-78, -20}, {-20, -20}, {-20, -20}, {-18, -20}}, color = {0, 0, 127})); -end test_atmosphere; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_atmosphere; \ No newline at end of file diff --git a/HeatTransfer/BaseClasses/test_CarrollRadiation.mo b/HeatTransfer/BaseClasses/test_CarrollRadiation.mo index 7b2219a..ffe4e23 100644 --- a/HeatTransfer/BaseClasses/test_CarrollRadiation.mo +++ b/HeatTransfer/BaseClasses/test_CarrollRadiation.mo @@ -42,4 +42,4 @@ equation Line(points = {{10, 70}, {30, 70}, {30, 0}, {40, 0}}, color = {191, 0, 0})); annotation( experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.1)); -end test_CarrollRadiation; +end test_CarrollRadiation; \ No newline at end of file diff --git a/HeatTransfer/BaseClasses/test_Conduction.mo b/HeatTransfer/BaseClasses/test_Conduction.mo index 0a30b8e..9c90da1 100644 --- a/HeatTransfer/BaseClasses/test_Conduction.mo +++ b/HeatTransfer/BaseClasses/test_Conduction.mo @@ -1,23 +1,23 @@ within TAeZoSysPro_testsuite.HeatTransfer.BaseClasses; model test_Conduction - Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_a(T = 303.15) annotation ( + Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_a(T = 303.15) annotation( Placement(visible = true, transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_b(T = 293.15) annotation ( + Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_b(T = 293.15) annotation( Placement(visible = true, transformation(origin = {70, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_linear(A = 1, Th = 0.2, k = 2.3) annotation ( + TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_linear(A = 1, Th = 0.2, k = 2.3) annotation( Placement(visible = true, transformation(origin = {0, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_cylindric(L = 1 / (2 * 3.14 * conduction_cylindric.Ri), Ri = 0.5, Th = 0.2, conduction = TAeZoSysPro.HeatTransfer.BasesClasses.Conduction.ConductionType.Radial, k = 2.3) annotation ( + TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_cylindric(L = 1 / (2 * 3.14 * conduction_cylindric.Ri), Ri = 0.5, Th = 0.2, conduction = TAeZoSysPro.HeatTransfer.BasesClasses.Conduction.ConductionType.Radial, k = 2.3) annotation( Placement(visible = true, transformation(origin = {0, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); equation - connect(conduction_linear.port_b, T_port_b.port) annotation ( + connect(conduction_linear.port_b, T_port_b.port) annotation( Line(points = {{10, 30}, {40, 30}, {40, 0}, {60, 0}, {60, 0}}, color = {191, 0, 0})); - connect(T_port_a.port, conduction_linear.port_a) annotation ( + connect(T_port_a.port, conduction_linear.port_a) annotation( Line(points = {{-60, 0}, {-40, 0}, {-40, 30}, {-10, 30}, {-10, 30}}, color = {191, 0, 0})); - connect(conduction_cylindric.port_b, T_port_b.port) annotation ( + connect(conduction_cylindric.port_b, T_port_b.port) annotation( Line(points = {{10, -30}, {40, -30}, {40, 0}, {60, 0}, {60, 0}}, color = {191, 0, 0})); - connect(T_port_a.port, conduction_cylindric.port_a) annotation ( + connect(T_port_a.port, conduction_cylindric.port_a) annotation( Line(points = {{-60, 0}, {-40, 0}, {-40, -30}, {-10, -30}, {-10, -30}}, color = {191, 0, 0})); -annotation ( - experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); -end test_Conduction; + annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002)); +end test_Conduction; \ No newline at end of file diff --git a/HeatTransfer/BaseClasses/test_ForcedConvection.mo b/HeatTransfer/BaseClasses/test_ForcedConvection.mo index 60ff056..ee6370e 100644 --- a/HeatTransfer/BaseClasses/test_ForcedConvection.mo +++ b/HeatTransfer/BaseClasses/test_ForcedConvection.mo @@ -1,23 +1,23 @@ within TAeZoSysPro_testsuite.HeatTransfer.BaseClasses; model test_ForcedConvection - Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_wall(T = 303.15) annotation( + Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_wall(T = 303.15) annotation( Placement(visible = true, transformation(origin = {-50, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_fluid(T = 293.15) annotation( + Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_fluid(T = 293.15) annotation( Placement(visible = true, transformation(origin = {70, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0))); - Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow fixedHeatFlow1(Q_flow = 383) annotation( + Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow fixedHeatFlow1(Q_flow = 383) annotation( Placement(visible = true, transformation(origin = {-50, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection1(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.flat_plate_ASHRAE) annotation( + TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection1(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.flat_plate_ASHRAE) annotation( Placement(visible = true, transformation(origin = {0, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection2(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.crossFlow_cylinder_ASHRAE) annotation( + TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection2(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.crossFlow_cylinder_ASHRAE) annotation( Placement(visible = true, transformation(origin = {0, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection3(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.internal_pipe_ASHRAE) annotation( + TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection3(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.internal_pipe_ASHRAE) annotation( Placement(visible = true, transformation(origin = {0, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection4(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.Constant, h_cv_const = 100) annotation( + TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection4(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.Constant, h_cv_const = 100) annotation( Placement(visible = true, transformation(origin = {0, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection5(A = 1) annotation( + TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection5(A = 1) annotation( Placement(visible = true, transformation(origin = {0, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Blocks.Sources.Constant Velocity(k = 10) annotation( + Modelica.Blocks.Sources.Constant Velocity(k = 10) annotation( Placement(visible = true, transformation(origin = {70, 90}, extent = {{10, -10}, {-10, 10}}, rotation = 0))); equation connect(Velocity.y, forcedConvection5.Vel) annotation( @@ -50,8 +50,6 @@ equation Line(points = {{-40, 50}, {-10, 50}, {-10, 50}, {-10, 50}}, color = {191, 0, 0})); connect(T_wall.port, forcedConvection1.port_a) annotation( Line(points = {{-40, 50}, {-30, 50}, {-30, 70}, {-10, 70}, {-10, 70}}, color = {191, 0, 0})); - -annotation( - experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.1)); - -end test_ForcedConvection; + annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.1)); +end test_ForcedConvection; \ No newline at end of file diff --git a/HeatTransfer/BaseClasses/test_FreeConvection.mo b/HeatTransfer/BaseClasses/test_FreeConvection.mo index 80415d0..0f5514e 100644 --- a/HeatTransfer/BaseClasses/test_FreeConvection.mo +++ b/HeatTransfer/BaseClasses/test_FreeConvection.mo @@ -50,4 +50,6 @@ equation Line(points = {{-40, -50}, {-10, -50}, {-10, -50}, {-10, -50}}, color = {191, 0, 0})); connect(freeConvection2.port_b, T_fluid.port) annotation( Line(points = {{10, -50}, {30, -50}, {30, 0}, {40, 0}, {40, 0}}, color = {191, 0, 0})); -end test_FreeConvection; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_FreeConvection; \ No newline at end of file diff --git a/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo b/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo index 351f932..1e90b39 100644 --- a/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo +++ b/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo @@ -20,4 +20,6 @@ equation Line(points = {{20, 50}, {0, 50}, {0, 8}, {0, 8}}, color = {0, 0, 127})); connect(T_fluid.port, temperatureSensor.port) annotation( Line(points = {{80, 50}, {40, 50}, {40, 50}, {40, 50}}, color = {191, 0, 0})); -end test_FreeConvection_dT_decoupled; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_FreeConvection_dT_decoupled; \ No newline at end of file diff --git a/HeatTransfer/BaseClasses/test_LumpVolume.mo b/HeatTransfer/BaseClasses/test_LumpVolume.mo index f415cde..102aae6 100644 --- a/HeatTransfer/BaseClasses/test_LumpVolume.mo +++ b/HeatTransfer/BaseClasses/test_LumpVolume.mo @@ -40,4 +40,6 @@ equation Line(points = {{60, 0}, {80, 0}, {80, 0}, {80, 0}}, color = {191, 0, 0})); connect(lumpVolume2.port_a, thermalConductor1.port_a) annotation( Line(points = {{0, 0}, {40, 0}, {40, 0}, {40, 0}}, color = {191, 0, 0})); -end test_LumpVolume; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_LumpVolume; \ No newline at end of file diff --git a/HeatTransfer/BaseClasses/test_PartialWall.mo b/HeatTransfer/BaseClasses/test_PartialWall.mo index 40f6d33..234ef78 100644 --- a/HeatTransfer/BaseClasses/test_PartialWall.mo +++ b/HeatTransfer/BaseClasses/test_PartialWall.mo @@ -67,4 +67,6 @@ equation connect(ramp.y, prescribedHeatFlow3.Q_flow) annotation( Line(points = {{-78, 50}, {-70, 50}, {-70, -70}, {-50, -70}, {-50, -70}}, color = {0, 0, 127})); -end test_PartialWall; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_PartialWall; \ No newline at end of file diff --git a/HeatTransfer/Components/test_CabinetPower.mo b/HeatTransfer/Components/test_CabinetPower.mo index 28e59cc..e4f143c 100644 --- a/HeatTransfer/Components/test_CabinetPower.mo +++ b/HeatTransfer/Components/test_CabinetPower.mo @@ -22,4 +22,6 @@ equation Line(points = {{0, 22}, {0, 30}, {40, 30}, {40, 0}, {60, 0}}, color = {191, 0, 0})); connect(heatLoad.y, cabinetPower.Heatload_Variable) annotation( Line(points = {{-18, -50}, {0, -50}, {0, -20}, {0, -20}}, color = {0, 0, 127})); -end test_CabinetPower; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_CabinetPower; \ No newline at end of file diff --git a/HeatTransfer/Components/test_FanVentilation.mo b/HeatTransfer/Components/test_FanVentilation.mo index 89a8676..748d285 100644 --- a/HeatTransfer/Components/test_FanVentilation.mo +++ b/HeatTransfer/Components/test_FanVentilation.mo @@ -29,4 +29,6 @@ equation Line(points = {{-58, 90}, {-22, 90}, {-22, 58}, {-10, 58}, {-10, 58}}, color = {0, 0, 127})); connect(V_flow.y, fanVentilation2.V_flow_in) annotation( Line(points = {{-58, -70}, {-22, -70}, {-22, -58}, {-10, -58}, {-10, -58}}, color = {0, 0, 127})); -end test_FanVentilation; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_FanVentilation; \ No newline at end of file diff --git a/HeatTransfer/Components/test_FviewCalculator.mo b/HeatTransfer/Components/test_FviewCalculator.mo index 53f592e..97fe160 100644 --- a/HeatTransfer/Components/test_FviewCalculator.mo +++ b/HeatTransfer/Components/test_FviewCalculator.mo @@ -53,4 +53,6 @@ equation connect(Ta.port, carrollRadiation_a.port_a) annotation( Line(points = {{-60, -90}, {-40, -90}, {-40, -60}, {-40, -60}}, color = {191, 0, 0})); -end test_FviewCalculator; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_FviewCalculator; \ No newline at end of file diff --git a/HeatTransfer/Components/test_HalfWall.mo b/HeatTransfer/Components/test_HalfWall.mo index 2fc234b..d2ff0b1 100644 --- a/HeatTransfer/Components/test_HalfWall.mo +++ b/HeatTransfer/Components/test_HalfWall.mo @@ -1,11 +1,11 @@ within TAeZoSysPro_testsuite.HeatTransfer.Components; model test_HalfWall - TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall1(A = 1, Lc = 1, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.FixedInitial, eps = 1, h_cv_const = 1, k = 0.1) annotation ( + TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall1(A = 1, Lc = 1, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.FixedInitial, eps = 1, h_cv_const = 1, k = 0.1) annotation( Placement(visible = true, transformation(origin = {1, 49}, extent = {{-21, -21}, {21, 21}}, rotation = 0))); - Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature1(T = 303.15) annotation( + Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature1(T = 303.15) annotation( Placement(visible = true, transformation(origin = {-70, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall2(A = 1, Lc = 1, N = 5, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.SteadyState, eps = 1, h_cv_const = 1, k = 0.1, mesh = TAeZoSysPro.HeatTransfer.Types.MeshGrid.uniform) annotation ( + TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall2(A = 1, Lc = 1, N = 5, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.SteadyState, eps = 1, h_cv_const = 1, k = 0.1, mesh = TAeZoSysPro.HeatTransfer.Types.MeshGrid.uniform) annotation( Placement(visible = true, transformation(origin = {-1, -51}, extent = {{-21, -21}, {21, 21}}, rotation = 0))); Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature3(T = 293.15) annotation( Placement(visible = true, transformation(origin = {70, -50}, extent = {{10, -10}, {-10, 10}}, rotation = 0))); @@ -26,6 +26,6 @@ equation Line(points = {{-60, 50}, {-40, 50}, {-40, 30}, {-18, 30}, {-18, 30}}, color = {191, 0, 0})); connect(fixedTemperature3.port, halfWall2.port_b) annotation( Line(points = {{60, -50}, {18, -50}, {18, -50}, {18, -50}}, color = {191, 0, 0})); -annotation( - experiment(StartTime = 0, StopTime = 600, Tolerance = 1e-6, Interval = 1)); -end test_HalfWall; + annotation( + experiment(StartTime = 0, StopTime = 600, Tolerance = 1e-06, Interval = 1)); +end test_HalfWall; \ No newline at end of file diff --git a/HeatTransfer/Components/test_HeatExchanger.mo b/HeatTransfer/Components/test_HeatExchanger.mo index 8e8dac5..7d2685b 100644 --- a/HeatTransfer/Components/test_HeatExchanger.mo +++ b/HeatTransfer/Components/test_HeatExchanger.mo @@ -22,4 +22,6 @@ equation Line(points = {{-60, 30}, {-40, 30}, {-40, 0}, {-20, 0}}, color = {191, 0, 0})); connect(T_air_in.port, heatExchanger1.port_B_in) annotation( Line(points = {{40, -50}, {14, -50}, {14, -18}, {14, -18}}, color = {191, 0, 0})); -end test_HeatExchanger; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_HeatExchanger; \ No newline at end of file diff --git a/HeatTransfer/Components/test_InertMass.mo b/HeatTransfer/Components/test_InertMass.mo index 904aad8..2883ae1 100644 --- a/HeatTransfer/Components/test_InertMass.mo +++ b/HeatTransfer/Components/test_InertMass.mo @@ -14,4 +14,6 @@ equation Line(points = {{-60, 30}, {-40, 30}, {-40, 14}, {-20, 14}, {-20, 14}}, color = {191, 0, 0})); connect(fixedTemperature.port, inertMass.port_a_rad) annotation( Line(points = {{-60, 30}, {-40, 30}, {-40, -16}, {-20, -16}, {-20, -18}}, color = {191, 0, 0})); -end test_InertMass; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_InertMass; \ No newline at end of file diff --git a/HeatTransfer/Components/test_Ventilation.mo b/HeatTransfer/Components/test_Ventilation.mo index 9daab8f..bd95e9b 100644 --- a/HeatTransfer/Components/test_Ventilation.mo +++ b/HeatTransfer/Components/test_Ventilation.mo @@ -28,4 +28,6 @@ equation Line(points = {{10, 50}, {34, 50}, {34, 0}, {60, 0}, {60, 0}}, color = {191, 0, 0})); connect(ventilation2.port_b, fixedHeatFlow1.port) annotation( Line(points = {{10, -50}, {60, -50}, {60, -50}, {60, -50}}, color = {191, 0, 0})); -end test_Ventilation; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Ventilation; \ No newline at end of file diff --git a/HeatTransfer/Components/test_Wall.mo b/HeatTransfer/Components/test_Wall.mo index fb56144..cd8921d 100644 --- a/HeatTransfer/Components/test_Wall.mo +++ b/HeatTransfer/Components/test_Wall.mo @@ -59,4 +59,6 @@ equation connect(fixedTemperature5.port, wall2.port_b_rad) annotation( Line(points = {{60, -80}, {40, -80}, {40, -98}, {18, -98}, {18, -98}}, color = {191, 0, 0})); -end test_Wall; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_Wall; \ No newline at end of file diff --git a/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo b/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo index 88c2c98..9cc6582 100644 --- a/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo +++ b/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo @@ -28,4 +28,6 @@ equation h_B = TAeZoSysPro.HeatTransfer.Functions.ForcedConvection.flat_plate_ASHRAE(Re = Re_B, Pr=Pr_B)* k_B / Lc_B ; -end test_from_correlations; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_from_correlations; \ No newline at end of file diff --git a/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo b/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo index 669b56e..7e25923 100644 --- a/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo +++ b/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo @@ -21,4 +21,6 @@ model test_biotAndGeometricalGrowthGrid equation -end test_biotAndGeometricalGrowthGrid; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_biotAndGeometricalGrowthGrid; \ No newline at end of file diff --git a/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo b/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo index 2537a02..31a64f2 100644 --- a/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo +++ b/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo @@ -21,4 +21,6 @@ model test_biotAndUniformGrid equation -end test_biotAndUniformGrid; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_biotAndUniformGrid; \ No newline at end of file diff --git a/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo b/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo index d4f4a66..07c0c3b 100644 --- a/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo +++ b/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo @@ -22,4 +22,6 @@ model test_geometricalGrowthGrid equation -end test_geometricalGrowthGrid ; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_geometricalGrowthGrid ; \ No newline at end of file diff --git a/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo b/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo index 25dbc00..93e68bc 100644 --- a/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo +++ b/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo @@ -8,4 +8,6 @@ model test_uniformGrid equation -end test_uniformGrid; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_uniformGrid; \ No newline at end of file diff --git a/HeatTransfer/Sensors/test_density.mo b/HeatTransfer/Sensors/test_density.mo index 9d8d0a5..9dbd966 100644 --- a/HeatTransfer/Sensors/test_density.mo +++ b/HeatTransfer/Sensors/test_density.mo @@ -3,15 +3,15 @@ within TAeZoSysPro_testsuite.HeatTransfer.Sensors; model test_density TAeZoSysPro.HeatTransfer.Sensors.Density density annotation( Placement(visible = true, transformation(origin = {-3.55271e-15, 3.55271e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); - Modelica.Blocks.Sources.Constant pressure(k = 101325) annotation( + Modelica.Blocks.Sources.Constant pressure(k = 101325) annotation( Placement(visible = true, transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); - Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 293.15) annotation( + Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 293.15) annotation( Placement(visible = true, transformation(origin = {-30, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); equation connect(pressure.y, density.p) annotation( Line(points = {{-58, 0}, {-20, 0}, {-20, 0}, {-20, 0}}, color = {0, 0, 127})); connect(fixedTemperature.port, density.port) annotation( Line(points = {{-20, -50}, {0, -50}, {0, -20}, {0, -20}}, color = {191, 0, 0})); -annotation( - experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); -end test_density; + annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002)); +end test_density; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_T_phX.mo b/Media/SimpleMoistAir/test_T_phX.mo index c84b8b5..3738d7e 100644 --- a/Media/SimpleMoistAir/test_T_phX.mo +++ b/Media/SimpleMoistAir/test_T_phX.mo @@ -25,5 +25,6 @@ equation annotation ( Icon(coordinateSystem(preserveAspectRatio=false)), - Diagram(coordinateSystem(preserveAspectRatio=false))); -end test_T_phX; + Diagram(coordinateSystem(preserveAspectRatio=false)), + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_T_phX; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_cp.mo b/Media/SimpleMoistAir/test_cp.mo index cdd5ad7..751dd49 100644 --- a/Media/SimpleMoistAir/test_cp.mo +++ b/Media/SimpleMoistAir/test_cp.mo @@ -13,4 +13,6 @@ equation state = TAeZoSysPro.Media.Air.MoistAir.setState_pTX(p = p, T = T, X={0.01, 0.99}); cp = Medium.specificHeatCapacityCp(state) ; -end test_cp; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_cp; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_d_phX.mo b/Media/SimpleMoistAir/test_d_phX.mo index 0fe85c1..7f38c37 100644 --- a/Media/SimpleMoistAir/test_d_phX.mo +++ b/Media/SimpleMoistAir/test_d_phX.mo @@ -18,4 +18,6 @@ equation d_guess = Medium.d_phX(p=p, h=h, X=X) annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false))); -end test_d_phX; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_d_phX; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_pressure.mo b/Media/SimpleMoistAir/test_pressure.mo index 640bdc5..ce518fe 100644 --- a/Media/SimpleMoistAir/test_pressure.mo +++ b/Media/SimpleMoistAir/test_pressure.mo @@ -20,5 +20,6 @@ equation p_guess = Medium.pressure(state); annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end test_pressure; + coordinateSystem(preserveAspectRatio=false)), + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_pressure; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_r_dTX.mo b/Media/SimpleMoistAir/test_r_dTX.mo index c1334ec..552f0cd 100644 --- a/Media/SimpleMoistAir/test_r_dTX.mo +++ b/Media/SimpleMoistAir/test_r_dTX.mo @@ -10,4 +10,4 @@ equation R = TAeZoSysPro.Media.Air.MoistAir.r_dTX(d = d, T = T, X = X); annotation( experiment(StartTime = 0, StopTime = 100, Tolerance = 1e-06, Interval = 0.2)); -end test_r_dTX; +end test_r_dTX; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_saturationDensity.mo b/Media/SimpleMoistAir/test_saturationDensity.mo index c8a7764..f76c39d 100644 --- a/Media/SimpleMoistAir/test_saturationDensity.mo +++ b/Media/SimpleMoistAir/test_saturationDensity.mo @@ -7,4 +7,6 @@ model test_saturationDensity equation d_sat = TAeZoSysPro.Media.Air.MoistAir.saturationDensity(T); d_sat_IF97 = Modelica.Media.Water.IF97_Utilities.BaseIF97.Regions.rhov_T(T); -end test_saturationDensity; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_saturationDensity; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_saturationPressure.mo b/Media/SimpleMoistAir/test_saturationPressure.mo index 3913cc0..9059d91 100644 --- a/Media/SimpleMoistAir/test_saturationPressure.mo +++ b/Media/SimpleMoistAir/test_saturationPressure.mo @@ -12,4 +12,4 @@ equation p = TAeZoSysPro.Media.Air.MoistAir.saturationPressure(T); annotation( experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-06, Interval = 0.005)); -end test_saturationPressure; +end test_saturationPressure; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_saturationPressureLiquid.mo b/Media/SimpleMoistAir/test_saturationPressureLiquid.mo index 5128518..a804b1c 100644 --- a/Media/SimpleMoistAir/test_saturationPressureLiquid.mo +++ b/Media/SimpleMoistAir/test_saturationPressureLiquid.mo @@ -10,4 +10,6 @@ equation T = 273.15 + time; p = TAeZoSysPro.Media.Air.MoistAir.saturationPressureLiquid(T); -end test_saturationPressureLiquid; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_saturationPressureLiquid; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo b/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo index f2fa8ae..a24469e 100644 --- a/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo +++ b/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo @@ -1,19 +1,14 @@ within TAeZoSysPro_testsuite.Media.SimpleMoistAir; model test_saturationPressureLiquidDer - - Modelica.SIunits.Temperature T ; + Modelica.SIunits.Temperature T; Modelica.SIunits.Pressure p; Real dpdt, dpdt_num; - equation - T = 273.15 + time; p = TAeZoSysPro.Media.Air.MoistAir.saturationPressureLiquid(T); dpdt = TAeZoSysPro.Media.Air.MoistAir.saturationPressureLiquid_der(T, der(T)); dpdt_num = der(p); - - -annotation( - experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); -end test_saturationPressureLiquidDer; + annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002)); +end test_saturationPressureLiquidDer; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_sublimationPressureIce.mo b/Media/SimpleMoistAir/test_sublimationPressureIce.mo index ee3e849..cfc0e17 100644 --- a/Media/SimpleMoistAir/test_sublimationPressureIce.mo +++ b/Media/SimpleMoistAir/test_sublimationPressureIce.mo @@ -11,4 +11,6 @@ equation p = TAeZoSysPro.Media.Air.MoistAir.sublimationPressureIce(T); -end test_sublimationPressureIce; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_sublimationPressureIce; \ No newline at end of file diff --git a/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo b/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo index c17d2a1..95d9304 100644 --- a/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo +++ b/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo @@ -13,4 +13,6 @@ equation dpdt = TAeZoSysPro.Media.Air.MoistAir.sublimationPressureIce_der(T, der(T)); dpdt_num = der(p); -end test_sublimationPressureIceDer; +annotation( + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); +end test_sublimationPressureIceDer; \ No newline at end of file diff --git a/PDE/test_UpwindFirstOrder.mo b/PDE/test_UpwindFirstOrder.mo index 3037b02..f045864 100644 --- a/PDE/test_UpwindFirstOrder.mo +++ b/PDE/test_UpwindFirstOrder.mo @@ -1,26 +1,16 @@ within TAeZoSysPro_testsuite.PDE; model test_UpwindFirstOrder - parameter Modelica.SIunits.Length L = 1 "Length of the domain"; parameter Integer N = 5 "Number of discrete layer"; Modelica.SIunits.Velocity Vel; - - TAeZoSysPro.PDE.Transport.UpwindFirstOrder transport( - CoeffTimeDer = 1, - CoeffSpaceDer = Vel, - N = N, - N_quantity = 2, - x = linspace(0, L, N+1), - SourceTerm = fill(0.0, N)) annotation( + TAeZoSysPro.PDE.Transport.UpwindFirstOrder transport(CoeffTimeDer = 1, CoeffSpaceDer = Vel, N = N, N_quantity = 2, x = linspace(0, L, N + 1), SourceTerm = fill(0.0, N)) annotation( Placement(visible = true, transformation(origin = {0, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); - Modelica.Blocks.Sources.Pulse pulse(amplitude = -2, offset = 1, period = 4, startTime = 2) annotation( + Modelica.Blocks.Sources.Pulse pulse(amplitude = -2, offset = 1, period = 4, startTime = 2) annotation( Placement(visible = true, transformation(origin = {-60, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); initial equation - transport.u[:, 1] = fill(0.0, N); transport.u[:, 2] = fill(0.0, N); - equation // Vel = pulse.y; @@ -28,5 +18,5 @@ equation transport.u_ghost_left[:] = fill(1.0, 2); transport.u_ghost_right[:] = fill(2.0, 2); annotation( - experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002)); -end test_UpwindFirstOrder; + experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002)); +end test_UpwindFirstOrder; \ No newline at end of file -- GitLab