Skip to content

Commit

Permalink
Utilize PressureRate unit
Browse files Browse the repository at this point in the history
  • Loading branch information
@beutlich
beutlich committed Jan 14, 2024
1 parent 7f46072 commit d6fd498
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
30 changes: 15 additions & 15 deletions Modelica/Media/Air/MoistAir.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ The ideal gas constant for moist air is computed from the gas phase composition.

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

extends Modelica.Icons.Function;
input SI.Temperature Tsat "Sublimation temperature";
input Real dTsat(unit="K/s") "Sublimation temperature derivative";
output Real psat_der(unit="Pa/s") "Sublimation pressure derivative";
input SI.TemperatureSlope dTsat "Sublimation temperature derivative";
output SI.PressureRate psat_der "Sublimation pressure derivative";
protected
SI.Temperature Ttriple=273.16 "Triple point temperature";
SI.AbsolutePressure ptriple=611.657 "Triple point pressure";
Expand Down Expand Up @@ -458,9 +458,9 @@ Saturation pressure of water in the liquid and the solid region is computed usin
function saturationPressure_der
"Derivative function for 'saturationPressure'"
extends Modelica.Icons.Function;
input Temperature Tsat "Saturation temperature";
input Real dTsat(unit="K/s") "Time derivative of saturation temperature";
output Real psat_der(unit="Pa/s") "Saturation pressure";
input SI.Temperature Tsat "Saturation temperature";
input SI.TemperatureSlope dTsat "Time derivative of saturation temperature";
output SI.PressureRate psat_der "Saturation pressure";

algorithm
/*psat := Utilities.spliceFunction(saturationPressureLiquid(Tsat),sublimationPressureIce(Tsat),Tsat-273.16,1.0);*/
Expand Down Expand Up @@ -801,8 +801,8 @@ Specific enthalpy of moist air is computed from pressure, temperature and compos
input SI.Pressure p "Pressure";
input SI.Temperature T "Temperature";
input SI.MassFraction X[:] "Mass fractions of moist air";
input Real dp(unit="Pa/s") "Pressure derivative";
input Real dT(unit="K/s") "Temperature derivative";
input SI.PressureRate dp "Pressure derivative";
input SI.TemperatureSlope dT "Temperature derivative";
input Real dX[:](each unit="1/s") "Composition derivative";
output Real h_der(unit="J/(kg.s)") "Time derivative of specific enthalpy";
protected
Expand All @@ -817,7 +817,7 @@ Specific enthalpy of moist air is computed from pressure, temperature and compos
Real dX_air(unit="1/s") "Time derivative of dry air mass fraction";
Real dX_liq(unit="1/s")
"Time derivative of liquid/solid water mass fraction";
Real dps(unit="Pa/s") "Time derivative of saturation pressure";
SI.PressureRate dps "Time derivative of saturation pressure";
Real dx_sat(unit="1/s")
"Time derivative of absolute humidity per unit mass of dry air";
algorithm
Expand Down Expand Up @@ -969,8 +969,8 @@ Specific internal energy is determined from pressure p, temperature T and compos
input SI.Pressure p "Pressure";
input SI.Temperature T "Temperature";
input SI.MassFraction X[:] "Mass fractions of moist air";
input Real dp(unit="Pa/s") "Pressure derivative";
input Real dT(unit="K/s") "Temperature derivative";
input SI.PressureRate dp "Pressure derivative";
input SI.TemperatureSlope dT "Temperature derivative";
input Real dX[:](each unit="1/s") "Mass fraction derivatives";
output Real u_der(unit="J/(kg.s)") "Specific internal energy derivative";
protected
Expand All @@ -987,7 +987,7 @@ Specific internal energy is determined from pressure p, temperature T and compos
Real dX_air(unit="1/s") "Time derivative of dry air mass fraction";
Real dX_liq(unit="1/s")
"Time derivative of liquid/solid water mass fraction";
Real dps(unit="Pa/s") "Time derivative of saturation pressure";
SI.PressureRate dps "Time derivative of saturation pressure";
Real dx_sat(unit="1/s")
"Time derivative of absolute humidity per unit mass of dry air";
Real dR_gas(unit="J/(kg.K.s)") "Time derivative of ideal gas constant";
Expand Down Expand Up @@ -1344,8 +1344,8 @@ Specific entropy of moist air is computed from pressure, temperature and composi
input SI.Pressure p "Pressure";
input SI.Temperature T "Temperature";
input SI.MassFraction X[:] "Mass fractions of moist air";
input Real dp(unit="Pa/s") "Derivative of pressure";
input Real dT(unit="K/s") "Derivative of temperature";
input SI.PressureRate dp "Derivative of pressure";
input SI.TemperatureSlope dT "Derivative of temperature";
input Real dX[nX](each unit="1/s") "Derivative of mass fractions";
output Real ds(unit="J/(kg.K.s)") "Specific entropy at p, T, X";
protected
Expand Down
8 changes: 4 additions & 4 deletions Modelica/Media/Water/IF97_Utilities.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3113,8 +3113,8 @@ email: [email protected]
function tsat_der "Derivative function for tsat"
extends Modelica.Icons.Function;
input SI.Pressure p "Pressure";
input Real der_p(unit="Pa/s") "Pressure derivative";
output Real der_tsat(unit="K/s") "Temperature derivative";
input SI.PressureRate der_p "Pressure derivative";
output SI.TemperatureSlope der_tsat "Temperature derivative";
protected
Real dtp;
algorithm
Expand Down Expand Up @@ -3201,8 +3201,8 @@ email: [email protected]
function psat_der "Derivative function for psat"
extends Modelica.Icons.Function;
input SI.Temperature T "Temperature (K)";
input Real der_T(unit="K/s") "Temperature derivative";
output Real der_psat(unit="Pa/s") "Pressure";
input SI.TemperatureSlope der_T "Temperature derivative";
output SI.PressureRate der_psat "Pressure";
protected
Real dpt;
algorithm
Expand Down
16 changes: 8 additions & 8 deletions Modelica/Media/package.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2220,11 +2220,11 @@ package Examples
Real der_T;
protected
parameter SI.AbsolutePressure p01 = 100000.0 "state.p at time 0";
parameter Real pRate1(unit = "Pa/s") = 0 "state.p rate of change";
parameter SI.PressureRate pRate1 = 0 "state.p rate of change";
parameter SI.Temperature T01 = 200 "state.T at time 0";
parameter SI.TemperatureSlope Trate1 = 1000 "state.T rate of change";
parameter SI.AbsolutePressure p02 = 2.0e5 "state2.p at time 0";
parameter Real pRate2(unit = "Pa/s") = 0 "state2.p rate of change";
parameter SI.PressureRate pRate2 = 0 "state2.p rate of change";
parameter SI.Temperature T02 = 500 "state2.T at time 0";
parameter SI.TemperatureSlope Trate2 = 0 "state2.T rate of change";

