Skip to content

Commit 5c48e64

Browse files
beutlichbeutlich
committed
Utilize PressureRate unit
1 parent 9895491 commit 5c48e64

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎Modelica/Media/Air/MoistAir.mo‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@ The ideal gas constant for moist air is computed from the gas phase composition.
356356

357357
extends Modelica.Icons.Function;
358358
input SI.Temperature Tsat "Saturation temperature";
359-
input Real dTsat(unit="K/s") "Saturation temperature derivative";
360-
output Real psat_der(unit="Pa/s") "Saturation pressure derivative";
359+
input SI.TemperatureSlope dTsat "Saturation temperature derivative";
360+
output SI.PressureRate psat_der "Saturation pressure derivative";
361361
protected
362362
SI.Temperature Tcritical=647.096 "Critical temperature";
363363
SI.AbsolutePressure pcritical=22.064e6 "Critical pressure";
@@ -414,8 +414,8 @@ The ideal gas constant for moist air is computed from the gas phase composition.
414414

415415
extends Modelica.Icons.Function;
416416
input SI.Temperature Tsat "Sublimation temperature";
417-
input Real dTsat(unit="K/s") "Sublimation temperature derivative";
418-
output Real psat_der(unit="Pa/s") "Sublimation pressure derivative";
417+
input SI.TemperatureSlope dTsat "Sublimation temperature derivative";
418+
output SI.PressureRate psat_der "Sublimation pressure derivative";
419419
protected
420420
SI.Temperature Ttriple=273.16 "Triple point temperature";
421421
SI.AbsolutePressure ptriple=611.657 "Triple point pressure";
@@ -458,9 +458,9 @@ Saturation pressure of water in the liquid and the solid region is computed usin
458458
function saturationPressure_der
459459
"Derivative function for 'saturationPressure'"
460460
extends Modelica.Icons.Function;
461-
input Temperature Tsat "Saturation temperature";
462-
input Real dTsat(unit="K/s") "Time derivative of saturation temperature";
463-
output Real psat_der(unit="Pa/s") "Saturation pressure";
461+
input SI.Temperature Tsat "Saturation temperature";
462+
input SI.TemperatureSlope dTsat "Time derivative of saturation temperature";
463+
output SI.PressureRate psat_der "Saturation pressure";
464464

465465
algorithm
466466
/*psat := Utilities.spliceFunction(saturationPressureLiquid(Tsat),sublimationPressureIce(Tsat),Tsat-273.16,1.0);*/
@@ -801,8 +801,8 @@ Specific enthalpy of moist air is computed from pressure, temperature and compos
801801
input SI.Pressure p "Pressure";
802802
input SI.Temperature T "Temperature";
803803
input SI.MassFraction X[:] "Mass fractions of moist air";
804-
input Real dp(unit="Pa/s") "Pressure derivative";
805-
input Real dT(unit="K/s") "Temperature derivative";
804+
input SI.PressureRate dp "Pressure derivative";
805+
input SI.TemperatureSlope dT "Temperature derivative";
806806
input Real dX[:](each unit="1/s") "Composition derivative";
807807
output Real h_der(unit="J/(kg.s)") "Time derivative of specific enthalpy";
808808
protected
@@ -817,7 +817,7 @@ Specific enthalpy of moist air is computed from pressure, temperature and compos
817817
Real dX_air(unit="1/s") "Time derivative of dry air mass fraction";
818818
Real dX_liq(unit="1/s")
819819
"Time derivative of liquid/solid water mass fraction";
820-
Real dps(unit="Pa/s") "Time derivative of saturation pressure";
820+
SI.PressureRate dps "Time derivative of saturation pressure";
821821
Real dx_sat(unit="1/s")
822822
"Time derivative of absolute humidity per unit mass of dry air";
823823
algorithm
@@ -969,8 +969,8 @@ Specific internal energy is determined from pressure p, temperature T and compos
969969
input SI.Pressure p "Pressure";
970970
input SI.Temperature T "Temperature";
971971
input SI.MassFraction X[:] "Mass fractions of moist air";
972-
input Real dp(unit="Pa/s") "Pressure derivative";
973-
input Real dT(unit="K/s") "Temperature derivative";
972+
input SI.PressureRate dp "Pressure derivative";
973+
input SI.TemperatureSlope dT "Temperature derivative";
974974
input Real dX[:](each unit="1/s") "Mass fraction derivatives";
975975
output Real u_der(unit="J/(kg.s)") "Specific internal energy derivative";
976976
protected
@@ -987,7 +987,7 @@ Specific internal energy is determined from pressure p, temperature T and compos
987987
Real dX_air(unit="1/s") "Time derivative of dry air mass fraction";
988988
Real dX_liq(unit="1/s")
989989
"Time derivative of liquid/solid water mass fraction";
990-
Real dps(unit="Pa/s") "Time derivative of saturation pressure";
990+
SI.PressureRate dps "Time derivative of saturation pressure";
991991
Real dx_sat(unit="1/s")
992992
"Time derivative of absolute humidity per unit mass of dry air";
993993
Real dR_gas(unit="J/(kg.K.s)") "Time derivative of ideal gas constant";
@@ -1344,8 +1344,8 @@ Specific entropy of moist air is computed from pressure, temperature and composi
13441344
input SI.Pressure p "Pressure";
13451345
input SI.Temperature T "Temperature";
13461346
input SI.MassFraction X[:] "Mass fractions of moist air";
1347-
input Real dp(unit="Pa/s") "Derivative of pressure";
1348-
input Real dT(unit="K/s") "Derivative of temperature";
1347+
input SI.PressureRate dp "Derivative of pressure";
1348+
input SI.TemperatureSlope dT "Derivative of temperature";
13491349
input Real dX[nX](each unit="1/s") "Derivative of mass fractions";
13501350
output Real ds(unit="J/(kg.K.s)") "Specific entropy at p, T, X";
13511351
protected

