From 084176239fc9dc7728d50f105a1abd021daad020 Mon Sep 17 00:00:00 2001 From: fcasella Date: Mon, 4 Jan 2016 01:19:01 +0000 Subject: [PATCH] Fixes #1018 (Refactor WaterIF97_base and WaterIF97_fixedregion) git-svn-id: https://svn.modelica.org/projects/Modelica/trunk@8875 7ce873d0-865f-4ce7-a662-4bb36ea78beb --- Modelica/Media/Water/package.mo | 757 ++------------------------------ 1 file changed, 38 insertions(+), 719 deletions(-) diff --git a/Modelica/Media/Water/package.mo b/Modelica/Media/Water/package.mo index b24c941c55..dfd0d62127 100644 --- a/Modelica/Media/Water/package.mo +++ b/Modelica/Media/Water/package.mo @@ -146,6 +146,7 @@ partial package WaterIF97_base AbsolutePressure p "Pressure"; end ThermodynamicState; + constant Integer Region = 0 "Region of IF97, if known, zero otherwise"; constant Boolean ph_explicit "True if explicit in pressure and specific enthalpy"; constant Boolean dT_explicit "True if explicit in density and temperature"; @@ -168,7 +169,9 @@ partial package WaterIF97_base fixed=false) "2 for two-phase, 1 for one-phase, 0 if not known"; equation MM = fluidConstants[1].molarMass; - if smoothModel then + if Region > 0 then // Fixed region + phase = (if Region == 4 then 2 else 1); + elseif smoothModel then if onePhase then phase = 1; if ph_explicit then @@ -199,707 +202,6 @@ partial package WaterIF97_base //this is for the one-phase only case pT end if; end if; - if dT_explicit then - p = pressure_dT( - d, - T, - phase); - h = specificEnthalpy_dT( - d, - T, - phase); - sat.Tsat = T; - sat.psat = saturationPressure(T); - elseif ph_explicit then - d = density_ph( - p, - h, - phase); - T = temperature_ph( - p, - h, - phase); - sat.Tsat = saturationTemperature(p); - sat.psat = p; - else - h = specificEnthalpy_pT(p, T); - d = density_pT(p, T); - sat.psat = p; - sat.Tsat = saturationTemperature(p); - end if; - u = h - p/d; - R = Modelica.Constants.R/fluidConstants[1].molarMass; - h = state.h; - p = state.p; - T = state.T; - d = state.d; - phase = state.phase; - end BaseProperties; - - redeclare function density_ph - "Computes density as a function of pressure and specific enthalpy" - extends Modelica.Icons.Function; - input AbsolutePressure p "Pressure"; - input SpecificEnthalpy h "Specific enthalpy"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output Density d "Density"; - algorithm - d := IF97_Utilities.rho_ph( - p, - h, - phase); - annotation (Inline=true); - end density_ph; - - redeclare function temperature_ph - "Computes temperature as a function of pressure and specific enthalpy" - extends Modelica.Icons.Function; - input AbsolutePressure p "Pressure"; - input SpecificEnthalpy h "Specific enthalpy"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output Temperature T "Temperature"; - algorithm - T := IF97_Utilities.T_ph( - p, - h, - phase); - annotation (Inline=true); - end temperature_ph; - - redeclare function temperature_ps - "Compute temperature from pressure and specific enthalpy" - extends Modelica.Icons.Function; - input AbsolutePressure p "Pressure"; - input SpecificEntropy s "Specific entropy"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output Temperature T "Temperature"; - algorithm - T := IF97_Utilities.T_ps( - p, - s, - phase); - annotation (Inline=true); - end temperature_ps; - - redeclare function density_ps - "Computes density as a function of pressure and specific enthalpy" - extends Modelica.Icons.Function; - input AbsolutePressure p "Pressure"; - input SpecificEntropy s "Specific entropy"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output Density d "Density"; - algorithm - d := IF97_Utilities.rho_ps( - p, - s, - phase); - annotation (Inline=true); - end density_ps; - - redeclare function pressure_dT - "Computes pressure as a function of density and temperature" - extends Modelica.Icons.Function; - input Density d "Density"; - input Temperature T "Temperature"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output AbsolutePressure p "Pressure"; - algorithm - p := IF97_Utilities.p_dT( - d, - T, - phase); - annotation (Inline=true); - end pressure_dT; - - redeclare function specificEnthalpy_dT - "Computes specific enthalpy as a function of density and temperature" - extends Modelica.Icons.Function; - input Density d "Density"; - input Temperature T "Temperature"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output SpecificEnthalpy h "Specific enthalpy"; - algorithm - h := IF97_Utilities.h_dT( - d, - T, - phase); - annotation (Inline=true); - end specificEnthalpy_dT; - - redeclare function specificEnthalpy_pT - "Computes specific enthalpy as a function of pressure and temperature" - extends Modelica.Icons.Function; - input AbsolutePressure p "Pressure"; - input Temperature T "Temperature"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output SpecificEnthalpy h "Specific enthalpy"; - algorithm - h := IF97_Utilities.h_pT(p, T); - annotation (Inline=true); - end specificEnthalpy_pT; - - redeclare function specificEnthalpy_ps - "Computes specific enthalpy as a function of pressure and temperature" - extends Modelica.Icons.Function; - input AbsolutePressure p "Pressure"; - input SpecificEntropy s "Specific entropy"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output SpecificEnthalpy h "Specific enthalpy"; - algorithm - h := IF97_Utilities.h_ps( - p, - s, - phase); - annotation (Inline=true); - end specificEnthalpy_ps; - - redeclare function density_pT - "Computes density as a function of pressure and temperature" - extends Modelica.Icons.Function; - input AbsolutePressure p "Pressure"; - input Temperature T "Temperature"; - input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - output Density d "Density"; - algorithm - d := IF97_Utilities.rho_pT(p, T); - annotation (Inline=true); - end density_pT; - - redeclare function extends setDewState - "Set the thermodynamic state on the dew line" - algorithm - state := ThermodynamicState( - phase=phase, - p=sat.psat, - T=sat.Tsat, - h=dewEnthalpy(sat), - d=dewDensity(sat)); - annotation (Inline=true); - end setDewState; - - redeclare function extends setBubbleState - "Set the thermodynamic state on the bubble line" - algorithm - state := ThermodynamicState( - phase=phase, - p=sat.psat, - T=sat.Tsat, - h=bubbleEnthalpy(sat), - d=bubbleDensity(sat)); - annotation (Inline=true); - end setBubbleState; - - redeclare function extends dynamicViscosity "Dynamic viscosity of water" - algorithm - eta := IF97_Utilities.dynamicViscosity( - state.d, - state.T, - state.p, - state.phase); - annotation (Inline=true); - end dynamicViscosity; - - redeclare function extends thermalConductivity - "Thermal conductivity of water" - algorithm - lambda := IF97_Utilities.thermalConductivity( - state.d, - state.T, - state.p, - state.phase); - annotation (Inline=true); - end thermalConductivity; - - redeclare function extends surfaceTension - "Surface tension in two phase region of water" - algorithm - sigma := IF97_Utilities.surfaceTension(sat.Tsat); - annotation (Inline=true); - end surfaceTension; - - redeclare function extends pressure "Return pressure of ideal gas" - algorithm - p := state.p; - annotation (Inline=true); - end pressure; - - redeclare function extends temperature "Return temperature of ideal gas" - algorithm - T := state.T; - annotation (Inline=true); - end temperature; - - redeclare function extends density "Return density of ideal gas" - algorithm - d := state.d; - annotation (Inline=true); - end density; - - redeclare function extends specificEnthalpy "Return specific enthalpy" - extends Modelica.Icons.Function; - algorithm - h := state.h; - annotation (Inline=true); - end specificEnthalpy; - - redeclare function extends specificInternalEnergy - "Return specific internal energy" - extends Modelica.Icons.Function; - algorithm - u := state.h - state.p/state.d; - annotation (Inline=true); - end specificInternalEnergy; - - redeclare function extends specificGibbsEnergy "Return specific Gibbs energy" - extends Modelica.Icons.Function; - algorithm - g := state.h - state.T*specificEntropy(state); - annotation (Inline=true); - end specificGibbsEnergy; - - redeclare function extends specificHelmholtzEnergy - "Return specific Helmholtz energy" - extends Modelica.Icons.Function; - algorithm - f := state.h - state.p/state.d - state.T*specificEntropy(state); - annotation (Inline=true); - end specificHelmholtzEnergy; - - redeclare function extends specificEntropy "Specific entropy of water" - algorithm - s := if dT_explicit then IF97_Utilities.s_dT( - state.d, - state.T, - state.phase) else if pT_explicit then IF97_Utilities.s_pT(state.p, - state.T) else IF97_Utilities.s_ph( - state.p, - state.h, - state.phase); - annotation (Inline=true); - end specificEntropy; - - redeclare function extends specificHeatCapacityCp - "Specific heat capacity at constant pressure of water" - algorithm - cp := if dT_explicit then IF97_Utilities.cp_dT( - state.d, - state.T, - state.phase) else if pT_explicit then IF97_Utilities.cp_pT(state.p, - state.T) else IF97_Utilities.cp_ph( - state.p, - state.h, - state.phase); - annotation (Inline=true, Documentation(info=" -

