Merged IBPSA, lbl-srg/BuildingsPy#376

lbl-srg · Sep 12, 2020 · f02747c · f02747c
1 parent 3613779
commit f02747c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo b/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo
@@ -2,16 +2,16 @@ within Buildings.Utilities.Psychrometrics.Functions.BaseClasses;
 function der_saturationPressureLiquid
   "Derivative of the function saturationPressureLiquid"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature Tsat "Saturation temperature";
-  input Real dTsat(unit="K/s") "Saturation temperature derivative";
+  input Modelica.Units.SI.Temperature TSat "Saturation temperature";
+  input Real dTSat(unit="K/s") "Saturation temperature derivative";
   output Real psat_der(unit="Pa/s") "Differential of saturation pressure";
 
 algorithm
   psat_der:=611.657*Modelica.Math.exp(17.2799 - 4102.99
-            /(Tsat - 35.719))*4102.99*dTsat/(Tsat - 35.719)^2;
+            /(TSat - 35.719))*4102.99*dTSat/(TSat - 35.719)^2;
 
   annotation(Inline=false,
-    smoothOrder=5,
+    smoothOrder=98,
     Documentation(info="<html>
 <p>
 Derivative of function
@@ -22,6 +22,12 @@ Buildings.Utilities.Psychrometrics.Functions.saturationPressureLiquid</a>.
 revisions="<html>
 <ul>
 <li>
+September 12, 2020, by Michael Wetter:<br/>
+Corrected name of argument to comply with derivative specification.<br/>
+This is for
+<a href=\"modelica://https://github.com/ibpsa/modelica-ibpsa/issues/1393\">#1393</a>.
+</li>
+<li>
 November 20, 2013 by Michael Wetter:<br/>
 First implementation, moved from <code>Buildings.Media</code>.
 </li>

diff --git a/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo b/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo
@@ -5,13 +5,13 @@ function der_sublimationPressureIce
     input Modelica.SIunits.Temperature TSat(displayUnit="degC",
                                             nominal=300)
     "Saturation temperature";
-    input Real dTsat(unit="K/s") "Sublimation temperature derivative";
+    input Real dTSat(unit="K/s") "Sublimation temperature derivative";
     output Real psat_der(unit="Pa/s") "Sublimation pressure derivative";
 protected
     Modelica.SIunits.Temperature TTriple=273.16 "Triple point temperature";
     Modelica.SIunits.AbsolutePressure pTriple=611.657 "Triple point pressure";
     Real r1=TSat/TTriple "Common subexpression 1";
-    Real r1_der=dTsat/TTriple "Derivative of common subexpression 1";
+    Real r1_der=dTSat/TTriple "Derivative of common subexpression 1";
     Real a[2]={-13.9281690,34.7078238} "Coefficients a[:]";
     Real n[2]={-1.5,-1.25} "Coefficients n[:]";
 algorithm
@@ -30,6 +30,13 @@ Buildings.Utilities.Psychrometrics.Functions.sublimationPressureIce</a>.
 revisions="<html>
 <ul>
 <li>
+September 12, 2020, by Michael Wetter:<br/>
+Change name of argument <code>dTsat</code> to <code>dTSat</code> for consistency
+with
+<a href=\"modelica://Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_saturationPressureLiquid\">
+Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_saturationPressureLiquid</a>.
+</li>
+<li>
 November 20, 2013 by Michael Wetter:<br/>
 First implementation, moved from <code>Buildings.Media</code>.
 </li>