Skip to content

Commit

Permalink
Removed WetBul_pTX.mo
Browse files Browse the repository at this point in the history 
For #475
  • Loading branch information
@mwetter
mwetter committed Nov 4, 2016
1 parent 7be4362 commit 3d39330
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 259 deletions.
5 changes: 0 additions & 5 deletions ...esources/ReferenceResults/Dymola/Annex60_Utilities_Psychrometrics_Examples_WetBul_pTX.txt
View file

This file was deleted.

33 changes: 0 additions & 33 deletions Annex60/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/WetBul_pTX.mos
View file

This file was deleted.

48 changes: 0 additions & 48 deletions Annex60/Utilities/Psychrometrics/Examples/WetBul_pTX.mo
View file

This file was deleted.

1 change: 0 additions & 1 deletion Annex60/Utilities/Psychrometrics/Examples/package.order
View file
Expand Up @@ -9,4 +9,3 @@ SublimationPressureIce
TWetBul_TDryBulPhi
TWetBul_TDryBulXi
TotalAirDryAir
WetBul_pTX
77 changes: 43 additions & 34 deletions Annex60/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo
View file
Expand Up @@ -56,13 +56,13 @@ equation
else
XiSatRefIn=(1-XiDryBul)*XiSat/(1-XiSat);
XiSat = Annex60.Utilities.Psychrometrics.Functions.X_pSatpphi(
pSat= Annex60.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TWetBul),
p= p,
phi= 1);
pSat = Annex60.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TWetBul),
p = p,
phi = 1);
XiDryBul =Annex60.Utilities.Psychrometrics.Functions.X_pSatpphi(
p= p,
pSat= Annex60.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TDryBul),
phi= phi);
p = p,
pSat = Annex60.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TDryBul),
phi = phi);
(TWetBul-Annex60.Utilities.Psychrometrics.Constants.T_ref) * (
(1-XiDryBul) * Annex60.Utilities.Psychrometrics.Constants.cpAir +
XiSatRefIn * Annex60.Utilities.Psychrometrics.Constants.cpSte +
Expand All @@ -80,38 +80,12 @@ equation
annotation (
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
100}}), graphics={
Ellipse(
extent={{-22,-94},{18,-56}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={0,0,127},
fillPattern=FillPattern.Solid),
Rectangle(
extent={{-14,44},{10,-64}},
lineColor={0,0,255},
pattern=LinePattern.None,
fillColor={0,0,127},
fillPattern=FillPattern.Solid),
Polygon(
points={{-14,44},{-14,84},{-12,90},{-8,92},{-2,94},{4,92},{8,90},{10,
84},{10,44},{-14,44}},
lineColor={0,0,0},
lineThickness=0.5),
Line(
points={{-14,44},{-14,-60}},
thickness=0.5),
Line(
points={{10,44},{10,-60}},
thickness=0.5),
Line(points={{-42,-16},{-14,-16}}),
Line(points={{-42,24},{-14,24}}),
Line(points={{-42,64},{-14,64}}),
Text(
extent={{-92,100},{-62,56}},
lineColor={0,0,127},
textString="TDryBul"),
Text(
extent={{-86,14},{-54,-14}},
extent={{-92,14},{-72,-12}},
lineColor={0,0,127},
textString="phi"),
Text(
Expand All @@ -121,7 +95,38 @@ annotation (
Text(
extent={{62,22},{92,-22}},
lineColor={0,0,127},
textString="TWetBul")}),
textString="TWetBul"),
Line(points={{78,-74},{-48,-74}}),
Text(
extent={{76,-78},{86,-94}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid,
textString="T"),
Line(
points={{76,-46},{26,-4}},
color={255,0,0},
thickness=0.5),
Line(points={{-48,-48},{-2,-30},{28,-4},{48,32},{52,72}},
color={0,0,0},
smooth=Smooth.Bezier),
Line(points={{-48,84},{-48,-74}}),
Text(
extent={{-44,82},{-22,64}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid,
textString="X"),
Polygon(
points={{86,-74},{76,-72},{76,-76},{86,-74}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Polygon(
points={{-48,88},{-46,74},{-50,74},{-48,88}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid)}),
defaultComponentName="wetBul",
Documentation(info="<html>
<p>
Expand Down Expand Up @@ -165,6 +170,10 @@ DOI: 10.1175/JAMC-D-11-0143.1
revisions="<html>
<ul>
<li>
November 3, 2016, by Michael Wetter:<br/>
Changed icon.
</li>
<li>
May 24, 2016, by Filip Jorissen:<br/>
Corrected exact implementation.
See <a href=\"https://github.com/iea-annex60/modelica-annex60/issues/474\">#474</a>
Expand Down
71 changes: 40 additions & 31 deletions Annex60/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo
View file
Expand Up @@ -71,9 +71,9 @@ equation
else
XiSatRefIn=(1-Xi[iWat])*XiSat/(1-XiSat);
XiSat = Annex60.Utilities.Psychrometrics.Functions.X_pSatpphi(
pSat= Annex60.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TWetBul),
p= p,
phi= 1);
pSat = Annex60.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TWetBul),
p = p,
phi = 1);
(TWetBul-Annex60.Utilities.Psychrometrics.Constants.T_ref) * (
(1-Xi[iWat]) * Annex60.Utilities.Psychrometrics.Constants.cpAir +
XiSatRefIn * Annex60.Utilities.Psychrometrics.Constants.cpSte +
Expand All @@ -90,38 +90,12 @@ equation
annotation (
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
100}}), graphics={
Ellipse(
extent={{-22,-94},{18,-56}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={0,0,127},
fillPattern=FillPattern.Solid),
Rectangle(
extent={{-14,44},{10,-64}},
lineColor={0,0,255},
pattern=LinePattern.None,
fillColor={0,0,127},
fillPattern=FillPattern.Solid),
Polygon(
points={{-14,44},{-14,84},{-12,90},{-8,92},{-2,94},{4,92},{8,90},{10,
84},{10,44},{-14,44}},
lineColor={0,0,0},
lineThickness=0.5),
Line(
points={{-14,44},{-14,-60}},
thickness=0.5),
Line(
points={{10,44},{10,-60}},
thickness=0.5),
Line(points={{-42,-16},{-14,-16}}),
Line(points={{-42,24},{-14,24}}),
Line(points={{-42,64},{-14,64}}),
Text(
extent={{-92,100},{-62,56}},
lineColor={0,0,127},
textString="TDryBul"),
Text(
extent={{-90,8},{-72,-10}},
extent={{-86,14},{-72,-6}},
lineColor={0,0,127},
textString="Xi"),
Text(
Expand All @@ -131,7 +105,38 @@ annotation (
Text(
extent={{62,22},{92,-22}},
lineColor={0,0,127},
textString="TWetBul")}),
textString="TWetBul"),
Line(points={{78,-74},{-48,-74}}),
Text(
extent={{76,-78},{86,-94}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid,
textString="T"),
Line(
points={{76,-46},{26,-4}},
color={255,0,0},
thickness=0.5),
Line(points={{-48,-48},{-2,-30},{28,-4},{48,32},{52,72}},
color={0,0,0},
smooth=Smooth.Bezier),
Line(points={{-48,84},{-48,-74}}),
Text(
extent={{-44,82},{-22,64}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid,
textString="X"),
Polygon(
points={{86,-74},{76,-72},{76,-76},{86,-74}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Polygon(
points={{-48,88},{-46,74},{-50,74},{-48,88}},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid)}),
defaultComponentName="wetBul",
Documentation(info="<html>
<p>
Expand Down Expand Up @@ -172,6 +177,10 @@ DOI: 10.1175/JAMC-D-11-0143.1
revisions="<html>
<ul>
<li>
November 3, 2016, by Michael Wetter:<br/>
Changed icon.
</li>
<li>
May 24, 2016, by Filip Jorissen:<br/>
Corrected exact implementation.
See <a href=\"https://github.com/iea-annex60/modelica-annex60/issues/474\">#474</a>
Expand Down

0 comments on commit 3d39330

Please sign in to comment.