In the two phase region this function returns the interpolated heat capacity between the - liquid and vapour state heat capacities.

- ")); - end specificHeatCapacityCp; - - redeclare function extends specificHeatCapacityCv - "Specific heat capacity at constant volume of water" - algorithm - cv := if dT_explicit then IF97_Utilities.cv_dT( - state.d, - state.T, - state.phase) else if pT_explicit then IF97_Utilities.cv_pT(state.p, - state.T) else IF97_Utilities.cv_ph( - state.p, - state.h, - state.phase); - annotation (Inline=true); - end specificHeatCapacityCv; - - redeclare function extends isentropicExponent "Return isentropic exponent" - algorithm - gamma := if dT_explicit then IF97_Utilities.isentropicExponent_dT( - state.d, - state.T, - state.phase) else if pT_explicit then - IF97_Utilities.isentropicExponent_pT(state.p, state.T) else - IF97_Utilities.isentropicExponent_ph( - state.p, - state.h, - state.phase); - end isentropicExponent; - - redeclare function extends isothermalCompressibility - "Isothermal compressibility of water" - algorithm - kappa := if dT_explicit then IF97_Utilities.kappa_dT( - state.d, - state.T, - state.phase) else if pT_explicit then IF97_Utilities.kappa_pT(state.p, - state.T) else IF97_Utilities.kappa_ph( - state.p, - state.h, - state.phase); - annotation (Inline=true); - end isothermalCompressibility; - - redeclare function extends isobaricExpansionCoefficient - "Isobaric expansion coefficient of water" - algorithm - beta := if dT_explicit then IF97_Utilities.beta_dT( - state.d, - state.T, - state.phase) else if pT_explicit then IF97_Utilities.beta_pT(state.p, - state.T) else IF97_Utilities.beta_ph( - state.p, - state.h, - state.phase); - annotation (Inline=true); - end isobaricExpansionCoefficient; - - redeclare function extends velocityOfSound - "Return velocity of sound as a function of the thermodynamic state record" - algorithm - a := if dT_explicit then IF97_Utilities.velocityOfSound_dT( - state.d, - state.T, - state.phase) else if pT_explicit then - IF97_Utilities.velocityOfSound_pT(state.p, state.T) else - IF97_Utilities.velocityOfSound_ph( - state.p, - state.h, - state.phase); - annotation (Inline=true); - end velocityOfSound; - - redeclare function extends isentropicEnthalpy "Compute h(p,s)" - algorithm - h_is := IF97_Utilities.isentropicEnthalpy( - p_downstream, - specificEntropy(refState), - 0); - annotation (Inline=true); - end isentropicEnthalpy; - - redeclare function extends density_derh_p - "Density derivative by specific enthalpy" - algorithm - ddhp := IF97_Utilities.ddhp( - state.p, - state.h, - state.phase); - annotation (Inline=true); - end density_derh_p; - - redeclare function extends density_derp_h "Density derivative by pressure" - algorithm - ddph := IF97_Utilities.ddph( - state.p, - state.h, - state.phase); - annotation (Inline=true); - end density_derp_h; - - // redeclare function extends density_derT_p - // "Density derivative by temperature" - // algorithm - // ddTp := IF97_Utilities.ddTp(state.p, state.h, state.phase); - // end density_derT_p; - // - // redeclare function extends density_derp_T - // "Density derivative by pressure" - // algorithm - // ddpT := IF97_Utilities.ddpT(state.p, state.h, state.phase); - // end density_derp_T; - - redeclare function extends bubbleEnthalpy - "Boiling curve specific enthalpy of water" - algorithm - hl := IF97_Utilities.BaseIF97.Regions.hl_p(sat.psat); - annotation (Inline=true); - end bubbleEnthalpy; - - redeclare function extends dewEnthalpy "Dew curve specific enthalpy of water" - algorithm - hv := IF97_Utilities.BaseIF97.Regions.hv_p(sat.psat); - annotation (Inline=true); - end dewEnthalpy; - - redeclare function extends bubbleEntropy - "Boiling curve specific entropy of water" - algorithm - sl := IF97_Utilities.BaseIF97.Regions.sl_p(sat.psat); - annotation (Inline=true); - end bubbleEntropy; - - redeclare function extends dewEntropy "Dew curve specific entropy of water" - algorithm - sv := IF97_Utilities.BaseIF97.Regions.sv_p(sat.psat); - annotation (Inline=true); - end dewEntropy; - - redeclare function extends bubbleDensity - "Boiling curve specific density of water" - algorithm - dl := if ph_explicit then IF97_Utilities.BaseIF97.Regions.rhol_p(sat.psat) - else IF97_Utilities.BaseIF97.Regions.rhol_T(sat.Tsat); - annotation (Inline=true); - end bubbleDensity; - - redeclare function extends dewDensity "Dew curve specific density of water" - algorithm - dv := if ph_explicit or pT_explicit then - IF97_Utilities.BaseIF97.Regions.rhov_p(sat.psat) else - IF97_Utilities.BaseIF97.Regions.rhov_T(sat.Tsat); - annotation (Inline=true); - end dewDensity; - - redeclare function extends saturationTemperature - "Saturation temperature of water" - algorithm - T := IF97_Utilities.BaseIF97.Basic.tsat(p); - annotation (Inline=true); - end saturationTemperature; - - redeclare function extends saturationTemperature_derp - "Derivative of saturation temperature w.r.t. pressure" - algorithm - dTp := IF97_Utilities.BaseIF97.Basic.dtsatofp(p); - annotation (Inline=true); - end saturationTemperature_derp; - - redeclare function extends saturationPressure "Saturation pressure of water" - algorithm - p := IF97_Utilities.BaseIF97.Basic.psat(T); - annotation (Inline=true); - end saturationPressure; - - redeclare function extends dBubbleDensity_dPressure - "Bubble point density derivative" - algorithm - ddldp := IF97_Utilities.BaseIF97.Regions.drhol_dp(sat.psat); - annotation (Inline=true); - end dBubbleDensity_dPressure; - - redeclare function extends dDewDensity_dPressure - "Dew point density derivative" - algorithm - ddvdp := IF97_Utilities.BaseIF97.Regions.drhov_dp(sat.psat); - annotation (Inline=true); - end dDewDensity_dPressure; - - redeclare function extends dBubbleEnthalpy_dPressure - "Bubble point specific enthalpy derivative" - algorithm - dhldp := IF97_Utilities.BaseIF97.Regions.dhl_dp(sat.psat); - annotation (Inline=true); - end dBubbleEnthalpy_dPressure; - - redeclare function extends dDewEnthalpy_dPressure - "Dew point specific enthalpy derivative" - algorithm - dhvdp := IF97_Utilities.BaseIF97.Regions.dhv_dp(sat.psat); - annotation (Inline=true); - end dDewEnthalpy_dPressure; - - redeclare function extends setState_dTX - "Return thermodynamic state of water as function of d and T" - algorithm - state := ThermodynamicState( - d=d, - T=T, - phase=0, - h=specificEnthalpy_dT(d, T), - p=pressure_dT(d, T)); - annotation (Inline=true); - end setState_dTX; - - redeclare function extends setState_phX - "Return thermodynamic state of water as function of p and h" - algorithm - state := ThermodynamicState( - d=density_ph(p, h), - T=temperature_ph(p, h), - phase=0, - h=h, - p=p); - annotation (Inline=true); - end setState_phX; - - redeclare function extends setState_psX - "Return thermodynamic state of water as function of p and s" - algorithm - state := ThermodynamicState( - d=density_ps(p, s), - T=temperature_ps(p, s), - phase=0, - h=specificEnthalpy_ps(p, s), - p=p); - annotation (Inline=true); - end setState_psX; - - redeclare function extends setState_pTX - "Return thermodynamic state of water as function of p and T" - algorithm - state := ThermodynamicState( - d=density_pT(p, T), - T=T, - phase=1, - h=specificEnthalpy_pT(p, T), - p=p); - annotation (Inline=true); - end setState_pTX; - - redeclare function extends setSmoothState - "Return thermodynamic state so that it smoothly approximates: if x > 0 then state_a else state_b" - import Modelica.Media.Common.smoothStep; - algorithm - state := ThermodynamicState( - p=smoothStep( - x, - state_a.p, - state_b.p, - x_small), - h=smoothStep( - x, - state_a.h, - state_b.h, - x_small), - d=density_ph(smoothStep( - x, - state_a.p, - state_b.p, - x_small), smoothStep( - x, - state_a.h, - state_b.h, - x_small)), - T=temperature_ph(smoothStep( - x, - state_a.p, - state_b.p, - x_small), smoothStep( - x, - state_a.h, - state_b.h, - x_small)), - phase=0); - annotation (Inline=true); - end setSmoothState; - annotation (Documentation(info=" -

