From 3d39330311394df1ec28e1e1e95ba4956d9d24cc Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Thu, 3 Nov 2016 17:01:00 -0700 Subject: [PATCH] Removed WetBul_pTX.mo For #475 --- ...ies_Psychrometrics_Examples_WetBul_pTX.txt | 5 - .../Psychrometrics/Examples/WetBul_pTX.mos | 33 ------ .../Psychrometrics/Examples/WetBul_pTX.mo | 48 -------- .../Psychrometrics/Examples/package.order | 1 - .../Psychrometrics/TWetBul_TDryBulPhi.mo | 77 +++++++------ .../Psychrometrics/TWetBul_TDryBulXi.mo | 71 +++++++----- .../Utilities/Psychrometrics/WetBul_pTX.mo | 106 ------------------ .../Utilities/Psychrometrics/package.order | 1 - 8 files changed, 83 insertions(+), 259 deletions(-) delete mode 100644 Annex60/Resources/ReferenceResults/Dymola/Annex60_Utilities_Psychrometrics_Examples_WetBul_pTX.txt delete mode 100644 Annex60/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/WetBul_pTX.mos delete mode 100644 Annex60/Utilities/Psychrometrics/Examples/WetBul_pTX.mo delete mode 100644 Annex60/Utilities/Psychrometrics/WetBul_pTX.mo diff --git a/Annex60/Resources/ReferenceResults/Dymola/Annex60_Utilities_Psychrometrics_Examples_WetBul_pTX.txt b/Annex60/Resources/ReferenceResults/Dymola/Annex60_Utilities_Psychrometrics_Examples_WetBul_pTX.txt deleted file mode 100644 index 3638a61d3a..0000000000 --- a/Annex60/Resources/ReferenceResults/Dymola/Annex60_Utilities_Psychrometrics_Examples_WetBul_pTX.txt +++ /dev/null @@ -1,5 +0,0 @@ -last-generated=2015-05-08 -statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '} -wetBul_TDryBulX.XWetBul=[0.00544348545372486115, 0.00551510648962544314, 0.00558712799425101127, 0.00565954717363352684, 0.00573236123380517406, 0.00580556690146307678, 0.00587916049233724695, 0.00595313915761914655, 0.00602750015847494745, 0.00610224015195137606, 0.00617735598977401691, 0.00625284435678776385, 0.0063287024590288482, 0.00640492750251546016, 0.00648151570473707705, 0.00655846432844257431, 0.00663577116072838671, 0.00671343224594547847, 0.00679144490508310199, 0.00686980646114195362, 0.00694851342101595378, 0.00702756369094751417, 0.00710695331002390331, 0.00718668006753771064, 0.00726674128904050264, 0.00734713394194841385, 0.00742785500628635395, 0.00750890132643995331, 0.00759027152282001124, 0.0076719611635115148, 0.0077539686065814838, 0.00783629061551209365, 0.00791892508380819503, 0.00800186850414163868, 0.00808511857687050327, 0.00816867319270354539, 0.00825252930727884276, 0.00833668462638845024, 0.00842113610666964281, 0.00850588095414803527, 0.00859091705223879142, 0.00867624211388822592, 0.0087618540234651824, 0.00884774879919948687, 0.00893392602177685291, 0.00902038171037690233, 0.00910711374337828429, 0.00919412077512347242, 0.00928139882230464078, 0.00936894669219884638, 0.00945676211267709732, 0.00954484202932039637, 0.00963318551074968284, 0.00972178883167465827, 0.00981064959897571913, 0.00989976794067717533, 0.00998913960260678149, 0.01007876272214793846, 0.01016863543662805888, 0.01025875495205784763, 0.01034912072905901266, 0.01043972918826871835, 0.01053057886048931573, 0.01062166788308897825, 0.01071299439341589187, 0.01080455559747569259, 0.01089634908480405229, 0.0109883750182845838, 0.01108063005756255472, 0.01117311140867977698, 0.01126581907164093954, 0.01135875025243699397, 0.01145190253253954536, 0.0115452742284171319, 0.01163886478550386905, 0.01173267140984535217, 0.01182669223883196091, 0.01192092634107894816, 0.01201536999132266081, 0.0121100226247089493, 0.01220488350696316733, 0.01229995021190648241, 0.0123952199455931826, 0.01249069270799348617, 0.01258636570512924185, 0.01268223743361739098, 0.01277830717369587629, 0.01287457249190138153, 0.0129710315255887592, 0.01306768427475134449, 0.01316452701408551973, 0.01326155916465974506, 0.01335877908919922037, 0.01345618620993145782, 0.01355377866421977363, 0.0136515536581043543, 0.0137495111915606396, 0.01384764788514956588, 0.01394596490870332432, 0.01404445981520189603, 0.01414313074201345444] -time=[0., 1.] -wetBul_TDryBulX.TWetBul=[278.330780029296875, 278.51782226979275947087, 278.70376587742157425964, 278.8885803346154261817, 279.07232667652715463191, 279.25497435166016657604, 279.43655397934799111681, 279.61706542432148125954, 279.79653933861840187092, 279.9749450046766696687, 280.152313206046585492, 280.32864380929640901741, 280.50393681443972582201, 280.67825325662835211915, 280.85153197211730002891, 281.02380360852862395404, 281.1950989380164855902, 281.36541745007349391017, 281.53475940066732619016, 281.70312504001771003459, 281.87054438379902876477, 282.03698741343555411731, 282.20251466810071860891, 282.3670958787625977493, 282.53073128867418972732, 282.6934814453125, 282.85531631577731559446, 283.01620466176279933279, 283.17623899464530268233, 283.33535779843776936104, 283.49362163790686963694, 283.65100093912775491845, 283.80749522872770285176, 283.96313456213505332926, 284.11795038417415071308, 284.2718811950106214681, 284.42498757447219759342, 284.57727043541689226913, 284.72872932007868485016, 284.87936422845768902334, 285.02920523313531475651, 285.17822270940075668477, 285.32644672688871878563, 285.47387684791488027258, 285.62054446844553012852, 285.76641863038059909741, 285.91152942018038629612, 286.05587770269988823202, 286.19946304418380123025, 286.34228502033539598415, 286.484375, 286.62573255618690382107, 286.76635768904361611931, 286.90625039900675119497, 287.04540985830459476347, 287.18386824358736930662, 287.32162472308078804417, 287.45867929689683251127, 287.59503196517812284583, 287.73068272799844180554, 287.86566129986567830201, 287.99996929077639151728, 288.133605893440460477, 288.2665405905707416423, 288.3988344173235418566, 288.53048737340776597193, 288.66146816331308855297, 288.79180886506588876728, 288.92150869651391076331, 289.05059817519980924772, 289.17901626607374510058, 289.30685452143637803601, 289.4340206328840849892, 289.5606076691806265444, 289.68658435275051488134, 289.81195068359375, 289.93670666156486959153, 290.06088280438746096479, 290.18444859491995657663, 290.30746433604224421288, 290.42987045977014304299, 290.55169674834866100355, 290.67297371935853789182, 290.79367085521903391054, 290.913818673509126711, 291.03341646319796609532, 291.1524351326981445709, 291.2709044846279198282, 291.38885503656541686723, 291.50625627093256753142, 291.62310818809311285804, 291.73944061343871680947, 291.85525493392520957059, 291.97051993724159046906, 292.0852966581445571137, 292.19952406165748470812, 292.31326318304803635328, 292.42651334839138144162, 292.53921487339903251268, 292.65145863342513621319, 292.76318359375] diff --git a/Annex60/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/WetBul_pTX.mos b/Annex60/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/WetBul_pTX.mos deleted file mode 100644 index 37efb373d3..0000000000 --- a/Annex60/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/WetBul_pTX.mos +++ /dev/null @@ -1,33 +0,0 @@ -simulateModel("Annex60.Utilities.Psychrometrics.Examples.WetBul_pTX", method="dassl", resultFile="WetBul_pTX"); - -createPlot(id = 7, - position = {35, 30, 399, 343}, - x = "wetBul_TDryBulX.XDryBul", - y = {"wetBul_TDryBulX.XWetBul"}, - range = {0.0, 0.014, 0.016, 0.004}, - autoscale = true, - autoerase = true, - autoreplot = true, - description = false, - grid = true, - color = true, - online = false, - filename = "WetBul_pTX.mat", - leftTitleType = 1, - bottomTitleType = 1, - colors = {{0,0,255}}); -createPlot(id = 9, - position = {33, 417, 400, 280}, - x = "wetBul_TDryBulX.XDryBul", - y = {"wetBul_TDryBulX.TWetBul"}, - range = {0.0, 0.014, 20.0, 4.0}, - autoscale = true, - autoerase = true, - autoreplot = true, - description = false, - grid = true, - color = true, - online = false, - leftTitleType = 1, - bottomTitleType = 1, - colors = {{0,0,255}}); diff --git a/Annex60/Utilities/Psychrometrics/Examples/WetBul_pTX.mo b/Annex60/Utilities/Psychrometrics/Examples/WetBul_pTX.mo deleted file mode 100644 index aae449f1e8..0000000000 --- a/Annex60/Utilities/Psychrometrics/Examples/WetBul_pTX.mo +++ /dev/null @@ -1,48 +0,0 @@ -within Annex60.Utilities.Psychrometrics.Examples; -model WetBul_pTX "Model to test the wet bulb temperature computation" - extends Modelica.Icons.Example; - - package Medium = Annex60.Media.PerfectGases.MoistAirUnsaturated - annotation (choicesAllMatching = true); - - Modelica.Blocks.Sources.Constant p(k=101325) "Pressure" - annotation (Placement(transformation(extent={{-80,-20}, - {-60,0}}))); - Modelica.Blocks.Sources.Ramp XDryBul( - duration=1, - height=0.014, - offset=0) "Dry bulb water vapor mass fraction" - annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Modelica.Blocks.Sources.Constant TDryBul(k=293.15) "Dry bulb temperature" - annotation (Placement(transformation(extent={{-80,60}, - {-60,80}}))); - Annex60.Utilities.Psychrometrics.WetBul_pTX wetBul_TDryBulX - annotation (Placement(transformation(extent={{-20,40},{0,60}}))); -equation - connect(TDryBul.y, wetBul_TDryBulX.TDryBul) annotation (Line( - points={{-59,70},{-40,70},{-40,58},{-21,58}}, - color={0,0,127})); - connect(XDryBul.y, wetBul_TDryBulX.XDryBul) annotation (Line( - points={{-59,30},{-52,30},{-52,50},{-21,50}}, - color={0,0,127})); - connect(p.y, wetBul_TDryBulX.p) annotation (Line( - points={{-59,-10},{-40,-10},{-40,42},{-21,42}}, - color={0,0,127})); - annotation (experiment(StopTime=1.0), -__Dymola_Commands(file="modelica://Annex60/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/WetBul_pTX.mos" - "Simulate and plot"), - Documentation(info=" -This examples is a unit test for the wet bulb computation. -", revisions=" - -")); -end WetBul_pTX; diff --git a/Annex60/Utilities/Psychrometrics/Examples/package.order b/Annex60/Utilities/Psychrometrics/Examples/package.order index 0db5b6ac64..06ebcd4ee6 100644 --- a/Annex60/Utilities/Psychrometrics/Examples/package.order +++ b/Annex60/Utilities/Psychrometrics/Examples/package.order @@ -9,4 +9,3 @@ SublimationPressureIce TWetBul_TDryBulPhi TWetBul_TDryBulXi TotalAirDryAir -WetBul_pTX diff --git a/Annex60/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo b/Annex60/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo index a26eb40e86..dc648c051d 100644 --- a/Annex60/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo +++ b/Annex60/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo @@ -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 + @@ -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( @@ -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="

@@ -165,6 +170,10 @@ DOI: 10.1175/JAMC-D-11-0143.1 revisions="