From 289ba3c99d7773065dfaee9cc5a8d2860616b8b0 Mon Sep 17 00:00:00 2001 From: Thomas Beutlich Date: Wed, 18 Dec 2019 21:52:30 +0100 Subject: [PATCH] refs #294: Corrected/unified abbreviation "w.r.t"/"wrt" --> "w.r.t." --- Modelica/Fluid/Dissipation.mo | 16 +++++----- Modelica/Media/R134a.mo | 60 +++++++++++++++++------------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Modelica/Fluid/Dissipation.mo b/Modelica/Fluid/Dissipation.mo index f4c666ef7e..d052a439a9 100644 --- a/Modelica/Fluid/Dissipation.mo +++ b/Modelica/Fluid/Dissipation.mo @@ -2992,7 +2992,7 @@ This record is used as input record for the heat transfer funct SI.ReynoldsNumber Re=max(Re_min, 4*abs(m_flow)/(PI*IN_con.d_hyd*IN_var.eta)) "Reynolds number"; - //mass flow rate boundaries for w.r.t flow regimes + //mass flow rate boundaries for w.r.t. flow regimes SI.MassFlowRate m_flow_smooth=Re_min*PI*IN_con.d_hyd*IN_var.eta/4; //SOURCE_1: p.357, diag. 6-1, sec. 2 / p.336, sec. 15 (turbulent regime + hydraulically rough): @@ -3130,7 +3130,7 @@ This record is used as input record for the heat transfer funct TYP.LocalResistanceCoefficient zeta_LOC_sharp_turb=max(MIN, A1*B1*C1) "Local resistance coefficient for turbulent regime (Re > Re_turb_max)"; - //SOURCE_1: p.357, diag. 6-1: pressure loss boundaries for w.r.t flow regimes + //SOURCE_1: p.357, diag. 6-1: pressure loss boundaries for w.r.t. flow regimes //IN_con.R_0/d_hyd <=3 SI.AbsolutePressure dp_lam_max=(zeta_LOC_sharp_turb + A2/Re_lam_leave)*IN_var.rho /2*(Re_lam_leave*IN_var.eta/(IN_var.rho*d_hyd))^2 @@ -3175,7 +3175,7 @@ This record is used as input record for the heat transfer funct zeta_LOC_sharp_turb))) "Mean velocity in turbulent regime with independence on pressure loss coefficient (Re > Re_turb_max)"; - //mean velocity under smooth conditions w.r.t flow regime + //mean velocity under smooth conditions w.r.t. flow regime SI.Velocity v_smooth=if dp < dp_lam_max then v_lam else if dp < dp_turb_min then SMOOTH( dp_lam_max, @@ -3332,7 +3332,7 @@ and incompressible TYP.LocalResistanceCoefficient zeta_LOC=max(MIN, 0.95*sin(PI/180*delta/2)^2 + 2.05*sin(PI/180*delta/2)^4) "Local resistance coefficient"; - //SOURCE_1: p.365: Correction w.r.t effect of Reynolds number + //SOURCE_1: p.365: Correction w.r.t. effect of Reynolds number Real B=24.8 "Coefficient considering effect of Reynolds number on zeta_TOT"; Real exp=0.263 "Exponent for Reynolds number correction"; @@ -3532,7 +3532,7 @@ Generally this function is numerically best used for the incompressible dp_min, 1/pow) "Mean velocity under laminar conditions"; - //mean velocity under smooth conditions w.r.t flow regime + //mean velocity under smooth conditions w.r.t. flow regime SI.Velocity v_smooth=if abs(dp) > dp_turb_max then v_turb else if abs(dp) < dp_turb_min then v_lam else SMOOTH( @@ -8126,7 +8126,7 @@ Note that the Darcy friction factor for a smooth surface lambda_FRI_smo

-The correction for surface roughness through CF_Fri is used only in the turbulent regime, where the fluid flow is influenced by surface asperities not covered by a laminar boundary layer. Here the correction according to friction starts at Re ≥ Re_lam_leave according to [Idelchik 2006, p. 336, sec. 15]. Here the end of the laminar regime is restricted to a Reynolds number smaller than 2e3 w.r.t [VDI, p. Lac 6, fig. 16]. +The correction for surface roughness through CF_Fri is used only in the turbulent regime, where the fluid flow is influenced by surface asperities not covered by a laminar boundary layer. Here the correction according to friction starts at Re ≥ Re_lam_leave according to [Idelchik 2006, p. 336, sec. 15]. Here the end of the laminar regime is restricted to a Reynolds number smaller than 2e3 w.r.t. [VDI, p. Lac 6, fig. 16].