-This model calculates medium properties -for water in the liquid, gas and two phase regions -according to the IAPWS/IF97 standard, i.e., the accepted industrial standard -and best compromise between accuracy and computation time. -For more details see -Modelica.Media.Water.IF97_Utilities. Three variable pairs can be the -independent variables of the model: -

-
    -
  1. Pressure p and specific enthalpy h are the most natural choice for general applications. This is the recommended choice for most general purpose applications, in particular for power plants.
    2. -
  2. Pressure p and temperature T are the most natural choice for applications where water is always in the same phase, both for liquid water and steam.
    3. -
  3. Density d and temperature T are explicit variables of the Helmholtz function in the near-critical region and can be the best choice for applications with super-critical or near-critical states.
    4. -
-

-The following quantities are always computed: -

- - - - - - - - - - - - - - - - - - - -
VariableUnitDescription
TKtemperature
uJ/kgspecific internal energy
dkg/m^3density
pPapressure
hJ/kgspecific enthalpy
-

-In some cases additional medium properties are needed. -A component that needs these optional properties has to call -one of the functions listed in - -Modelica.Media.UsersGuide.MediumUsage.OptionalProperties and in - -Modelica.Media.UsersGuide.MediumUsage.TwoPhase. -

-

Many further properties can be computed. Using the well-known Bridgman's Tables, all first partial derivatives of the standard thermodynamic variables can be computed easily.

