From fd64897e36cb88971ae2219f8d5e936c3b944861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Larissa=20K=C3=BChn?= Date: Thu, 13 Oct 2022 11:08:10 +0200 Subject: [PATCH] Moved example of obsolete model also in obsolete package --- AixLib/Fluid/Movers/Examples/package.order | 1 - .../Fluid}/Examples/PumpHydraulicResistance_closedLoop.mo | 8 +++++--- AixLib/Obsolete/Year2021/Fluid/Examples/package.order | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) rename AixLib/{Fluid/Movers => Obsolete/Year2021/Fluid}/Examples/PumpHydraulicResistance_closedLoop.mo (93%) diff --git a/AixLib/Fluid/Movers/Examples/package.order b/AixLib/Fluid/Movers/Examples/package.order index 8b83861986..efb6874d3d 100644 --- a/AixLib/Fluid/Movers/Examples/package.order +++ b/AixLib/Fluid/Movers/Examples/package.order @@ -2,7 +2,6 @@ ClosedLoop_y MoverContinuous MoverParameter MoverStages -PumpHydraulicResistance_closedLoop PumpsParallel PumpsSeries SpeedControlled_y_pumpCurves diff --git a/AixLib/Fluid/Movers/Examples/PumpHydraulicResistance_closedLoop.mo b/AixLib/Obsolete/Year2021/Fluid/Examples/PumpHydraulicResistance_closedLoop.mo similarity index 93% rename from AixLib/Fluid/Movers/Examples/PumpHydraulicResistance_closedLoop.mo rename to AixLib/Obsolete/Year2021/Fluid/Examples/PumpHydraulicResistance_closedLoop.mo index ebe79e22c7..a676d88e43 100644 --- a/AixLib/Fluid/Movers/Examples/PumpHydraulicResistance_closedLoop.mo +++ b/AixLib/Obsolete/Year2021/Fluid/Examples/PumpHydraulicResistance_closedLoop.mo @@ -1,4 +1,4 @@ -within AixLib.Fluid.Movers.Examples; +within AixLib.Obsolete.Year2021.Fluid.Examples; model PumpHydraulicResistance_closedLoop "Example with pump, hydraulic resistance and pipes in a closed loop" import AixLib; @@ -12,10 +12,12 @@ model PumpHydraulicResistance_closedLoop ControlStrategy=2, redeclare package Medium = Medium, m_flow_small=1e-4) annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); - Fluid.FixedResistances.HydraulicResistance hydraulicResistance(zeta = 2, + AixLib.Fluid.FixedResistances.HydraulicResistance hydraulicResistance( + zeta=2, redeclare package Medium = Medium, diameter=0.05, - m_flow_nominal=0.001) annotation(Placement(transformation(extent = {{26, 20}, {46, 40}}))); + m_flow_nominal=0.001) + annotation (Placement(transformation(extent={{26,20},{46,40}}))); AixLib.Fluid.FixedResistances.PressureDrop pipe( redeclare package Medium = Medium, m_flow_nominal=0.5, diff --git a/AixLib/Obsolete/Year2021/Fluid/Examples/package.order b/AixLib/Obsolete/Year2021/Fluid/Examples/package.order index 6a8ddbebaa..b0a86450d4 100644 --- a/AixLib/Obsolete/Year2021/Fluid/Examples/package.order +++ b/AixLib/Obsolete/Year2021/Fluid/Examples/package.order @@ -1,2 +1,3 @@ PumpRadiatorThermostaticValve PumpRadiatorValve +PumpHydraulicResistance_closedLoop