Expand Down Expand Up @@ -2408,11 +2408,11 @@ is given to compare the approximation.
protected
constant SI.Time unitTime=1;
parameter SI.AbsolutePressure p01 = 1.e5 "state1.p at time 0";
parameter Real pRate1(unit = "Pa/s") = 1.e5 "state1.p rate of change";
parameter SI.PressureRate pRate1 = 1.e5 "state1.p rate of change";
parameter SI.Temperature T01 = 300 "state1.T at time 0";
parameter SI.TemperatureSlope Trate1 = 10 "state1.T rate of change";
parameter SI.AbsolutePressure p02 = 1.e5 "state2.p at time 0";
parameter Real pRate2(unit = "Pa/s") = 1.e5/2 "state2.p rate of change";
parameter SI.PressureRate pRate2 = 1.e5/2 "state2.p rate of change";
parameter SI.Temperature T02 = 340 "state2.T at time 0";
parameter SI.TemperatureSlope Trate2 = -20 "state2.T rate of change";
equation
Expand Down Expand Up @@ -2613,8 +2613,8 @@ It must be noted that the relationship of both axis variables is not right-angle
extends Modelica.Icons.Example;
ExtendedProperties medium(p(start=2000.0, fixed=true), h(start=8.0e5,
fixed=true));
parameter Real dh(unit="J/(kg.s)", displayUnit="kJ/(kg.s)")=80000.0 "Derivative of specific enthalpy of medium";
parameter Real dp(unit="Pa/s", displayUnit="bar/s")=1.0e6 "Derivative of pressure of medium";
parameter Real dh(unit="J/(kg.s)", displayUnit="kJ/(kg.s)") = 80000.0 "Derivative of specific enthalpy of medium";
parameter SI.PressureRate dp = 1.0e6 "Derivative of pressure of medium";
equation
der(medium.p) = dp;
der(medium.h) = dh;
Expand Down Expand Up @@ -2717,11 +2717,11 @@ points, e.g., when an isentropic reference state is computed.
protected
constant SI.Time unitTime=1;
parameter SI.AbsolutePressure p01 = 1.e5 "state1.p at time 0";
parameter Real pRate1(unit = "Pa/s") = 1.e5 "state1.p rate of change";
parameter SI.PressureRate pRate1 = 1.e5 "state1.p rate of change";
parameter SI.Temperature T01 = 300 "state1.T at time 0";
parameter SI.TemperatureSlope Trate1 = 10 "state1.T rate of change";
parameter SI.AbsolutePressure p02 = 1.e5 "state2.p at time 0";
parameter Real pRate2(unit = "Pa/s") = 1.e5/2 "state2.p rate of change";
parameter SI.PressureRate pRate2 = 1.e5/2 "state2.p rate of change";
parameter SI.Temperature T02 = 340 "state2.T at time 0";
parameter SI.TemperatureSlope Trate2 = -20 "state2.T rate of change";
equation
Expand Down

0 comments on commit d6fd498

Please sign in to comment.