-")); -end WaterIF97_base; - - -partial package WaterIF97_fixedregion - "Water: Steam properties as defined by IAPWS/IF97 standard" - - extends Interfaces.PartialTwoPhaseMedium( - mediumName="WaterIF97", - substanceNames={"water"}, - singleState=false, - SpecificEnthalpy(start=1.0e5, nominal=5.0e5), - Density(start=150, nominal=500), - AbsolutePressure(start=50e5, nominal=10e5), - Temperature(start=500, nominal=500), - smoothModel=false, - onePhase=false, - fluidConstants=waterConstants); - - redeclare record extends ThermodynamicState "Thermodynamic state" - SpecificEnthalpy h "Specific enthalpy"; - Density d "Density"; - Temperature T "Temperature"; - AbsolutePressure p "Pressure"; - end ThermodynamicState; - - constant Integer Region "Region of IF97, if known"; - constant Boolean ph_explicit - "True if explicit in pressure and specific enthalpy"; - constant Boolean dT_explicit "True if explicit in density and temperature"; - constant Boolean pT_explicit "True if explicit in pressure and temperature"; - - redeclare replaceable model extends BaseProperties( - h(stateSelect=if ph_explicit then StateSelect.prefer else StateSelect.default), - d(stateSelect=if dT_explicit then StateSelect.prefer else StateSelect.default), - T(stateSelect=if (pT_explicit or dT_explicit) then StateSelect.prefer else - StateSelect.default), - p(stateSelect=if (pT_explicit or ph_explicit) then StateSelect.prefer else - StateSelect.default)) "Base properties of water" - - Integer phase(min=0, max=2) - "2 for two-phase, 1 for one-phase, 0 if not known"; - SaturationProperties sat(Tsat(start=300.0), psat(start=1.0e5)) - "Saturation temperature and pressure"; - equation - MM = fluidConstants[1].molarMass; - if smoothModel then - if onePhase then - phase = 1; - if ph_explicit then - assert(((h < bubbleEnthalpy(sat) or h > dewEnthalpy(sat)) or p > - fluidConstants[1].criticalPressure), - "With onePhase=true this model may only be called with one-phase states h < hl or h > hv!"); - else - assert(not ((d < bubbleDensity(sat) and d > dewDensity(sat)) and T < - fluidConstants[1].criticalTemperature), - "With onePhase=true this model may only be called with one-phase states d > dl or d < dv!"); - end if; - else - phase = 0; - end if; - else - if ph_explicit then - phase = if ((h < bubbleEnthalpy(sat) or h > dewEnthalpy(sat)) or p > - fluidConstants[1].criticalPressure) then 1 else 2; - elseif dT_explicit then - phase = if not ((d < bubbleDensity(sat) and d > dewDensity(sat)) and T - < fluidConstants[1].criticalTemperature) then 1 else 2; - else - phase = 1; - //this is for the one-phase only case pT - end if; - end if; if dT_explicit then p = pressure_dT( d, @@ -953,7 +255,7 @@ partial package WaterIF97_fixedregion input AbsolutePressure p "Pressure"; input SpecificEnthalpy h "Specific enthalpy"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output Density d "Density"; algorithm @@ -971,7 +273,7 @@ partial package WaterIF97_fixedregion input AbsolutePressure p "Pressure"; input SpecificEnthalpy h "Specific enthalpy"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output Temperature T "Temperature"; algorithm @@ -989,7 +291,7 @@ partial package WaterIF97_fixedregion input AbsolutePressure p "Pressure"; input SpecificEntropy s "Specific entropy"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output Temperature T "Temperature"; algorithm @@ -1007,7 +309,7 @@ partial package WaterIF97_fixedregion input AbsolutePressure p "Pressure"; input SpecificEntropy s "Specific entropy"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output Density d "Density"; algorithm @@ -1025,7 +327,7 @@ partial package WaterIF97_fixedregion input Density d "Density"; input Temperature T "Temperature"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output AbsolutePressure p "Pressure"; algorithm @@ -1043,7 +345,7 @@ partial package WaterIF97_fixedregion input Density d "Density"; input Temperature T "Temperature"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output SpecificEnthalpy h "Specific enthalpy"; algorithm @@ -1061,7 +363,7 @@ partial package WaterIF97_fixedregion input AbsolutePressure p "Pressure"; input Temperature T "Temperature"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output SpecificEnthalpy h "Specific enthalpy"; algorithm @@ -1078,7 +380,7 @@ partial package WaterIF97_fixedregion input AbsolutePressure p "Pressure"; input SpecificEntropy s "Specific entropy"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output SpecificEnthalpy h "Specific enthalpy"; algorithm @@ -1096,7 +398,7 @@ partial package WaterIF97_fixedregion input AbsolutePressure p "Pressure"; input Temperature T "Temperature"; input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known"; - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; output Density d "Density"; algorithm @@ -1361,6 +663,18 @@ partial package WaterIF97_fixedregion annotation (Inline=true); end density_derp_h; + // redeclare function extends density_derT_p + // "Density derivative by temperature" + // algorithm + // ddTp := IF97_Utilities.ddTp(state.p, state.h, state.phase); + // end density_derT_p; + // + // redeclare function extends density_derp_T + // "Density derivative by pressure" + // algorithm + // ddpT := IF97_Utilities.ddpT(state.p, state.h, state.phase); + // end density_derp_T; + redeclare function extends bubbleEnthalpy "Boiling curve specific enthalpy of water" algorithm @@ -1454,13 +768,13 @@ partial package WaterIF97_fixedregion redeclare function extends setState_dTX "Return thermodynamic state of water as function of d, T, and optional region" - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; algorithm state := ThermodynamicState( d=d, T=T, - phase=if region == 0 then IF97_Utilities.phase_dT(d, T) else if + phase=if region == 0 then 0 else if region == 4 then 2 else 1, h=specificEnthalpy_dT( d, @@ -1475,7 +789,7 @@ partial package WaterIF97_fixedregion redeclare function extends setState_phX "Return thermodynamic state of water as function of p, h, and optional region" - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; algorithm state := ThermodynamicState( @@ -1487,8 +801,7 @@ partial package WaterIF97_fixedregion p, h, region=region), - phase=if region == 0 then IF97_Utilities.phase_ph(p, h) else if - region == 4 then 2 else 1, + phase=if region == 0 then 0 else if region==4 then 2 else 1, h=h, p=p); annotation (Inline=true); @@ -1496,7 +809,7 @@ partial package WaterIF97_fixedregion redeclare function extends setState_psX "Return thermodynamic state of water as function of p, s, and optional region" - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; algorithm state := ThermodynamicState( @@ -1508,7 +821,7 @@ partial package WaterIF97_fixedregion p, s, region=region), - phase=IF97_Utilities.phase_ps(p, s), + phase=if region == 0 then 0 else if region==4 then 2 else 1, h=specificEnthalpy_ps( p, s, @@ -1519,7 +832,7 @@ partial package WaterIF97_fixedregion redeclare function extends setState_pTX "Return thermodynamic state of water as function of p, T, and optional region" - input Integer region=0 + input Integer region=Region "If 0, region is unknown, otherwise known and this input"; algorithm state := ThermodynamicState( @@ -1623,6 +936,12 @@ Modelica.Media.UsersGuide.MediumUsage.TwoPhase.

Many further properties can be computed. Using the well-known Bridgman's Tables, all first partial derivatives of the standard thermodynamic variables can be computed easily.

")); +end WaterIF97_base; + + +partial package WaterIF97_fixedregion + "Water: Steam properties as defined by IAPWS/IF97 standard, fixed region" + extends WaterIF97_base(Region(min=1)=1); end WaterIF97_fixedregion;