From 29e73961c959e2327994d22f431b5b6507a092b7 Mon Sep 17 00:00:00 2001
From: Felix MARSOLLIER <fm4b8dfn@dsp1027505>
Date: Wed, 17 Aug 2022 13:33:50 +0200
Subject: [PATCH] Error correction: missing potential energy transfert
---
FluidDynamics/Components/Orifices/HorizontalOpening.mo | 4 ++--
FluidDynamics/Components/Orifices/Opening.mo | 4 ++--
FluidDynamics/Components/Orifices/SimpleOpeningComp.mo | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/FluidDynamics/Components/Orifices/HorizontalOpening.mo b/FluidDynamics/Components/Orifices/HorizontalOpening.mo
index 8e787db..43843ca 100644
--- a/FluidDynamics/Components/Orifices/HorizontalOpening.mo
+++ b/FluidDynamics/Components/Orifices/HorizontalOpening.mo
@@ -112,8 +112,8 @@ In such a case, the HorizontalOpening is assumed behaves like a VerticalOpening
port_a.H_flow = m_flow_i * TAeZoSysPro.FluidDynamics.Utilities.regStep(
x = Vel,
x_small = 1e-3,
- y1 = h_a,
- y2 = h_b);
+ y1 = h_a + Modelica.Constants.g_n * (Alt_a - Alt_b),
+ y2 = h_b - Modelica.Constants.g_n * (Alt_a - Alt_b));
port_a.H_flow + port_b.H_flow = 0;
annotation(defaultComponentName="opening",
diff --git a/FluidDynamics/Components/Orifices/Opening.mo b/FluidDynamics/Components/Orifices/Opening.mo
index 4f9b6d1..4a3b948 100644
--- a/FluidDynamics/Components/Orifices/Opening.mo
+++ b/FluidDynamics/Components/Orifices/Opening.mo
@@ -103,8 +103,8 @@ equation
port_a.H_flow = m_flow_i * TAeZoSysPro.FluidDynamics.Utilities.regStep(
x = Vel,
x_small = 1e-3,
- y1 = h_a,
- y2 = h_b);
+ y1 = h_a + Modelica.Constants.g_n * (Alt_a - Alt_b),
+ y2 = h_b - Modelica.Constants.g_n * (Alt_a - Alt_b) );
port_a.H_flow + port_b.H_flow = 0;
annotation(defaultComponentName="opening",
diff --git a/FluidDynamics/Components/Orifices/SimpleOpeningComp.mo b/FluidDynamics/Components/Orifices/SimpleOpeningComp.mo
index da5dedb..c1a4273 100644
--- a/FluidDynamics/Components/Orifices/SimpleOpeningComp.mo
+++ b/FluidDynamics/Components/Orifices/SimpleOpeningComp.mo
@@ -91,7 +91,7 @@ equation
y1 = port_a.d/sum(port_a.d),
y2 = port_a.d/sum(port_a.d));
port_a.m_flow + port_b.m_flow = fill(0.0, Medium.nX);
- port_a.H_flow = smooth(0, if dp >= 0.0 then m_flow * h_a else m_flow * h_b);
+ port_a.H_flow = semiLinear(m_flow, h_a + g*(Alt_a - Alt_b), h_b - g*(Alt_a - Alt_b) );
port_a.H_flow + port_b.H_flow = 0;
annotation(defaultComponentName="SimpleOpeningComp",
--
GitLab