Merge branch '1348-multiple-fails-in-controls-package-in-openmodelica…

…' of https://github.com/RWTH-EBC/AixLib into 1348-multiple-fails-in-controls-package-in-openmodelica
RWTH-EBC · Oct 13, 2022 · a86511e · a86511e
2 parents 00550bb + 684a266
commit a86511e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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/...les/PumpHydraulicResistance_closedLoop.mo → ...les/PumpHydraulicResistance_closedLoop.mo b/...les/PumpHydraulicResistance_closedLoop.mo → ...les/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
@@ -1,2 +1,3 @@
 PumpRadiatorThermostaticValve
 PumpRadiatorValve
+PumpHydraulicResistance_closedLoop