FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo

@@ -13,10 +13,9 @@ model test_AnalyticWetExchanger
     Placement(visible = true, transformation(origin = {50, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
   Modelica.Fluid.Sources.MassFlowSource_T Water_source(redeclare package Medium = Medium_Liq, T = 273.15 + 5, m_flow = 16.69, nPorts = 1)  annotation (
     Placement(visible = true, transformation(origin = {-50, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-//  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere(redeclare package Medium = Modelica.Media.Air.MoistAir, RH = 0.33, T = 308.15, p = 101325 + 100, nPorts = 1)  annotation (
-//    Placement(visible = true, transformation(origin = {-10, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Fluid.Sources.MassFlowSource_T Air_source(redeclare package Medium =
-        Modelica.Media.Air.MoistAir,                                                                         T = 273.15 + 35, X = {0.011482, 1 - 0.011482}, m_flow = 13.04, nPorts = 1) annotation (
+  //  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere(redeclare package Medium = Modelica.Media.Air.MoistAir, RH = 0.33, T = 308.15, p = 101325 + 100, nPorts = 1)  annotation (
+  //    Placement(visible = true, transformation(origin = {-10, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  Modelica.Fluid.Sources.MassFlowSource_T Air_source(redeclare package Medium = Modelica.Media.Air.MoistAir, T = 273.15 + 35, X = {0.011482, 1 - 0.011482}, m_flow = 13.04, nPorts = 1) annotation(
     Placement(visible = true, transformation(origin = {-10, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(Water_source.ports[1], analyticWetExchanger.port_in_B) annotation (
@@ -27,5 +26,6 @@ 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;
\ No newline at end of file
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_AnalyticWetExchanger;

FluidDynamics/Components/Orifices/package.order

-test_SimpleOpening
 test_VerticalOpening
 test_HorizontalOpening
 test_SimpleOpeningComp

FluidDynamics/Components/Orifices/test_HorizontalOpening.mo

 within TAeZoSysPro_testsuite.FluidDynamics.Components.Orifices;
 
 model test_HorizontalOpening
-  TAeZoSysPro.FluidDynamics.Components.Orifices.HorizontalOpening horizontalOpening(L_down = 0) annotation(
-    Placement(visible = true, transformation(origin = {-60, 4.44089e-16}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  /*replaceable package Medium = Modelica.Media.Air.SimpleAir, */
-  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere(RH = 0) annotation(
+  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere(T = 303.15, use_T_in = true) annotation(
     Placement(visible = true, transformation(origin = {-80, 60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  /*replaceable package Medium = Modelica.Media.Air.SimpleAir*/
-  TAeZoSysPro.FluidDynamics.BasesClasses.GasNode gasNode(RH_start = 0,T_start = 323.15, p_start = 101337) annotation(
-    Placement(visible = true, transformation(origin = {-40, -60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  /*replaceable package Medium = Modelica.Media.Air.SimpleAir, */
+  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere2(T = 101425 * 293.15 / 101325, p = 101425) annotation(
+    Placement(visible = true, transformation(origin = {-80, -60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
+  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere1(T = 283.15) annotation(
+    Placement(visible = true, transformation(origin = {80, 60}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));
+  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere3 annotation(
+    Placement(visible = true, transformation(origin = {80, -60}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));
+  TAeZoSysPro.FluidDynamics.Components.Orifices.HorizontalOpening horizontalOpening annotation(
+    Placement(visible = true, transformation(origin = {-1.77636e-15, 60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
+  TAeZoSysPro.FluidDynamics.Components.Orifices.HorizontalOpening horizontalOpening1 annotation(
+    Placement(visible = true, transformation(origin = {0, -60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
+  Modelica.Blocks.Sources.Ramp ramp(duration = 10, height = -25, offset = 303.15, startTime = 1)  annotation(
+    Placement(visible = true, transformation(origin = {-70, 10}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
 equation
+  connect(horizontalOpening.port_b, atmosphere1.Flowport) annotation(
+    Line(points = {{0, 78}, {47, 78}, {47, 60}, {80, 60}}, color = {0, 85, 255}));
+  connect(atmosphere2.Flowport, horizontalOpening1.port_a) annotation(
+    Line(points = {{-80, -60}, {-47, -60}, {-47, -78}, {0, -78}}, color = {0, 85, 255}));
   connect(atmosphere.Flowport, horizontalOpening.port_a) annotation(
-    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}));
+    Line(points = {{-80, 60}, {-47, 60}, {-47, 42}, {0, 42}}, color = {0, 85, 255}));
+  connect(horizontalOpening1.port_b, atmosphere3.Flowport) annotation(
+    Line(points = {{0, -42}, {47, -42}, {47, -60}, {80, -60}}, color = {0, 85, 255}));
+  connect(ramp.y, atmosphere.T_in) annotation(
+    Line(points = {{-80, 10}, {-120, 10}, {-120, 60}, {-98, 60}}, color = {0, 0, 127}));
 annotation(
-    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
-end test_HorizontalOpening;
\ No newline at end of file
+    experiment(StartTime = 0, StopTime = 12, Tolerance = 1e-6, Interval = 0.024));
+end test_HorizontalOpening;

FluidDynamics/Components/Orifices/test_SimpleOpening.mo

-within TAeZoSysPro_testsuite.FluidDynamics.Components.Orifices;
-
-model test_SimpleOpening
-  TAeZoSysPro.FluidDynamics.Components.Orifices.SimpleOpening simpleOpening annotation(
-    Placement(visible = true, transformation(origin = {-3.55271e-15, 3.55271e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere(p = 101425)  annotation(
-    Placement(visible = true, transformation(origin = {-80, 3.55271e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere1 annotation(
-    Placement(visible = true, transformation(origin = {80, 0}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));
-equation
-  connect(atmosphere.Flowport, simpleOpening.port_a) annotation(
-    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}));
-annotation(
-    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
-end test_SimpleOpening;
\ No newline at end of file

FluidDynamics/Components/Orifices/test_SimpleOpeningComp.mo

@@ -8,7 +8,7 @@ model test_SimpleOpeningComp
     Placement(visible = true, transformation(origin = {-40, 3.55271e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
   TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere1 annotation(
     Placement(visible = true, transformation(origin = {80, 0}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));
-  Modelica.Blocks.Sources.Ramp pressureProfile(duration = 10, height = 101225, offset = 101425)  annotation(
+  Modelica.Blocks.Sources.Ramp pressureProfile(duration = 10, height = 101325, offset = 101325)  annotation(
     Placement(visible = true, transformation(origin = {-90, 12}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(atmosphere.Flowport, simpleOpeningComp.port_a) annotation(
@@ -19,4 +19,4 @@ equation
     Line(points = {{-78, 12}, {-60, 12}, {-60, 12}, {-58, 12}}, color = {0, 0, 127}));
 annotation(
     experiment(StartTime = 0, StopTime = 10, Tolerance = 1e-6, Interval = 0.02));
-end test_SimpleOpeningComp;
+end test_SimpleOpeningComp;
\ No newline at end of file

FluidDynamics/Components/Orifices/test_VerticalOpening.mo

 within TAeZoSysPro_testsuite.FluidDynamics.Components.Orifices;
 
 model test_VerticalOpening
-  TAeZoSysPro.FluidDynamics.Components.Orifices.VerticalOpening verticalOpening annotation(
+  TAeZoSysPro.FluidDynamics.Components.Orifices.Opening verticalOpening annotation(
     Placement(visible = true, transformation(origin = {-1.77636e-15, 60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
   TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere(T = 303.15)  annotation(
     Placement(visible = true, transformation(origin = {-80, 60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
@@ -9,7 +9,7 @@ model test_VerticalOpening
     Placement(visible = true, transformation(origin = {80, 60}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));
   TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere2(T = 101425 * 293.15 / 101325, p = 101425)  annotation(
     Placement(visible = true, transformation(origin = {-80, -60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  TAeZoSysPro.FluidDynamics.Components.Orifices.VerticalOpening verticalOpening1 annotation(
+  TAeZoSysPro.FluidDynamics.Components.Orifices.Opening verticalOpening1 annotation(
     Placement(visible = true, transformation(origin = {0, -60}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
   TAeZoSysPro.FluidDynamics.Sources.Atmosphere atmosphere3 annotation(
     Placement(visible = true, transformation(origin = {80, -60}, extent = {{20, -20}, {-20, 20}}, rotation = 0)));