‎Modelica/Media/Water/IF97_Utilities.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3113,8 +3113,8 @@ email: [email protected]
31133113
function tsat_der "Derivative function for tsat"
31143114
extends Modelica.Icons.Function;
31153115
input SI.Pressure p "Pressure";
3116-
input Real der_p(unit="Pa/s") "Pressure derivative";
3117-
output Real der_tsat(unit="K/s") "Temperature derivative";
3116+
input SI.PressureRate der_p "Pressure derivative";
3117+
output SI.TemperatureSlope der_tsat "Temperature derivative";
31183118
protected
31193119
Real dtp;
31203120
algorithm
@@ -3201,8 +3201,8 @@ email: [email protected]
32013201
function psat_der "Derivative function for psat"
32023202
extends Modelica.Icons.Function;
32033203
input SI.Temperature T "Temperature (K)";
3204-
input Real der_T(unit="K/s") "Temperature derivative";
3205-
output Real der_psat(unit="Pa/s") "Pressure";
3204+
input SI.TemperatureSlope der_T "Temperature derivative";
3205+
output SI.PressureRate der_psat "Pressure";
32063206
protected
32073207
Real dpt;
32083208
algorithm

‎Modelica/Media/package.mo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2220,11 +2220,11 @@ package Examples
22202220
Real der_T;
22212221
protected
22222222
parameter SI.AbsolutePressure p01 = 100000.0 "state.p at time 0";
2223-
parameter Real pRate1(unit = "Pa/s") = 0 "state.p rate of change";
2223+
parameter SI.PressureRate pRate1 = 0 "state.p rate of change";
22242224
parameter SI.Temperature T01 = 200 "state.T at time 0";
22252225
parameter SI.TemperatureSlope Trate1 = 1000 "state.T rate of change";
22262226
parameter SI.AbsolutePressure p02 = 2.0e5 "state2.p at time 0";
2227-
parameter Real pRate2(unit = "Pa/s") = 0 "state2.p rate of change";
2227+
parameter SI.PressureRate pRate2 = 0 "state2.p rate of change";
22282228
parameter SI.Temperature T02 = 500 "state2.T at time 0";
22292229
parameter SI.TemperatureSlope Trate2 = 0 "state2.T rate of change";
22302230

@@ -2408,11 +2408,11 @@ is given to compare the approximation.
24082408
protected
24092409
constant SI.Time unitTime=1;
24102410
parameter SI.AbsolutePressure p01 = 1.e5 "state1.p at time 0";
2411-
parameter Real pRate1(unit = "Pa/s") = 1.e5 "state1.p rate of change";
2411+
parameter SI.PressureRate pRate1 = 1.e5 "state1.p rate of change";
24122412
parameter SI.Temperature T01 = 300 "state1.T at time 0";
24132413
parameter SI.TemperatureSlope Trate1 = 10 "state1.T rate of change";
24142414
parameter SI.AbsolutePressure p02 = 1.e5 "state2.p at time 0";
2415-
parameter Real pRate2(unit = "Pa/s") = 1.e5/2 "state2.p rate of change";
2415+
parameter SI.PressureRate pRate2 = 1.e5/2 "state2.p rate of change";
24162416
parameter SI.Temperature T02 = 340 "state2.T at time 0";
24172417
parameter SI.TemperatureSlope Trate2 = -20 "state2.T rate of change";
24182418
equation
@@ -2613,8 +2613,8 @@ It must be noted that the relationship of both axis variables is not right-angle
26132613
extends Modelica.Icons.Example;
26142614
ExtendedProperties medium(p(start=2000.0, fixed=true), h(start=8.0e5,
26152615
fixed=true));
2616-
parameter Real dh(unit="J/(kg.s)", displayUnit="kJ/(kg.s)")=80000.0 "Derivative of specific enthalpy of medium";
2617-
parameter Real dp(unit="Pa/s", displayUnit="bar/s")=1.0e6 "Derivative of pressure of medium";
2616+
parameter Real dh(unit="J/(kg.s)", displayUnit="kJ/(kg.s)") = 80000.0 "Derivative of specific enthalpy of medium";
2617+
parameter SI.PressureRate dp = 1.0e6 "Derivative of pressure of medium";
26182618
equation
26192619
der(medium.p) = dp;
26202620
der(medium.h) = dh;
@@ -2717,11 +2717,11 @@ points, e.g., when an isentropic reference state is computed.
27172717
protected
27182718
constant SI.Time unitTime=1;
27192719
parameter SI.AbsolutePressure p01 = 1.e5 "state1.p at time 0";
2720-
parameter Real pRate1(unit = "Pa/s") = 1.e5 "state1.p rate of change";
2720+
parameter SI.PressureRate pRate1 = 1.e5 "state1.p rate of change";
27212721
parameter SI.Temperature T01 = 300 "state1.T at time 0";
27222722
parameter SI.TemperatureSlope Trate1 = 10 "state1.T rate of change";
27232723
parameter SI.AbsolutePressure p02 = 1.e5 "state2.p at time 0";
2724-
parameter Real pRate2(unit = "Pa/s") = 1.e5/2 "state2.p rate of change";
2724+
parameter SI.PressureRate pRate2 = 1.e5/2 "state2.p rate of change";
27252725
parameter SI.Temperature T02 = 340 "state2.T at time 0";
27262726
parameter SI.TemperatureSlope Trate2 = -20 "state2.T rate of change";
27272727
equation

0 commit comments

Comments
 (0)