Updated medium for #147

ibpsa · Jan 9, 2015 · d159905 · d159905
1 parent f7eadc4
commit d159905
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/Annex60/Fluid/Movers/Examples/BaseClasses/FlowMachine_ZeroFlow.mo b/Annex60/Fluid/Movers/Examples/BaseClasses/FlowMachine_ZeroFlow.mo
@@ -3,7 +3,7 @@ partial model FlowMachine_ZeroFlow
   "Base class to test flow machines with zero flow rate"
 
   replaceable package Medium =
-    Annex60.Media.GasesPTDecoupled.MoistAirUnsaturated
+    Annex60.Media.Air
       constrainedby Modelica.Media.Interfaces.PartialMedium "Medium model";
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1

diff --git a/Annex60/Fluid/Movers/Examples/ClosedLoop_y.mo b/Annex60/Fluid/Movers/Examples/ClosedLoop_y.mo
@@ -2,7 +2,7 @@ within Annex60.Fluid.Movers.Examples;
 model ClosedLoop_y "Flow machine with feedback control"
   extends Modelica.Icons.Example;
 
-  package Medium = Annex60.Media.GasesPTDecoupled.MoistAirUnsaturated;
+  package Medium = Annex60.Media.Air;
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1
     "Nominal mass flow rate";

diff --git a/Annex60/Fluid/Movers/Examples/PumpsParallel.mo b/Annex60/Fluid/Movers/Examples/PumpsParallel.mo
@@ -2,7 +2,7 @@ within Annex60.Fluid.Movers.Examples;
 model PumpsParallel "Two flow machines in parallel"
   extends Modelica.Icons.Example;
 
-  package Medium = Annex60.Media.ConstantPropertyLiquidWater "Medium model";
+  package Medium = Annex60.Media.Water.Simple "Medium model";
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1
     "Nominal mass flow rate";

diff --git a/Annex60/Fluid/Movers/Examples/PumpsSeries.mo b/Annex60/Fluid/Movers/Examples/PumpsSeries.mo
@@ -1,7 +1,7 @@
 within Annex60.Fluid.Movers.Examples;
 model PumpsSeries "Two flow machines in series"
   extends Modelica.Icons.Example;
-  package Medium = Annex60.Media.ConstantPropertyLiquidWater;
+  package Medium = Annex60.Media.Water.Simple;
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal=
      1 "Nominal mass flow rate";

diff --git a/Annex60/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo b/Annex60/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo
@@ -2,7 +2,7 @@ within Annex60.Fluid.Movers.Examples;
 model SpeedControlled_y_pumpCurves
   "Pumps that illustrates the use of the pump curves"
   extends Modelica.Icons.Example;
-  package Medium = Annex60.Media.ConstantPropertyLiquidWater "Medium model";
+  package Medium = Annex60.Media.Water.Simple "Medium model";
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5
     "Nominal mass flow rate";

diff --git a/Annex60/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo b/Annex60/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
@@ -1,7 +1,7 @@
 within Annex60.Fluid.Movers.Validation.BaseClasses;
 model ControlledFlowMachine
 
-  package Medium = Annex60.Media.IdealGases.SimpleAir;
+  package Medium = Annex60.Media.Air;
 
   Modelica.Blocks.Sources.Pulse y(
     startTime=0,

diff --git a/Annex60/Fluid/Movers/Validation/Power.mo b/Annex60/Fluid/Movers/Validation/Power.mo
@@ -2,7 +2,7 @@ within Annex60.Fluid.Movers.Validation;
 model Power "Power calculation comparison among three mover types"
   extends Modelica.Icons.Example;
 
-  package Medium = Annex60.Media.ConstantPropertyLiquidWater "Medium model";
+  package Medium = Annex60.Media.Water.Simple "Medium model";
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal=3
     "Nominal mass flow rate";

diff --git a/Annex60/Fluid/Movers/Validation/PumpCurveConstruction.mo b/Annex60/Fluid/Movers/Validation/PumpCurveConstruction.mo
@@ -3,7 +3,7 @@ model PumpCurveConstruction
   "Validation model that tests that the pump curve is properly extrapolated to V=0 and dp=0"
   extends Modelica.Icons.Example;
 
-  package Medium = Annex60.Media.ConstantPropertyLiquidWater "Medium model";
+  package Medium = Annex60.Media.Water.Simple "Medium model";
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1
     "Nominal mass flow rate at zero pump head";

diff --git a/Annex60/Fluid/Movers/Validation/Pump_stratos.mo b/Annex60/Fluid/Movers/Validation/Pump_stratos.mo
@@ -2,7 +2,7 @@ within Annex60.Fluid.Movers.Validation;
 model Pump_stratos "Stratos pum with speed as input"
   extends Modelica.Icons.Example;
  extends Annex60.Fluid.Movers.Examples.BaseClasses.FlowMachine_ZeroFlow(
-    redeclare package Medium = Annex60.Media.ConstantPropertyLiquidWater,
+    redeclare package Medium = Annex60.Media.Water.Simple,
     gain(k=floMacSta.per.N_nominal),
     m_flow_nominal=floMacSta.per.pressure.V_flow[3]*1000,
     dp_nominal=floMacSta.per.pressure.dp[3]/2,

diff --git a/Annex60/Fluid/Movers/Validation/SpeedControlled_y_linear.mo b/Annex60/Fluid/Movers/Validation/SpeedControlled_y_linear.mo
@@ -2,7 +2,7 @@ within Annex60.Fluid.Movers.Validation;
 model SpeedControlled_y_linear
   "Pump with linear characteristic for pressure vs. flow rate"
   extends Modelica.Icons.Example;
-  package Medium = Annex60.Media.ConstantPropertyLiquidWater "Medium model";
+  package Medium = Annex60.Media.Water.Simple "Medium model";
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5
     "Nominal mass flow rate";