diff --git a/Modelica/Media/R134a.mo b/Modelica/Media/R134a.mo index 0f0de7d71c..a84413ec3a 100644 --- a/Modelica/Media/R134a.mo +++ b/Modelica/Media/R134a.mo @@ -22,9 +22,9 @@ package R134a "R134a: Medium model for R134a" "Isobaric expansion coefficient"; Modelica.SIunits.IsentropicExponent gamma "Isentropic exponent"; Modelica.SIunits.DerPressureByTemperature pt - "Derivative of pressure wrt temperature"; + "Derivative of pressure w.r.t. temperature"; Modelica.SIunits.DerPressureByDensity pd - "Derivative of pressure wrt density"; + "Derivative of pressure w.r.t. density"; end PhaseBoundaryProperties; @@ -39,8 +39,8 @@ package R134a "R134a: Medium model for R134a" Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; Modelica.SIunits.SpecificHeatCapacity cv "Specific heat capacity at constant volume"; - Real pt "Derivative of pressure wrt temperature"; - Real pd "Derivative of pressure wrt density"; + Real pt "Derivative of pressure w.r.t. temperature"; + Real pd "Derivative of pressure w.r.t. density"; Real dpT "dp/dT derivative of saturation curve"; end InverseDerivatives_rhoT; @@ -750,7 +750,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end saturationTemperature_der_p; redeclare function extends bubbleDensity - "Density of liquid phase w.r.t saturation pressure | use setSat_p function for input" + "Density of liquid phase w.r.t. saturation pressure | use setSat_p function for input" protected constant Real dl_coef[:, :]=R134aData.dlcoef @@ -781,7 +781,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end bubbleDensity; redeclare function extends dBubbleDensity_dPressure - "Derivative of liquid density in two-phase region w.r.t pressure" + "Derivative of liquid density in two-phase region w.r.t. pressure" protected constant Real dl_coef[:, :]=R134aData.dlcoef @@ -809,14 +809,14 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dBubbleDensity_dPressure; function dBubbleDensity_dPressure_der_sat - "Time derivative of liquid density in two-phase region w.r.t pressure" + "Time derivative of liquid density in two-phase region w.r.t. pressure" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; input SaturationProperties der_sat "Derivative of saturation properties"; output Real der_ddldp - "Time derivative of liquid density in two-phase region w.r.t pressure"; + "Time derivative of liquid density in two-phase region w.r.t. pressure"; protected constant Real dl_coef[:, :]=R134aData.dlcoef "Coefficients of cubic spline for d_liq(p)"; @@ -843,7 +843,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dBubbleDensity_dPressure_der_sat; redeclare function extends dewDensity - "Density of vapor phase w.r.t saturation pressure | use setSat_p function for input" + "Density of vapor phase w.r.t. saturation pressure | use setSat_p function for input" protected constant Real dv_coef[:, :]=R134aData.dvcoef @@ -873,7 +873,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dewDensity; redeclare function extends dDewDensity_dPressure - "Derivative of vapor density in two-phase region w.r.t pressure" + "Derivative of vapor density in two-phase region w.r.t. pressure" protected constant Real dv_coef[:, :]=R134aData.dvcoef @@ -901,14 +901,14 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dDewDensity_dPressure; function dDewDensity_dPressure_der_sat - "Time derivative of vapor density in two-phase region w.r.t pressure" + "Time derivative of vapor density in two-phase region w.r.t. pressure" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; input SaturationProperties der_sat "Derivative of saturation properties"; output Real der_ddvdp - "Time derivative of vapor density in two-phase region w.r.t pressure"; + "Time derivative of vapor density in two-phase region w.r.t. pressure"; protected constant Real dv_coef[:, :]=R134aData.dvcoef "Coefficients of cubic spline for d_vap(p)"; @@ -935,7 +935,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dDewDensity_dPressure_der_sat; redeclare function extends bubbleEnthalpy - "Specific enthalpy of liquid phase w.r.t saturation pressure | use setSat_p function for input" + "Specific enthalpy of liquid phase w.r.t. saturation pressure | use setSat_p function for input" protected constant Real hl_coef[:, :]=R134aData.hlcoef @@ -966,7 +966,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end bubbleEnthalpy; redeclare function extends dBubbleEnthalpy_dPressure - "Derivative of liquid specific enthalpy in two-phase region w.r.t pressure" + "Derivative of liquid specific enthalpy in two-phase region w.r.t. pressure" protected constant Real hl_coef[:, :]=R134aData.hlcoef @@ -994,14 +994,14 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dBubbleEnthalpy_dPressure; function dBubbleEnthalpy_dPressure_der_sat - "Time derivative of liquid specific enthalpy in two-phase region w.r.t pressure" + "Time derivative of liquid specific enthalpy in two-phase region w.r.t. pressure" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; input SaturationProperties der_sat "Derivative of saturation properties"; output Real der_dhldp - "Time derivative of liquid specific enthalpy in two-phase region w.r.t pressure"; + "Time derivative of liquid specific enthalpy in two-phase region w.r.t. pressure"; protected constant Real hl_coef[:, :]=R134aData.hlcoef "Coefficients of cubic spline for h_liq(p)"; @@ -1028,7 +1028,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dBubbleEnthalpy_dPressure_der_sat; redeclare function extends dewEnthalpy - "Specific enthalpy of vapor phase w.r.t saturation pressure | use setSat_p function for input" + "Specific enthalpy of vapor phase w.r.t. saturation pressure | use setSat_p function for input" protected constant Real hv_coef[:, :]=R134aData.hvcoef @@ -1059,7 +1059,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dewEnthalpy; redeclare function extends dDewEnthalpy_dPressure - "Derivative of vapor specific enthalpy in two-phase region w.r.t pressure" + "Derivative of vapor specific enthalpy in two-phase region w.r.t. pressure" protected constant Real hv_coef[:, :]=R134aData.hvcoef @@ -1087,14 +1087,14 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dDewEnthalpy_dPressure; function dDewEnthalpy_dPressure_der_sat - "Time derivative of vapor specific enthalpy in two-phase region w.r.t pressure" + "Time derivative of vapor specific enthalpy in two-phase region w.r.t. pressure" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; input SaturationProperties der_sat "Derivative of saturation properties"; output Real der_dhvdp - "Derivative of vapor specific enthalpy in two-phase region w.r.t pressure"; + "Derivative of vapor specific enthalpy in two-phase region w.r.t. pressure"; protected constant Real hv_coef[:, :]=R134aData.hvcoef "Coefficients of cubic spline for h_vap(p)"; @@ -1121,7 +1121,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dDewEnthalpy_dPressure_der_sat; redeclare function extends dewEntropy - "Specific entropy of vapor phase w.r.t saturation pressure | use setSat_p function for input" + "Specific entropy of vapor phase w.r.t. saturation pressure | use setSat_p function for input" protected constant Real sv_coef[:, :]=R134aData.svcoef @@ -1151,13 +1151,13 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dewEntropy; function dDewEntropy_dPressure - "Derivative of vapor specific entropy in two-phase region w.r.t pressure | use setState_phX function for input" + "Derivative of vapor specific entropy in two-phase region w.r.t. pressure | use setState_phX function for input" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; output Real dsvdp - "Derivative of vapor specific entropy in two-phase region w.r.t pressure"; + "Derivative of vapor specific entropy in two-phase region w.r.t. pressure"; protected constant Real sv_coef[:, :]=R134aData.svcoef "Coefficients of cubic spline for s_vap(p)"; @@ -1184,14 +1184,14 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dDewEntropy_dPressure; function dDewEntropy_dPressure_der_sat - "Time derivative of vapor specific entropy in two-phase region w.r.t pressure | use setState_phX function for input" + "Time derivative of vapor specific entropy in two-phase region w.r.t. pressure | use setState_phX function for input" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; input SaturationProperties der_sat "Derivative of saturation properties"; output Real der_dsvdp - "Derivative of vapor specific entropy in two-phase region w.r.t pressure"; + "Derivative of vapor specific entropy in two-phase region w.r.t. pressure"; protected constant Real sv_coef[:, :]=R134aData.svcoef "Coefficients of cubic spline for s_liq(p)"; @@ -1218,7 +1218,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dDewEntropy_dPressure_der_sat; redeclare function extends bubbleEntropy - "Specific entropy of liquid phase w.r.t saturation pressure | use setSat_p function for input" + "Specific entropy of liquid phase w.r.t. saturation pressure | use setSat_p function for input" protected constant Real sl_coef[:, :]=R134aData.slcoef "Coefficients of cubic spline for s_liq(p)"; @@ -1248,12 +1248,12 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end bubbleEntropy; function dBubbleEntropy_dPressure - "Derivative of liquid specific entropy in two-phase region w.r.t pressure | use setState_phX function for input" + "Derivative of liquid specific entropy in two-phase region w.r.t. pressure | use setState_phX function for input" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; output Real dsldp - "Derivative of liquid specific entropy in two-phase region w.r.t pressure"; + "Derivative of liquid specific entropy in two-phase region w.r.t. pressure"; protected constant Real sl_coef[:, :]=R134aData.slcoef "Coefficients of cubic spline for s_liq(p)"; @@ -1280,13 +1280,13 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe end dBubbleEntropy_dPressure; function dBubbleEntropy_dPressure_der_sat - "Time derivative of liquid specific entropy in two-phase region w.r.t pressure | use setState_phX function for input" + "Time derivative of liquid specific entropy in two-phase region w.r.t. pressure | use setState_phX function for input" extends Modelica.Icons.Function; input SaturationProperties sat "Saturation properties | pressure is used for interpolation"; input SaturationProperties der_sat "Derivative of saturation properties"; output Real der_dsldp - "Derivative of liquid specific entropy in two-phase region w.r.t pressure"; + "Derivative of liquid specific entropy in two-phase region w.r.t. pressure"; protected constant Real sl_coef[:, :]=R134aData.slcoef "Coefficients of cubic spline for s_liq(p)";