20 Sep 2013
@@ -2489,19 +2490,18 @@ This package contains models of a simple Heat Recovery Boiler. Different simulat
model PrescribedSpeedPump "Prescribed speed pump"
replaceable package FluidMedium =
Modelica.Media.Interfaces.PartialTwoPhaseMedium;
- parameter Modelica.SIunits.VolumeFlowRate q_nom[3]
+ parameter Modelica.Units.SI.VolumeFlowRate q_nom[3]
"Nominal volume flow rates";
- parameter Modelica.SIunits.Height head_nom[3] "Nominal heads";
- parameter Modelica.SIunits.Density rho0 "Nominal density";
- parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm n0
- "Nominal rpm";
- parameter Modelica.SIunits.Pressure nominalOutletPressure
+ parameter Modelica.Units.SI.Height head_nom[3] "Nominal heads";
+ parameter Modelica.Units.SI.Density rho0 "Nominal density";
+ parameter Modelica.Units.NonSI.AngularVelocity_rpm n0 "Nominal rpm";
+ parameter Modelica.Units.SI.Pressure nominalOutletPressure
"Nominal live steam pressure";
- parameter Modelica.SIunits.Pressure nominalInletPressure
+ parameter Modelica.Units.SI.Pressure nominalInletPressure
"Nominal condensation pressure";
- parameter Modelica.SIunits.MassFlowRate nominalMassFlowRate
+ parameter Modelica.Units.SI.MassFlowRate nominalMassFlowRate
"Nominal steam mass flow rate";
- parameter Modelica.SIunits.SpecificEnthalpy hstart=1e5
+ parameter Modelica.Units.SI.SpecificEnthalpy hstart=1e5
"Fluid Specific Enthalpy Start Value";
parameter Boolean SSInit=false "Steady-state initialization";
@@ -2572,10 +2572,10 @@ This package contains models of a simple Heat Recovery Boiler. Different simulat
replaceable package Medium = Water.StandardWater constrainedby
Modelica.Media.Interfaces.PartialMedium "Medium model";
//Parameters
- parameter Modelica.SIunits.Pressure p "Nominal inlet pressure";
- parameter Modelica.SIunits.Volume Vtot=10
+ parameter Modelica.Units.SI.Pressure p "Nominal inlet pressure";
+ parameter Modelica.Units.SI.Volume Vtot=10
"Total volume of the fluid side";
- parameter Modelica.SIunits.Volume Vlstart=0.15*Vtot
+ parameter Modelica.Units.SI.Volume Vlstart=0.15*Vtot
"Start value of the liquid water volume"
annotation (Dialog(tab="Initialisation"));
parameter Choices.Init.Options initOpt=system.initOpt
@@ -2586,18 +2586,18 @@ This package contains models of a simple Heat Recovery Boiler. Different simulat
//Variables
- Modelica.SIunits.Density rhol "Density of saturated liquid";
- Modelica.SIunits.Density rhov "Density of saturated steam";
+ Modelica.Units.SI.Density rhol "Density of saturated liquid";
+ Modelica.Units.SI.Density rhov "Density of saturated steam";
Medium.SaturationProperties sat "Saturation properties";
Medium.SpecificEnthalpy hl "Specific enthalpy of saturated liquid";
Medium.SpecificEnthalpy hv "Specific enthalpy of saturated vapour";
- Modelica.SIunits.Mass M "Total mass, steam+liquid";
- Modelica.SIunits.Mass Ml "Liquid mass";
- Modelica.SIunits.Mass Mv "Steam mass";
- Modelica.SIunits.Volume Vl(start=Vlstart) "Liquid volume";
- Modelica.SIunits.Volume Vv "Steam volume";
- Modelica.SIunits.Energy E "Internal energy";
- Modelica.SIunits.Power Q "Thermal power";
+ Modelica.Units.SI.Mass M "Total mass, steam+liquid";
+ Modelica.Units.SI.Mass Ml "Liquid mass";
+ Modelica.Units.SI.Mass Mv "Steam mass";
+ Modelica.Units.SI.Volume Vl(start=Vlstart) "Liquid volume";
+ Modelica.Units.SI.Volume Vv "Steam volume";
+ Modelica.Units.SI.Energy E "Internal energy";
+ Modelica.Units.SI.Power Q "Thermal power";
//Connectors
Water.FlangeA steamIn(redeclare package Medium = Medium) annotation (
diff --git a/ThermoPower/Gas.mo b/ThermoPower/Gas.mo
index 0eb1a97..08a4016 100644
--- a/ThermoPower/Gas.mo
+++ b/ThermoPower/Gas.mo
@@ -2311,21 +2311,21 @@ This model extends the CombustionChamber Base model, with the definition of the
parameter String fileName="noName" "File where matrix is stored";
parameter TableTypes Table = TableTypes.matrix
"Selection of the way of definition of table matrix";
- Modelica.Blocks.Tables.CombiTable2D Eta(
+ Modelica.Blocks.Tables.CombiTable2Ds Eta(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tableEta,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabEta",
fileName=if (Table == TableTypes.matrix) then "NoName" else fileName,
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative)
annotation (Placement(transformation(extent={{-12,60},{8,80}}, rotation=0)));
- Modelica.Blocks.Tables.CombiTable2D PressRatio(
+ Modelica.Blocks.Tables.CombiTable2Ds PressRatio(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tablePR,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabPR",
fileName=if (Table == TableTypes.matrix) then "NoName" else fileName,
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative)
annotation (Placement(transformation(extent={{-12,0},{8,20}}, rotation=0)));
- Modelica.Blocks.Tables.CombiTable2D Phic(
+ Modelica.Blocks.Tables.CombiTable2Ds Phic(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tablePhic,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabPhic",
@@ -2409,7 +2409,7 @@ This model adds the performance characteristics to the Compressor_Base model, by
Real N_T "Referred speed";
Real N_T_design "Referred design speed";
Real phic "Flow number";
- Modelica.Blocks.Tables.CombiTable2D Phic(
+ Modelica.Blocks.Tables.CombiTable2Ds Phic(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tablePhic,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabPhic",
@@ -2417,7 +2417,7 @@ This model adds the performance characteristics to the Compressor_Base model, by
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative)
annotation (Placement(transformation(extent={{-10,10},{10,30}}, rotation=
0)));
- Modelica.Blocks.Tables.CombiTable2D Eta(
+ Modelica.Blocks.Tables.CombiTable2Ds Eta(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tableEta,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabEta",
@@ -2498,7 +2498,7 @@ This model adds the performance characteristics to the Turbine_Base model, by me
Real N_T_design "Referred design speed";
Real phic "Flow number";
- Modelica.Blocks.Tables.CombiTable2D Eta(
+ Modelica.Blocks.Tables.CombiTable2Ds Eta(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tableEta,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabEta",
@@ -2642,28 +2642,28 @@ This model adds the performance characteristics to the GTunit_base model, when o
parameter String fileName="noName" "File where matrix is stored";
parameter TableTypes Table = TableTypes.matrix
"Selection of the way of definition of table matrix";
- Modelica.Blocks.Tables.CombiTable2D PowerOut(
+ Modelica.Blocks.Tables.CombiTable2Ds PowerOut(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tableHI,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabHI",
fileName=if (Table == TableTypes.matrix) then "NoName" else fileName,
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative)
annotation (Placement(transformation(extent={{-12,36},{8,56}}, rotation=0)));
- Modelica.Blocks.Tables.CombiTable2D PressRatio(
+ Modelica.Blocks.Tables.CombiTable2Ds PressRatio(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tablePR,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabPR",
fileName=if (Table == TableTypes.matrix) then "NoName" else fileName,
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative)
annotation (Placement(transformation(extent={{-12,6},{8,26}}, rotation=0)));
- Modelica.Blocks.Tables.CombiTable2D MassFlowRate(
+ Modelica.Blocks.Tables.CombiTable2Ds MassFlowRate(
tableOnFile=if (Table == TableTypes.matrix) then false else true,
table=tableW,
tableName=if (Table == TableTypes.matrix) then "NoName" else "tabW",
fileName=if (Table == TableTypes.matrix) then "NoName" else fileName,
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative)
- annotation (Placement(transformation(extent={{-10,-24},{10,-4}}, rotation=
- 0)));
+ annotation (Placement(transformation(extent={{-10,-24},{10,-4}}, rotation
+ =0)));
SI.Temperature Tsync
"temperature corresponding to omega referred in synchronous conditions";
equation
@@ -2727,7 +2727,7 @@ The packages Medium are redeclared and a mass balance determines the composition
Modelica.Mechanics.Rotational.Interfaces.Flange_a MechPort annotation (
Placement(transformation(extent={{78,6},{108,36}}, rotation=0)));
equation
- n = Modelica.SIunits.Conversions.to_rpm(omega) "Rotational speed";
+ n =Modelica.Units.Conversions.to_rpm(omega) "Rotational speed";
// Mechanical boundary condition
phi = MechPort.phi;
@@ -3362,11 +3362,11 @@ This is the model-base of a Combustion Chamber, with a constant volume.
replaceable package Air = Modelica.Media.Interfaces.PartialMedium;
replaceable package Fuel = Modelica.Media.Interfaces.PartialMedium;
replaceable package Exhaust = Modelica.Media.Interfaces.PartialMedium;
- parameter Modelica.SIunits.Pressure pstart "start pressure value"
+ parameter Modelica.Units.SI.Pressure pstart "start pressure value"
annotation (Dialog(tab="Initialisation"));
parameter Exhaust.Temperature Tstart "start temperature value"
annotation (Dialog(tab="Initialisation"));
- parameter Modelica.SIunits.MassFraction Xstart[Air.nX]=Air.reference_X
+ parameter Modelica.Units.SI.MassFraction Xstart[Air.nX]=Air.reference_X
"start gas composition" annotation (Dialog(tab="Initialisation"));
constant Exhaust.AbsolutePressure pnom=1.013e5 "ISO reference pressure";
constant Air.Temperature Tnom=288.15 "ISO reference temperature";
diff --git a/ThermoPower/PowerPlants.mo b/ThermoPower/PowerPlants.mo
index 0608608..39f0ef8 100644
--- a/ThermoPower/PowerPlants.mo
+++ b/ThermoPower/PowerPlants.mo
@@ -137,40 +137,40 @@ package PowerPlants "Models of thermoelectrical power plants components"
model GasTurbineSimplified
extends
ThermoPower.PowerPlants.GasTurbine.Interfaces.GasTurbineSimplified;
- parameter Modelica.SIunits.Power maxPower=235e6;
- parameter Modelica.SIunits.MassFlowRate flueGasNomFlowRate=614
+ parameter Modelica.Units.SI.Power maxPower=235e6;
+ parameter Modelica.Units.SI.MassFlowRate flueGasNomFlowRate=614
"Nominal flue gas flow rate";
- parameter Modelica.SIunits.MassFlowRate flueGasMinFlowRate=454
+ parameter Modelica.Units.SI.MassFlowRate flueGasMinFlowRate=454
"Minimum flue gas flow rate";
- parameter Modelica.SIunits.MassFlowRate flueGasOffFlowRate=
+ parameter Modelica.Units.SI.MassFlowRate flueGasOffFlowRate=
flueGasMinFlowRate/100 "Flue gas flow rate with GT switched off";
- parameter Modelica.SIunits.MassFlowRate fuelNomFlowRate=12.1
+ parameter Modelica.Units.SI.MassFlowRate fuelNomFlowRate=12.1
"Nominal fuel flow rate";
- parameter Modelica.SIunits.MassFlowRate fuelIntFlowRate=7.08
+ parameter Modelica.Units.SI.MassFlowRate fuelIntFlowRate=7.08
"Intermediate fuel flow rate";
- parameter Modelica.SIunits.MassFlowRate fuelMinFlowRate=4.58
+ parameter Modelica.Units.SI.MassFlowRate fuelMinFlowRate=4.58
"Minimum fuel flow rate";
- parameter Modelica.SIunits.MassFlowRate fuelOffFlowRate=0.1
+ parameter Modelica.Units.SI.MassFlowRate fuelOffFlowRate=0.1
"Flue gas flow rate with GT switched off";
parameter Real constTempLoad=0.60
"Fraction of load from which the temperature is kept constant";
parameter Real intLoad=0.42
"Intermediate load for fuel consumption computations";
- parameter Modelica.SIunits.Temperature flueGasNomTemp=843
+ parameter Modelica.Units.SI.Temperature flueGasNomTemp=843
"Maximum flue gas temperature";
- parameter Modelica.SIunits.Temperature flueGasMinTemp=548
+ parameter Modelica.Units.SI.Temperature flueGasMinTemp=548
"Minimum flue gas temperature (zero electrical load)";
- parameter Modelica.SIunits.Temperature flueGasOffTemp=363.15
+ parameter Modelica.Units.SI.Temperature flueGasOffTemp=363.15
"Flue gas temperature with GT switched off";
- parameter Modelica.SIunits.SpecificEnthalpy fuel_LHV=49e6
+ parameter Modelica.Units.SI.SpecificEnthalpy fuel_LHV=49e6
"Fuel Lower Heating Value";
- parameter Modelica.SIunits.SpecificEnthalpy fuel_HHV=55e6
+ parameter Modelica.Units.SI.SpecificEnthalpy fuel_HHV=55e6
"Fuel Higher Heating Value";
FlueGasMedium.BaseProperties gas;
- Modelica.SIunits.MassFlowRate w;
- Modelica.SIunits.Power P_el=noEvent(if GTLoad > 0 then GTLoad*maxPower
+ Modelica.Units.SI.MassFlowRate w;
+ Modelica.Units.SI.Power P_el=noEvent(if GTLoad > 0 then GTLoad*maxPower
else 0) "Electrical power output";
- Modelica.SIunits.MassFlowRate fuelFlowRate "Fuel flow rate";
+ Modelica.Units.SI.MassFlowRate fuelFlowRate "Fuel flow rate";
equation
gas.p = flueGasOut.p;
gas.Xi = FlueGasMedium.reference_X[1:FlueGasMedium.nXi];
@@ -3936,8 +3936,7 @@ package PowerPlants "Models of thermoelectrical power plants components"
parameter Integer Np0=1 "Nominal number of pumps in parallel";
parameter SI.Volume V=0 "Pump Internal Volume";
parameter SI.Density rho0 "Nominal density";
- parameter SI.Conversions.NonSIunits.AngularVelocity_rpm n0
- "Nominal rpm";
+ parameter Modelica.Units.NonSI.AngularVelocity_rpm n0 "Nominal rpm";
parameter SI.Pressure nominalOutletPressure "Nominal outlet pressure";
parameter SI.Pressure nominalInletPressure "Nominal inlet pressure";
parameter SI.MassFlowRate nominalFlow "Nominal mass flow rate";
@@ -4007,8 +4006,7 @@ package PowerPlants "Models of thermoelectrical power plants components"
parameter Integer Np0=1 "Nominal number of pumps in parallel";
parameter SI.Volume V=0 "Pump Internal Volume";
parameter SI.Density rho0 "Nominal density";
- parameter SI.Conversions.NonSIunits.AngularVelocity_rpm n0
- "Nominal rpm";
+ parameter Modelica.Units.NonSI.AngularVelocity_rpm n0 "Nominal rpm";
parameter SI.Pressure nominalOutletPressure "Nominal outlet pressure";
parameter SI.Pressure nominalInletPressure "Nominal inlet pressure";
parameter SI.MassFlowRate nominalFlow "Nominal mass flow rate";
@@ -4165,8 +4163,7 @@ package PowerPlants "Models of thermoelectrical power plants components"
parameter Integer Np0=1 "Nominal number of pumps in parallel";
parameter SI.Volume V=0 "Pump Internal Volume";
parameter SI.Density rho0 "Nominal density";
- parameter SI.Conversions.NonSIunits.AngularVelocity_rpm n0
- "Nominal rpm";
+ parameter Modelica.Units.NonSI.AngularVelocity_rpm n0 "Nominal rpm";
parameter SI.Pressure nominalOutletPressure "Nominal outlet pressure";
parameter SI.Pressure nominalInletPressure "Nominal inlet pressure";
parameter SI.MassFlowRate nominalFlow "Nominal mass flow rate";
@@ -4630,7 +4627,7 @@ package PowerPlants "Models of thermoelectrical power plants components"
model ConvParallel
"Convective heat transfer between one source and two objects in parallel"
- import Modelica.SIunits.*;
+ import Modelica.Units.SI.*;
extends Modelica.Icons.ObsoleteModel;
parameter Integer N=2 "Number of Nodes";
parameter Area As=Aa + Ab "Area of source" annotation (Evaluate=true);
@@ -13583,7 +13580,7 @@ package PowerPlants "Models of thermoelectrical power plants components"
model PrescribedSpeed "Constant speed, not dependent on torque"
extends Modelica.Mechanics.Rotational.Interfaces.PartialTorque;
- Modelica.SIunits.AngularVelocity w
+ Modelica.Units.SI.AngularVelocity w
"Angular velocity of flange with respect to support (= der(phi))";
Modelica.Blocks.Interfaces.RealInput w_fixed annotation (Placement(
transformation(extent={{-116,44},{-84,76}}, rotation=0)));
@@ -14064,7 +14061,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
//Valves Parameters
parameter Real valveHP_Cv=0 "Cv (US) flow coefficient of the HP valve"
annotation (Dialog(group="HP valves"));
- parameter Modelica.SIunits.Pressure valveHP_dpnom
+ parameter Modelica.Units.SI.Pressure valveHP_dpnom
"Nominal pressure drop of the HP valve"
annotation (Dialog(group="HP valves"));
parameter Real bypassHP_Cv=0
@@ -14072,7 +14069,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
annotation (Dialog(group="HP valves"));
parameter Real valveIP_Cv=0 "Cv (US) flow coefficient of the IP valve"
annotation (Dialog(group="IP valves"));
- parameter Modelica.SIunits.Pressure valveIP_dpnom
+ parameter Modelica.Units.SI.Pressure valveIP_dpnom
"Nominal pressure drop of the IP valve"
annotation (Dialog(group="IP valves"));
parameter Real bypassIP_Cv=0
@@ -14083,7 +14080,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
annotation (Dialog(group="IP valves"));
parameter Real valveLP_Cv=0 "Cv (US) flow coefficient of the LP valve"
annotation (Dialog(group="LP valves"));
- parameter Modelica.SIunits.Pressure valveLP_dpnom
+ parameter Modelica.Units.SI.Pressure valveLP_dpnom
"Nominal pressure drop of the LP valve"
annotation (Dialog(group="LP valves"));
parameter Real bypassLP_Cv=0
@@ -17203,7 +17200,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
//Variable
SI.AngularVelocity omega "Shaft angular velocity";
- SI.Conversions.NonSIunits.AngularVelocity_rpm n "Rotational speed";
+ Modelica.Units.NonSI.AngularVelocity_rpm n "Rotational speed";
SI.Angle delta(start=delta_start) "Loaded angle";
SI.AngularVelocity d_delta "Variation of loaded angle";
SI.AngularVelocity omegaGrid "Angulary velocity in the grid";
@@ -17223,7 +17220,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
D = 2*r*sqrt(Pmax*J*omega_nom*Np/(Np^2));
omega = der(shaft.phi);
Pm = omega*shaft.tau;
- n = Modelica.SIunits.Conversions.to_rpm(omega)
+ n =Modelica.Units.Conversions.to_rpm(omega)
"Rotational speed in rpm";
omegaGrid = 2*Modelica.Constants.pi*powerConnection.f;
powerConnection.W = -Pe;
@@ -17268,7 +17265,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
parameter SI.Angle delta_start "Start value of loaded angle";
SI.AngularVelocity omega "Shaft angular velocity";
- SI.Conversions.NonSIunits.AngularVelocity_rpm n "Rotational speed";
+ Modelica.Units.NonSI.AngularVelocity_rpm n "Rotational speed";
SI.Angle delta(start=delta_start) "Loaded angle";
SI.AngularVelocity d_delta "Variation of loaded angle";
SI.AngularVelocity omegaGrid "Angulary velocity in the grid";
@@ -17287,7 +17284,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
D = 2*r*sqrt(Pmax*J*omega*Np/(Np^2));
omega = der(shaft.phi);
Pm = omega*shaft.tau;
- n = Modelica.SIunits.Conversions.to_rpm(omega)
+ n =Modelica.Units.Conversions.to_rpm(omega)
"Rotational speed in rpm";
omegaGrid = 2*Modelica.Constants.pi*powerConnection.f;
powerConnection.W = -Pe;
@@ -17337,7 +17334,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
"Angulaty velocity of shaft start value";
SI.AngularVelocity omega(start=omega_start) "Shaft angular velocity";
- SI.Conversions.NonSIunits.AngularVelocity_rpm n "Rotational speed";
+ Modelica.Units.NonSI.AngularVelocity_rpm n "Rotational speed";
SI.Angle delta(start=delta_start) "Loaded angle";
SI.AngularVelocity d_delta "Variation of loaded angle";
SI.AngularVelocity omegaGrid "Angulary velocity in the grid";
@@ -17365,7 +17362,7 @@ Model of fixed angular verlocity of flange, not dependent on torque.
D = 2*r*sqrt(Pmax*J*omega_nom*Np/(Np^2));
omega = der(shaft.phi);
Pm = omega*shaft.tau;
- n = Modelica.SIunits.Conversions.to_rpm(omega)
+ n =Modelica.Units.Conversions.to_rpm(omega)
"Rotational speed in rpm";
omegaGrid = 2*Modelica.Constants.pi*powerConnection.f;
powerConnection.W = -Pe;
@@ -18712,8 +18709,8 @@ Model of fixed angular verlocity of flange, not dependent on torque.
model PID "PID controller with anti-windup"
parameter Real Kp "Proportional gain (normalised units)";
- parameter Modelica.SIunits.Time Ti "Integral time";
- parameter Modelica.SIunits.Time Td=0 "Derivative time";
+ parameter Modelica.Units.SI.Time Ti "Integral time";
+ parameter Modelica.Units.SI.Time Td=0 "Derivative time";
parameter Real Nd=1 "Derivative action up to Nd / Td rad/s";
parameter Real Ni=1
"Ni*Ti is the time constant of anti-windup compensation";
diff --git a/ThermoPower/Test.mo b/ThermoPower/Test.mo
index 7c1d382..ba93d44 100644
--- a/ThermoPower/Test.mo
+++ b/ThermoPower/Test.mo
@@ -580,7 +580,7 @@ This test model demonstrate four possible ways of setting the friction coefficie
Modelica.Blocks.Sources.Sine Cmd1(
startTime=0,
amplitude=5,
- freqHz=1,
+ f=1,
offset=0) annotation (Placement(transformation(extent={{-82,10},{-62,30}},
rotation=0)));
inner ThermoPower.System system
@@ -856,7 +856,7 @@ Casella:
transformation(extent={{-10,30},{10,50}}, rotation=0)));
Modelica.Blocks.Sources.Sine Sine1(
amplitude=2.5e5,
- freqHz=0.5,
+ f=0.5,
offset=3e5,
phase=3.14159,
startTime=1) annotation (Placement(transformation(extent={{10,60},{30,
@@ -880,7 +880,7 @@ Casella:
transformation(extent={{-10,-50},{10,-30}}, rotation=0)));
Modelica.Blocks.Sources.Sine Sine2(
amplitude=49.5e5,
- freqHz=0.5,
+ f=0.5,
offset=50e5,
phase=3.14159,
startTime=1) annotation (Placement(transformation(extent={{10,-20},{30,
@@ -1251,13 +1251,13 @@ Casella:
extent={{-90,-70},{-70,-50}}, rotation=0)));
Modelica.Blocks.Sources.Sine Sine1(
amplitude=1,
- freqHz=1,
+ f=1,
phase=pi/2,
offset=0,
startTime=0) annotation (Placement(transformation(extent={{-90,70},{-70,
90}}, rotation=0)));
Modelica.Blocks.Sources.Sine Sine2(
- freqHz=0.5,
+ f=0.5,
amplitude=1,
phase=pi/2,
offset=0,
@@ -1276,14 +1276,14 @@ Casella:
ThermoPower.Water.SensT T6(redeclare package Medium = Medium) annotation (
Placement(transformation(extent={{20,-92},{40,-72}}, rotation=0)));
Modelica.Blocks.Sources.Sine Sine3(
- freqHz=1,
+ f=1,
amplitude=1,
phase=pi/2,
offset=0,
startTime=0) annotation (Placement(transformation(extent={{34,-16},{54,
4}}, rotation=0)));
Modelica.Blocks.Sources.Sine Sine4(
- freqHz=0.5,
+ f=0.5,
amplitude=1,
phase=pi/2,
offset=0,
@@ -2116,14 +2116,14 @@ Casella:
model SimpleMotor
"A simple model of an electrical dc motor (based on DriveLib model)."
- parameter Modelica.SIunits.Resistance Rm=10 "Motor Resistance";
- parameter Modelica.SIunits.Inductance Lm=1 "Motor Inductance";
+ parameter Modelica.Units.SI.Resistance Rm=10 "Motor Resistance";
+ parameter Modelica.Units.SI.Inductance Lm=1 "Motor Inductance";
parameter Real kT=1 "Torque Constant";
- parameter Modelica.SIunits.Inertia Jm=10 "Motor Inertia";
+ parameter Modelica.Units.SI.Inertia Jm=10 "Motor Inertia";
parameter Real dm(
final unit="N.m.s/rad",
final min=0) = 0 "Damping constant";
- Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm n;
+ Modelica.Units.NonSI.AngularVelocity_rpm n;
Modelica.Electrical.Analog.Sources.SignalVoltage Vs annotation (Placement(
transformation(
origin={-70,0},
@@ -2135,8 +2135,8 @@ Casella:
transformation(extent={{-60,30},{-40,50}}, rotation=0)));
Modelica.Electrical.Analog.Basic.Inductor L(L=Lm) annotation (Placement(
transformation(extent={{-20,30},{0,50}}, rotation=0)));
- Modelica.Electrical.Analog.Basic.EMF emf(k=kT) annotation (Placement(
- transformation(extent={{0,-10},{20,10}}, rotation=0)));
+ Modelica.Electrical.Analog.Basic.RotationalEMF emf(k=kT) annotation (
+ Placement(transformation(extent={{0,-10},{20,10}}, rotation=0)));
Modelica.Blocks.Interfaces.RealInput inPort annotation (Placement(
transformation(extent={{-108,-10},{-90,10}}, rotation=0)));
Modelica.Mechanics.Rotational.Components.Inertia J(J=Jm) annotation (
@@ -2151,7 +2151,7 @@ Casella:
extent={{-10,-10},{10,10}},
rotation=90)));
equation
- n = Modelica.SIunits.Conversions.to_rpm(J.w);
+ n =Modelica.Units.Conversions.to_rpm(J.w);
connect(R.n, L.p) annotation (Line(points={{-40,40},{-20,40}}));
connect(L.n, emf.p) annotation (Line(points={{0,40},{10,40},{10,10}}));
connect(emf.flange, J.flange_a) annotation (Line(points={{20,0},{48,0}}));
@@ -3510,7 +3510,7 @@ This model tests the CombustionChamber model. The model start at steady
phase=0,
offset=5e5,
startTime=0.1,
- freqHz=0.2,
+ f=0.2,
amplitude=3e5) annotation (Placement(transformation(extent={{-94,40},{-74,
60}}, rotation=0)));
Gas.SourcePressure
@@ -3555,7 +3555,7 @@ This model tests the CombustionChamber model. The model start at steady
Modelica.Blocks.Sources.Sine Sine2(
phase=0,
startTime=0.1,
- freqHz=0.2,
+ f=0.2,
amplitude=5e5,
offset=7e5) annotation (Placement(transformation(extent={{-96,-32},{-76,
-12}}, rotation=0)));
@@ -3642,7 +3642,7 @@ This model tests the PressDrop, PressDropLin and ValvePressDrop, PressDropLin and ValveGTunit.
Modelica.Media.Air.SimpleAir) annotation (Placement(transformation(
extent={{-98,-10},{-78,10}}, rotation=0)));
Modelica.Mechanics.Rotational.Sources.ConstantSpeed ConstantSpeed1(
- w_fixed=Modelica.SIunits.Conversions.from_rpm(590), useSupport=false)
+ w_fixed=Modelica.Units.Conversions.from_rpm(590), useSupport=false)
annotation (Placement(transformation(extent={{90,-10},{70,10}},
rotation=0)));
function flowChar = Functions.FanCharacteristics.quadraticFlowBlades (
@@ -4818,10 +4818,11 @@ This model tests a simple power plant based on a GTunit.
height=-1,
offset=1) annotation (Placement(transformation(extent={{-30,54},{-10,74}},
rotation=0)));
- Modelica.Mechanics.Rotational.Components.Inertia Inertia1(w(start=
- Modelica.SIunits.Conversions.from_rpm(590)), J=10000,
- phi(fixed=true, start=0)) annotation (
- Placement(transformation(extent={{-20,-10},{0,10}}, rotation=0)));
+ Modelica.Mechanics.Rotational.Components.Inertia Inertia1(
+ w(start=Modelica.Units.Conversions.from_rpm(590)),
+ J=10000,
+ phi(fixed=true, start=0)) annotation (Placement(transformation(extent={
+ {-20,-10},{0,10}}, rotation=0)));
Gas.PressDrop PressDrop1(
wnom=2000*1.229,
FFtype=ThermoPower.Choices.PressDrop.FFtypes.OpPoint,
@@ -4881,24 +4882,24 @@ This model tests a simple power plant based on a GTunit.
replaceable package Medium = Modelica.Media.Water.WaterIF97_ph
constrainedby Modelica.Media.Interfaces.PartialMedium;
parameter Integer Nnodes=20 "Number of nodes";
- parameter Modelica.SIunits.Length Lhex=10 "Total length";
- parameter Modelica.SIunits.Diameter Dihex=0.02 "Internal diameter";
- final parameter Modelica.SIunits.Radius rhex=Dihex/2 "Internal radius";
- final parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex
- "Internal perimeter";
- final parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2
+ parameter Modelica.Units.SI.Length Lhex=10 "Total length";
+ parameter Modelica.Units.SI.Diameter Dihex=0.02 "Internal diameter";
+ final parameter Modelica.Units.SI.Radius rhex=Dihex/2 "Internal radius";
+ final parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*
+ Dihex "Internal perimeter";
+ final parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2
"Internal cross section";
parameter Real Cfhex=0.005 "Friction coefficient";
- parameter Modelica.SIunits.MassFlowRate whex=0.31
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31
"Nominal mass flow rate";
- parameter Modelica.SIunits.Pressure phex=2e5 "Initial pressure";
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5
+ parameter Modelica.Units.SI.Pressure phex=2e5 "Initial pressure";
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5
"Initial inlet specific enthalpy";
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5
"Initial outlet specific enthalpy";
- parameter Modelica.SIunits.SpecificEnthalpy deltah=41800
+ parameter Modelica.Units.SI.SpecificEnthalpy deltah=41800
"Height of enthalpy step";
- parameter Modelica.SIunits.EnergyFlowRate W=41800*whex
+ parameter Modelica.Units.SI.EnergyFlowRate W=41800*whex
"Height of power step";
SI.Time tau "Transport time delay";
@@ -5023,20 +5024,20 @@ This model tests a simple power plant based on a GTunit.
constrainedby Modelica.Media.Interfaces.PartialMedium;
parameter Integer Nnodes=10 "Number of nodes";
parameter Integer Nt = 5 "Number of tubes";
- parameter Modelica.SIunits.Length Lhex=2 "Total length";
- parameter Modelica.SIunits.Diameter Dihex=0.02 "Internal diameter";
- final parameter Modelica.SIunits.Radius rhex=Dihex/2 "Internal radius";
- final parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex
- "Internal perimeter";
- final parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2
+ parameter Modelica.Units.SI.Length Lhex=2 "Total length";
+ parameter Modelica.Units.SI.Diameter Dihex=0.02 "Internal diameter";
+ final parameter Modelica.Units.SI.Radius rhex=Dihex/2 "Internal radius";
+ final parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*
+ Dihex "Internal perimeter";
+ final parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2
"Internal cross section";
parameter Real Cfhex=0.005 "Friction coefficient";
- parameter Modelica.SIunits.MassFlowRate whex=0.31
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31
"Nominal mass flow rate";
- parameter Modelica.SIunits.Pressure phex=3e5 "Initial pressure";
- parameter Modelica.SIunits.SpecificEnthalpy hs=1e5
+ parameter Modelica.Units.SI.Pressure phex=3e5 "Initial pressure";
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=1e5
"Initial inlet specific enthalpy";
- parameter Modelica.SIunits.CoefficientOfHeatTransfer gamma = 1500
+ parameter Modelica.Units.SI.CoefficientOfHeatTransfer gamma=1500
"Fixed heat transfer coefficient";
Real cp = Medium.specificHeatCapacityCp(hex.fluidState[1]);
Real NTU = (Nt*Lhex*Dihex*3.1415*gamma)/(whex*Medium.specificHeatCapacityCp(hex.fluidState[1]))
@@ -5147,18 +5148,18 @@ This model tests a simple power plant based on a GTunit.
constrainedby Modelica.Media.Interfaces.PartialMedium;
parameter Integer Nnodes=5 "number of Nodes";
parameter Integer Nt = 10 "number of tubes in parallel";
- parameter Modelica.SIunits.Length Lhex=10 "total length";
- parameter Modelica.SIunits.Diameter Dihex=0.02 "internal diameter";
- parameter Modelica.SIunits.Radius rhex=Dihex/2 "internal radius";
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex
+ parameter Modelica.Units.SI.Length Lhex=10 "total length";
+ parameter Modelica.Units.SI.Diameter Dihex=0.02 "internal diameter";
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2 "internal radius";
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex
"internal perimeter";
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2
"internal cross section";
parameter Real Cfhex=0.005 "friction coefficient";
- parameter Modelica.SIunits.MassFlowRate whex=1e-2
+ parameter Modelica.Units.SI.MassFlowRate whex=1e-2
"nominal mass flow rate";
- parameter Modelica.SIunits.Pressure phex=0.2e5 "initial pressure";
- parameter Modelica.SIunits.SpecificEnthalpy hs=2.971e6
+ parameter Modelica.Units.SI.Pressure phex=0.2e5 "initial pressure";
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=2.971e6
"initial specific enthalpy";
Real gamma = Medium.specificHeatCapacityCp(hex.fluidState[1])/Medium.specificHeatCapacityCv(hex.fluidState[1]) "cp/cv";
Real dMtot_dp = hex.Mtot/(hex.p*gamma) "compressibility";
@@ -5258,24 +5259,24 @@ This model tests a simple power plant based on a GTunit.
replaceable package Medium = Modelica.Media.Water.WaterIF97OnePhase_ph
constrainedby Modelica.Media.Interfaces.PartialMedium;
parameter Integer Nnodes=20 "number of nodes";
- parameter Modelica.SIunits.Length Lhex=200 "total length";
- parameter Modelica.SIunits.Diameter Dihex=0.02
+ parameter Modelica.Units.SI.Length Lhex=200 "total length";
+ parameter Modelica.Units.SI.Diameter Dihex=0.02
"diameter of internal tube";
- parameter Modelica.SIunits.Diameter Dehex=0.04
+ parameter Modelica.Units.SI.Diameter Dehex=0.04
"diameter of external tube";
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex
"wet perimeter of the tube interface";
- parameter Modelica.SIunits.Area Aint=Modelica.Constants.pi*Dihex^2/4
+ parameter Modelica.Units.SI.Area Aint=Modelica.Constants.pi*Dihex^2/4
"cross section of internal tube";
- parameter Modelica.SIunits.Area Aext=Modelica.Constants.pi*Dehex^2/4 - Aint
- "cross section of external tube";
+ parameter Modelica.Units.SI.Area Aext=Modelica.Constants.pi*Dehex^2/4 -
+ Aint "cross section of external tube";
parameter Real Cfhex=0.005 "friction coefficient";
- parameter Modelica.SIunits.MassFlowRate whex=0.31
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31
"nominal (and initial) mass flow rate";
- parameter Modelica.SIunits.Pressure phex=3e5 "initial pressure";
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5
+ parameter Modelica.Units.SI.Pressure phex=3e5 "initial pressure";
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5
"initial inlet specific enthalpy";
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5
"initial outlet specific enthalpy";
Water.SinkPressure SideA_FluidSink annotation (Placement(
@@ -5439,30 +5440,30 @@ This model tests a simple power plant based on a GTunit.
replaceable package Medium = Modelica.Media.Water.WaterIF97OnePhase_ph
constrainedby Modelica.Media.Interfaces.PartialMedium;
parameter Integer Nnodes=20 "number of nodes";
- parameter Modelica.SIunits.Length Lhex=200 "total length";
- parameter Modelica.SIunits.Diameter Dihex=0.02
+ parameter Modelica.Units.SI.Length Lhex=200 "total length";
+ parameter Modelica.Units.SI.Diameter Dihex=0.02
"diameter of internal tube";
- parameter Modelica.SIunits.Diameter Dehex= 0.04
+ parameter Modelica.Units.SI.Diameter Dehex=0.04
"diameter of external tube";
- parameter Modelica.SIunits.Length th = 0.002 "tube wall thickness";
- parameter Modelica.SIunits.Radius rint=Dihex/2
+ parameter Modelica.Units.SI.Length th=0.002 "tube wall thickness";
+ parameter Modelica.Units.SI.Radius rint=Dihex/2
"internal radius tube walls";
- parameter Modelica.SIunits.Radius rext=rint+th
+ parameter Modelica.Units.SI.Radius rext=rint + th
"internal radius tube walls";
- parameter Modelica.SIunits.Length omegaint=Modelica.Constants.pi*Dihex
- "wet perimeter internal tube";
- parameter Modelica.SIunits.Length omegaext=Modelica.Constants.pi*(Dihex+2*th)
+ parameter Modelica.Units.SI.Length omegaint=Modelica.Constants.pi*Dihex
"wet perimeter internal tube";
- parameter Modelica.SIunits.Area Aint=Modelica.Constants.pi*rint^2;
- parameter Modelica.SIunits.Area Aext=Modelica.Constants.pi*Dehex^2/4 -
- Modelica.Constants.pi*rext^2;
+ parameter Modelica.Units.SI.Length omegaext=Modelica.Constants.pi*(Dihex
+ + 2*th) "wet perimeter internal tube";
+ parameter Modelica.Units.SI.Area Aint=Modelica.Constants.pi*rint^2;
+ parameter Modelica.Units.SI.Area Aext=Modelica.Constants.pi*Dehex^2/4 -
+ Modelica.Constants.pi*rext^2;
parameter Real Cfhex=0.005 "friction coefficient";
- parameter Modelica.SIunits.MassFlowRate whex=0.31
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31
"nominal (and initial) mass flow rate";
- parameter Modelica.SIunits.Pressure phex=3e5 "initial pressure";
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5
+ parameter Modelica.Units.SI.Pressure phex=3e5 "initial pressure";
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5
"initial inlet specific enthalpy";
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5
"initial outlet specific enthalpy";
Water.SinkPressure SideA_FluidSink annotation (Placement(
@@ -5640,18 +5641,18 @@ This model tests a simple power plant based on a GTunit.
replaceable package Medium = Modelica.Media.Water.WaterIF97OnePhase_ph
constrainedby Modelica.Media.Interfaces.PartialMedium;
parameter Integer Nnodes=10 "number of Nodes";
- parameter Modelica.SIunits.Length Lhex=10 "total length";
- parameter Modelica.SIunits.Diameter Dihex=0.02 "internal diameter";
- parameter Modelica.SIunits.Radius rhex=Dihex/2 "internal radius";
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex
+ parameter Modelica.Units.SI.Length Lhex=10 "total length";
+ parameter Modelica.Units.SI.Diameter Dihex=0.02 "internal diameter";
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2 "internal radius";
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex
"internal perimeter";
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2
"internal cross-section";
parameter Real Cfhex=0.005 "friction coefficient";
- parameter Modelica.SIunits.MassFlowRate whex=0.31
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31
"nominal mass flow rate";
- parameter Modelica.SIunits.Pressure phex=3e5 "initial pressure";
- parameter Modelica.SIunits.SpecificEnthalpy hs=1e5
+ parameter Modelica.Units.SI.Pressure phex=3e5 "initial pressure";
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=1e5
"initial inlet specific enthalpy";
Water.Flow1DFV hexFV(
@@ -5942,31 +5943,31 @@ This model tests a simple power plant based on a GTunit.
// number of Nodes
parameter Integer Nnodes=12;
// total length
- parameter Modelica.SIunits.Length Lhex=10;
+ parameter Modelica.Units.SI.Length Lhex=10;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.3;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.3;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=2e5;
+ parameter Modelica.Units.SI.Pressure phex=2e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5;
// initial outlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5;
//height of enthalpy step
- parameter Modelica.SIunits.SpecificEnthalpy deltah=41800;
+ parameter Modelica.Units.SI.SpecificEnthalpy deltah=41800;
//height of power step
- parameter Modelica.SIunits.EnergyFlowRate W=41800*whex;
+ parameter Modelica.Units.SI.EnergyFlowRate W=41800*whex;
ThermoPower.Water.SourceMassFlow Fluid_Source(
redeclare package Medium = Medium,
@@ -6096,23 +6097,23 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=12;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.31;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=3e5;
+ parameter Modelica.Units.SI.Pressure phex=3e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hs=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=1e5;
Water.Flow1DFEM hex(
redeclare package Medium = Medium,
N=Nnodes,
@@ -6236,23 +6237,23 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=12;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.3;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.3;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=1e5;
+ parameter Modelica.Units.SI.Pressure phex=1e5;
// initial specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hs=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=1e5;
Water.Flow1DFEM hex(
redeclare package Medium = Medium,
N=Nnodes,
@@ -6370,23 +6371,23 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=12;
// total length
- parameter Modelica.SIunits.Length Lhex=10;
+ parameter Modelica.Units.SI.Length Lhex=10;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=1e-2;
+ parameter Modelica.Units.SI.MassFlowRate whex=1e-2;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=0.2e5;
+ parameter Modelica.Units.SI.Pressure phex=0.2e5;
// initial specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hs=3e6;
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=3e6;
Water.Flow1DFEM hex(
redeclare package Medium = Medium,
N=Nnodes,
@@ -6489,25 +6490,25 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=12;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.31;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=3e5;
+ parameter Modelica.Units.SI.Pressure phex=3e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5;
// initial outlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5;
Water.Flow1DFEM hexA(
N=Nnodes,
Nt=1,
@@ -6698,25 +6699,25 @@ Casella:
// number of Nodes
parameter Integer Nnodes=16;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.31;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=3e5;
+ parameter Modelica.Units.SI.Pressure phex=3e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5;
// initial outlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5;
Water.Flow1DFEM hexA(
N=Nnodes,
Nt=1,
@@ -9284,20 +9285,21 @@ Casella:
constrainedby Modelica.Media.Interfaces.PartialPureSubstance;
parameter Integer Nnodes=4 "Number of nodes";
parameter Integer Nt = 5 "Number of tubes";
- parameter Modelica.SIunits.Length Lhex=2 "Total length";
- parameter Modelica.SIunits.Diameter Dihex=0.02 "Internal diameter";
- final parameter Modelica.SIunits.Radius rhex=Dihex/2 "Internal radius";
- final parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex
- "Internal perimeter";
- final parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2
+ parameter Modelica.Units.SI.Length Lhex=2 "Total length";
+ parameter Modelica.Units.SI.Diameter Dihex=0.02 "Internal diameter";
+ final parameter Modelica.Units.SI.Radius rhex=Dihex/2 "Internal radius";
+ final parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*
+ Dihex "Internal perimeter";
+ final parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2
"Internal cross section";
parameter Real Cfhex=0.005 "Friction coefficient";
- parameter Modelica.SIunits.MassFlowRate whex=0.31
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31
"Nominal mass flow rate";
- parameter Modelica.SIunits.Pressure phex=3e5 "Initial pressure";
- parameter Modelica.SIunits.SpecificEnthalpy hs=Medium.specificEnthalpy_pT(phex,293.15)
+ parameter Modelica.Units.SI.Pressure phex=3e5 "Initial pressure";
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=
+ Medium.specificEnthalpy_pT(phex, 293.15)
"Initial inlet specific enthalpy";
- parameter Modelica.SIunits.CoefficientOfHeatTransfer gamma = 5000
+ parameter Modelica.Units.SI.CoefficientOfHeatTransfer gamma=5000
"Fixed heat transfer coefficient";
Real cp = Medium.specificHeatCapacityCp(hex.fluidState[1]);
Real NTU = (Nt*Lhex*Dihex*3.1415*gamma)/(whex*Medium.specificHeatCapacityCp(hex.fluidState[1]))
@@ -9421,23 +9423,23 @@ Casella:
// number of Nodes
parameter Integer Nnodes=10;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.31;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=3e5;
+ parameter Modelica.Units.SI.Pressure phex=3e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hs=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=1e5;
Water.Flow1D hex(
N=Nnodes,
L=Lhex,
@@ -9546,23 +9548,23 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=20;
// total length
- parameter Modelica.SIunits.Length Lhex=10;
+ parameter Modelica.Units.SI.Length Lhex=10;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=1e-2;
+ parameter Modelica.Units.SI.MassFlowRate whex=1e-2;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=0.2e5;
+ parameter Modelica.Units.SI.Pressure phex=0.2e5;
// initial specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hs=3e6;
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=3e6;
// Time constant
SI.Time tau;
@@ -9673,25 +9675,25 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=20;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.31;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=3e5;
+ parameter Modelica.Units.SI.Pressure phex=3e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5;
// initial outlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5;
Water.Flow1D hexA(
N=Nnodes,
Nt=1,
@@ -9865,25 +9867,25 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=20;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.31;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=3e5;
+ parameter Modelica.Units.SI.Pressure phex=3e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hinhex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hinhex=1e5;
// initial outlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy houthex=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy houthex=1e5;
Water.Flow1D hexA(
N=Nnodes,
Nt=1,
@@ -10156,23 +10158,23 @@ Algorithm Tolerance = 1e-6
// number of Nodes
parameter Integer Nnodes=20;
// total length
- parameter Modelica.SIunits.Length Lhex=200;
+ parameter Modelica.Units.SI.Length Lhex=200;
// internal diameter
- parameter Modelica.SIunits.Diameter Dihex=0.02;
+ parameter Modelica.Units.SI.Diameter Dihex=0.02;
// internal radius
- parameter Modelica.SIunits.Radius rhex=Dihex/2;
+ parameter Modelica.Units.SI.Radius rhex=Dihex/2;
// internal perimeter
- parameter Modelica.SIunits.Length omegahex=Modelica.Constants.pi*Dihex;
+ parameter Modelica.Units.SI.Length omegahex=Modelica.Constants.pi*Dihex;
// internal cross section
- parameter Modelica.SIunits.Area Ahex=Modelica.Constants.pi*rhex^2;
+ parameter Modelica.Units.SI.Area Ahex=Modelica.Constants.pi*rhex^2;
// friction coefficient
parameter Real Cfhex=0.005;
// nominal (and initial) mass flow rate
- parameter Modelica.SIunits.MassFlowRate whex=0.31;
+ parameter Modelica.Units.SI.MassFlowRate whex=0.31;
// initial pressure
- parameter Modelica.SIunits.Pressure phex=3e5;
+ parameter Modelica.Units.SI.Pressure phex=3e5;
// initial inlet specific enthalpy
- parameter Modelica.SIunits.SpecificEnthalpy hs=1e5;
+ parameter Modelica.Units.SI.SpecificEnthalpy hs=1e5;
Water.Flow1DDB hex(
N=Nnodes,
L=Lhex,
diff --git a/ThermoPower/Thermal.mo b/ThermoPower/Thermal.mo
index 9f273a9..09bf2ea 100644
--- a/ThermoPower/Thermal.mo
+++ b/ThermoPower/Thermal.mo
@@ -954,7 +954,7 @@ The swapping is performed if the counterCurrent parameter is true (default value
"Constant heat transfer coefficient";
parameter Boolean adaptiveAverageTemperature = true
"Adapt the average temperature at low flow rates";
- parameter Modelica.SIunits.PerUnit sigma = 0.1
+ parameter Modelica.Units.SI.PerUnit sigma=0.1
"Fraction of nominal flow rate below which the heat transfer is computed on outlet volume temperatures";
SI.PerUnit w_wnom "Ratio between actual and nominal flow rate";
@@ -1080,7 +1080,7 @@ the global nominal thermal conductance UA is given instead of the nominal specif
"Nominal flow rate for heat transfer correlation (single tube)";
parameter Boolean adaptiveAverageTemperature = true
"Adapt the average temperature at low flow rates";
- parameter Modelica.SIunits.PerUnit sigma = 0.1
+ parameter Modelica.Units.SI.PerUnit sigma=0.1
"Fraction of nominal flow rate below which the heat transfer is computed on outlet volume temperatures";
parameter Boolean useHomotopy = true
"use nominal heat transfer coefficient for simplified model";
@@ -1621,7 +1621,7 @@ the global nominal thermal conductance UAnom is given instead of the nominal spe
partial model PartialMaterial
"Partial material properties (base model of all material models)"
- import Modelica.SIunits.*;
+ import Modelica.Units.SI.*;
// Constants to be set in Material
constant String materialName "Name of the material";
@@ -1763,7 +1763,7 @@ This model computes the thermal and mechanical properties of a generic material.
package Functions
"Utility functions. Provide conversions and interpolation for table data."
function CtoKTable
- extends Modelica.SIunits.Conversions.ConversionIcon;
+ extends Modelica.Units.Icons.Conversion;
input Real[:, :] table_degC;
output Real table_degK[size(table_degC, 1), size(table_degC, 2)];
@@ -1771,14 +1771,14 @@ This model computes the thermal and mechanical properties of a generic material.
table_degK := table_degC;
for i in 1:size(table_degC, 1) loop
- table_degK[i, 1] := Modelica.SIunits.Conversions.from_degC(table_degC[
- i, 1]);
+ table_degK[i, 1] :=Modelica.Units.Conversions.from_degC(table_degC[i,
+ 1]);
end for;
end CtoKTable;
package Polynomials_Temp "Temporary Functions operating on polynomials (including polynomial fitting), extracted from Modelica.Media.Incompressible.TableBased;
only to be used in Material.MaterialTable"
- extends Modelica.Icons.Library;
+ extends Modelica.Icons.Package;
function evaluate "Evaluate polynomial at a given abszissa value"
extends Modelica.Icons.Function;
@@ -1939,15 +1939,15 @@ This model computes the thermal and mechanical properties of a generic material.
package Test "Test cases"
model TestMaterial
- import Modelica.SIunits.*;
+ import Modelica.Units.SI.*;
replaceable Metals.CarbonSteel_A106C Material(npol=3) constrainedby
Interfaces.PartialMaterial "Material model";
- Temp_K T;
- Temp_C T_C;
+ Modelica.Units.SI.Temperature T;
+ Modelica.Units.NonSI.Temperature_degC T_C;
Stress E;
equation
T_C = 21 + 500*time;
- T = Modelica.SIunits.Conversions.from_degC(T_C);
+ T =Modelica.Units.Conversions.from_degC(T_C);
Material.T = T;
E = Material.yieldStress;
end TestMaterial;
@@ -2129,7 +2129,8 @@ This package contains models to compute the material properties needed to model
parameter SI.MassFlowRate wnom "Nominal mass flow rate (single tube)"
annotation(Dialog(enable=false, tab = "Set by Flow1D model"));
final parameter SI.Length l=L/(Nw) "Length of a single volume";
- parameter Modelica.SIunits.PerUnit kc = 1 "Correction factor for heat transfer";
+ parameter Modelica.Units.SI.PerUnit kc=1
+ "Correction factor for heat transfer";
Medium.Temperature T[Nf] "Temperatures at the fluid side nodes";
Medium.Temperature Tw[Nw] "Temperatures of the wall volumes";
@@ -3113,7 +3114,7 @@ The swapping is performed if the counterCurrent parameter is true (default value
model CylinderFourier
"Thermal model of a hollow cylinder by Fourier's equation - 1 axial node and Nr radial nodes"
- import Modelica.SIunits.*;
+ import Modelica.Units.SI.*;
import ThermoPower.Choices.CylinderFourier.NodeDistribution;
extends ThermoPower.Icons.MetalWall;
diff --git a/ThermoPower/Water.mo b/ThermoPower/Water.mo
index 45bf0ea..33cd61e 100644
--- a/ThermoPower/Water.mo
+++ b/ThermoPower/Water.mo
@@ -4423,7 +4423,7 @@ li>1 Jul 2004
omega = der(phi);
W = omega*MechPort.tau;
- n = Modelica.SIunits.Conversions.to_rpm(omega) "Rotational speed";
+ n =Modelica.Units.Conversions.to_rpm(omega) "Rotational speed";
annotation (
Icon(graphics={Text(extent={{-10,104},{18,84}}, textString="Np")}),
Diagram(graphics),
@@ -4767,7 +4767,7 @@ li>1 Jul 2004
end BarometricCondenser;
model CoolingTower "Cooling tower with variable speed fan"
- import Modelica.SIunits.Conversions;
+ import Modelica.Units.Conversions;
package Water = Modelica.Media.Water.StandardWater;
package DryAir = Modelica.Media.Air.SimpleAir;
diff --git a/ThermoPower/package.mo b/ThermoPower/package.mo
index c14a4de..37f199c 100644
--- a/ThermoPower/package.mo
+++ b/ThermoPower/package.mo
@@ -1,8 +1,8 @@
within ;
package ThermoPower "Open library for thermal power plant simulation"
extends Modelica.Icons.Package;
- import SI = Modelica.SIunits;
- import NonSI = Modelica.SIunits.Conversions.NonSIunits;
+ import Modelica.Units.SI;
+ import Modelica.Units.NonSI;
model System "System wide properties and defaults"
@@ -1391,7 +1391,7 @@ With the default value of delta=0.01, the difference between sqrt(x) and sqrtReg
end linspaceExt;
block OffsetController "Offset computation for steady-state conditions"
- extends Modelica.Blocks.Interfaces.BlockIcon;
+ extends Modelica.Blocks.Icons.Block;
parameter Real steadyStateGain=0.0
"0.0: Adds offset to input - 1.0: Closed loop action to find steady state";
parameter Real SP0 "Initial setpoint for the controlled variable";
@@ -1754,7 +1754,7 @@ This characteristic is such that the relative change of the flow coefficient is
end ValveCharacteristics;
package FanCharacteristics "Functions for fan characteristics"
- import NonSI = Modelica.SIunits.Conversions.NonSIunits;
+ import Modelica.Units.NonSI;
partial function baseFlow "Base class for fan flow characteristics"
extends Modelica.Icons.Function;
@@ -1766,14 +1766,14 @@ This characteristic is such that the relative change of the flow coefficient is
partial function basePower
"Base class for fan power consumption characteristics"
extends Modelica.Icons.Function;
- input Modelica.SIunits.VolumeFlowRate q_flow "Volumetric flow rate";
+ input Modelica.Units.SI.VolumeFlowRate q_flow "Volumetric flow rate";
input Real bladePos=1 "Blade position";
- output Modelica.SIunits.Power consumption "Power consumption";
+ output Modelica.Units.SI.Power consumption "Power consumption";
end basePower;
partial function baseEfficiency "Base class for efficiency characteristics"
extends Modelica.Icons.Function;
- input Modelica.SIunits.VolumeFlowRate q_flow "Volumetric flow rate";
+ input Modelica.Units.SI.VolumeFlowRate q_flow "Volumetric flow rate";
input Real bladePos=1 "Blade position";
output Real eta "Efficiency";
end baseEfficiency;
@@ -1786,10 +1786,11 @@ This characteristic is such that the relative change of the flow coefficient is
function linearFlow "Linear flow characteristic, fixed blades"
extends baseFlow;
- input Modelica.SIunits.VolumeFlowRate q_nom[2]
- "Volume flow rate for two operating points (single fan)" annotation(Dialog);
- input Modelica.SIunits.Height H_nom[2]
- "Specific energy for two operating points" annotation(Dialog);
+ input Modelica.Units.SI.VolumeFlowRate q_nom[2]
+ "Volume flow rate for two operating points (single fan)"
+ annotation (Dialog);
+ input Modelica.Units.SI.Height H_nom[2]
+ "Specific energy for two operating points" annotation (Dialog);
/* Linear system to determine the coefficients:
H_nom[1] = c[1] + q_nom[1]*c[2];
H_nom[2] = c[1] + q_nom[2]*c[2];
@@ -1804,10 +1805,11 @@ This characteristic is such that the relative change of the flow coefficient is
function quadraticFlow "Quadratic flow characteristic, fixed blades"
extends baseFlow;
- input Modelica.SIunits.VolumeFlowRate q_nom[3]
- "Volume flow rate for three operating points (single fan)" annotation(Dialog);
- input Modelica.SIunits.Height H_nom[3]
- "Specific work for three operating points" annotation(Dialog);
+ input Modelica.Units.SI.VolumeFlowRate q_nom[3]
+ "Volume flow rate for three operating points (single fan)"
+ annotation (Dialog);
+ input Modelica.Units.SI.Height H_nom[3]
+ "Specific work for three operating points" annotation (Dialog);
protected
parameter Real q_nom2[3]={q_nom[1]^2,q_nom[2]^2,q_nom[3]^2}
"Squared nominal flow rates";
@@ -1849,10 +1851,11 @@ This characteristic is such that the relative change of the flow coefficient is
function polynomialFlow "Polynomial flow characteristic, fixed blades"
extends baseFlow;
- input Modelica.SIunits.VolumeFlowRate q_nom[:]
- "Volume flow rate for N operating points (single fan)" annotation(Dialog);
- input Modelica.SIunits.Height H_nom[:]
- "Specific work for N operating points" annotation(Dialog);
+ input Modelica.Units.SI.VolumeFlowRate q_nom[:]
+ "Volume flow rate for N operating points (single fan)"
+ annotation (Dialog);
+ input Modelica.Units.SI.Height H_nom[:]
+ "Specific work for N operating points" annotation (Dialog);
protected
parameter Integer N=size(q_nom, 1) "Number of nominal operating points";
parameter Real q_nom_pow[N, N]={{q_nom[j]^(i - 1) for j in 1:N} for i in
@@ -1880,7 +1883,8 @@ This characteristic is such that the relative change of the flow coefficient is
function constantPower "Constant power consumption characteristic"
extends FanCharacteristics.basePower;
- input Modelica.SIunits.Power power=0 "Constant power consumption" annotation(Dialog);
+ input Modelica.Units.SI.Power power=0 "Constant power consumption"
+ annotation (Dialog);
algorithm
consumption := power;
end constantPower;
@@ -1888,10 +1892,11 @@ This characteristic is such that the relative change of the flow coefficient is
function quadraticPower
"Quadratic power consumption characteristic, fixed blades"
extends basePower;
- input Modelica.SIunits.VolumeFlowRate q_nom[3]
- "Volume flow rate for three operating points (single fan)" annotation(Dialog);
- input Modelica.SIunits.Power W_nom[3]
- "Power consumption for three operating points" annotation(Dialog);
+ input Modelica.Units.SI.VolumeFlowRate q_nom[3]
+ "Volume flow rate for three operating points (single fan)"
+ annotation (Dialog);
+ input Modelica.Units.SI.Power W_nom[3]
+ "Power consumption for three operating points" annotation (Dialog);
protected
Real q_nom2[3]={q_nom[1]^2,q_nom[2]^2,q_nom[3]^2}
"Squared nominal flow rates";
@@ -1910,7 +1915,7 @@ This characteristic is such that the relative change of the flow coefficient is
function quadraticFlowBlades
"Quadratic flow characteristic, movable blades"
extends Modelica.Icons.Function;
- input Modelica.SIunits.VolumeFlowRate q_flow;
+ input Modelica.Units.SI.VolumeFlowRate q_flow;
input Real bladePos;
input Real bladePos_nom[:];
input Real c[:, :]
@@ -1945,9 +1950,9 @@ This characteristic is such that the relative change of the flow coefficient is
function quadraticFlowBladesCoeff
extends Modelica.Icons.Function;
input Real bladePos_nom[:];
- input Modelica.SIunits.VolumeFlowRate q_nom[3, :]
+ input Modelica.Units.SI.VolumeFlowRate q_nom[3,:]
"Volume flow rate for three operating points at N_pos blade positionings";
- input Modelica.SIunits.Height H_nom[3, :]
+ input Modelica.Units.SI.Height H_nom[3,:]
"Specific work for three operating points at N_pos blade positionings";
output Real c[3, size(bladePos_nom, 1)]
"Coefficients of quadratic specific work characteristic";
@@ -2105,6 +2110,6 @@ This is a major new release, that has been in the making for 5 years. The new re
The ThermoPower package is licensed by Politecnico di Milano under the Modelica License 2.
Copyright © 2002-2014, Politecnico di Milano.
"),
- uses(Modelica(version="3.2.3")),
- version="3.1");
+ uses(Modelica(version="4.0.0")),
+ version="3.2");
end ThermoPower;