From 5a7e58f5f2f4259a2678114dea56e57608bd1dc6 Mon Sep 17 00:00:00 2001 From: Devaprasad Date: Mon, 8 Apr 2024 18:40:18 -0700 Subject: [PATCH 1/2] Removed unused classes and variables --- Buildings/Fluid/Humidifiers/DXDehumidifier.mo | 22 ++++------------- .../Humidifiers/Validation/DXDehumidifier.mo | 24 ------------------- 2 files changed, 4 insertions(+), 42 deletions(-) diff --git a/Buildings/Fluid/Humidifiers/DXDehumidifier.mo b/Buildings/Fluid/Humidifiers/DXDehumidifier.mo index 9173081c734..9c20ffbc08c 100644 --- a/Buildings/Fluid/Humidifiers/DXDehumidifier.mo +++ b/Buildings/Fluid/Humidifiers/DXDehumidifier.mo @@ -61,9 +61,6 @@ model DXDehumidifier "DX dehumidifier" "Temperature sensor" annotation (Placement(transformation(extent={{60,40},{80,60}}))); - Modelica.Units.SI.MassFraction XOut - "Outlet air water vapor mass fraction"; - Buildings.Fluid.Sensors.TemperatureTwoPort senTIn( redeclare package Medium = Medium, final m_flow_nominal=mAir_flow_nominal) @@ -96,12 +93,6 @@ model DXDehumidifier "DX dehumidifier" "Calculate non-zero humidity removal from inlet air only when component is enabled" annotation (Placement(transformation(extent={{-46,-50},{-26,-30}}))); - Buildings.Fluid.Sensors.MassFractionTwoPort senMasFra( - redeclare package Medium = Medium, - final m_flow_nominal=mAir_flow_nominal) - "Inlet air water vapor mass fraction" - annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); - Buildings.Fluid.Sensors.RelativeHumidityTwoPort senRelHum( redeclare package Medium = Medium, final m_flow_nominal=mAir_flow_nominal) @@ -136,9 +127,6 @@ protected equation - - XOut= (port_a.m_flow*senMasFra.X + deHum.mWat_flow)/(port_a.m_flow+1e-6); - connect(preHeaFlo.port, heaFloSen.port_a) annotation (Line(points={{10,50},{20,50}},color={191,0,0})); connect(senTem.T, T) @@ -150,12 +138,8 @@ equation annotation (Line(points={{40,50},{60,50}}, color={191,0,0})); connect(port_a, senTIn.port_a) annotation (Line(points={{-100,0},{-82,0}}, color={0,127,255})); - connect(senTIn.port_b, senMasFra.port_a) - annotation (Line(points={{-62,0},{-40,0}}, color={0,127,255})); connect(deHum.port_b, port_b) annotation (Line(points={{60,0},{100,0}}, color={0,127,255})); - connect(senMasFra.port_b, senRelHum.port_a) - annotation (Line(points={{-20,0},{-10,0}}, color={0,127,255})); connect(senRelHum.port_b, deHum.port_a) annotation (Line(points={{10,0},{40,0}},color={0,127,255})); connect(QHea.y, preHeaFlo.Q_flow) annotation (Line(points={{-29,30},{-20,30},{ @@ -181,12 +165,14 @@ equation color={0,0,127})); connect(senTIn.T, perCurMod.T) annotation (Line(points={{-72,11},{-66,11},{-66, -80},{-52,-80}}, color={0,0,127})); - connect(senRelHum.phi, perCurMod.phi) annotation (Line(points={{0.1,11},{0.1, - 12},{-60,12},{-60,-88},{-52,-88}}, color={0,0,127})); + connect(senRelHum.phi, perCurMod.phi) annotation (Line(points={{0.1,11},{0.1,16}, + {-60,16},{-60,-88},{-52,-88}}, color={0,0,127})); connect(perCurMod.watRemMod, u.u1) annotation (Line(points={{-29,-80},{-24,-80}, {-24,-60},{-52,-60},{-52,-34},{-48,-34}}, color={0,0,127})); connect(perCurMod.eneFacMod, eneFac.u) annotation (Line(points={{-29,-88},{-14, -88},{-14,-90},{-2,-90}}, color={0,0,127})); + connect(senTIn.port_b, senRelHum.port_a) + annotation (Line(points={{-62,0},{-10,0}}, color={0,127,255})); annotation (Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={ Rectangle( extent={{-70,60},{70,-60}}, diff --git a/Buildings/Fluid/Humidifiers/Validation/DXDehumidifier.mo b/Buildings/Fluid/Humidifiers/Validation/DXDehumidifier.mo index 778d04ad259..89d3b8cdbd1 100644 --- a/Buildings/Fluid/Humidifiers/Validation/DXDehumidifier.mo +++ b/Buildings/Fluid/Humidifiers/Validation/DXDehumidifier.mo @@ -65,26 +65,6 @@ model DXDehumidifier "Validation model for DX dehumidifier" "Calculate inlet air mass flow rate from component enable signal" annotation (Placement(transformation(extent={{-120,-20},{-100,0}}))); - Modelica.Blocks.Sources.RealExpression m_flow_airMod( - final y=dxDeh.port_a.m_flow) - "DX dehumidifier air mass flow rate (Modelica)" - annotation (Placement(transformation(extent={{20,60},{40,80}}))); - - Modelica.Blocks.Math.Mean m_flowFan( - final f=1/tStepAve) - "Average out Modelica results over time" - annotation (Placement(transformation(extent={{54,60},{74,80}}))); - - Modelica.Blocks.Math.Mean m_flowFan_engPlu( - final f=1/tStepAve) - "Average out EnergyPlus results over time" - annotation (Placement(transformation(extent={{134,60},{154,80}}))); - - Modelica.Blocks.Sources.RealExpression m_flow_air_engPlu( - final y=datRea.y[6]) - "DX dehumidifier air mass flow rate (EnergyPlus)" - annotation (Placement(transformation(extent={{98,60},{118,80}}))); - Modelica.Blocks.Sources.RealExpression watRemRatMod( final y=-dxDeh.deHum.mWat_flow) "Water removal mass flow rate (Modelica)" @@ -158,10 +138,6 @@ model DXDehumidifier "Validation model for DX dehumidifier" annotation (Placement(transformation(extent={{-160,60},{-140,80}}))); equation - connect(m_flow_airMod.y, m_flowFan.u) - annotation (Line(points={{41,70},{52,70}}, color={0,0,127})); - connect(m_flow_air_engPlu.y, m_flowFan_engPlu.u) - annotation (Line(points={{119,70},{132,70}}, color={0,0,127})); connect(watRemRatMod.y, mWatMod.u) annotation (Line(points={{41,36},{52,36}}, color={0,0,127})); connect(watRemRat_engPlu.y, mWat_engPlu.u) From 9e95142e2e58a646f9fafceeac3cbfd5abee9c5a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 9 Apr 2024 02:02:11 +0000 Subject: [PATCH 2/2] Updated unit test results --- ...ngs_Fluid_Humidifiers_Validation_DXDehumidifier.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Humidifiers_Validation_DXDehumidifier.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Humidifiers_Validation_DXDehumidifier.txt index 9ce37f62fdf..ad15f367396 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Humidifiers_Validation_DXDehumidifier.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Humidifiers_Validation_DXDehumidifier.txt @@ -1,15 +1,15 @@ -last-generated=2024-02-05 +last-generated=2024-04-09 statistics-simulation= { "linear": " ", "nonlinear": " ", - "number of continuous time states": "13", + "number of continuous time states": "10", "numerical Jacobians": "0" } time=[1.296e+07, 1.512e+07] mWat_engPlu.y=[0e+00, 5.578999844146892e-05, 1.390999968862161e-04, 3.023000026587397e-04, 8.877999789547175e-05, 4.478999835555442e-05, 1.612000050954521e-04, 3.169999981764704e-04, 1.500000071246177e-04, 6.74499970045872e-05, 1.380000030621886e-04, 3.88599990401417e-04, 1.04899998405017e-04, 7.611999899381772e-05, 0e+00, 0e+00, 0e+00, 3.00899991998449e-05, 0e+00, 0e+00, 0e+00, 1.433000034012366e-05, 1.920999930007383e-04, 3.04599991068244e-04, 1.044000018737279e-04, 6.430000212276354e-05, 3.840000135824084e-05, 3.00899991998449e-04, 4.742999954032712e-05, 3.454000034253113e-05, 2.400999946985394e-04, 3.138000029139221e-04, 9.460999717703089e-05, 5.02600014442578e-05, 1.582999975653365e-04, 5.005000275559723e-04, 1.249000051757321e-04, 6.32800001767464e-05, 2.252999984193593e-04, 3.856999974232167e-04, 9.989999671233818e-05, 3.324999852338806e-05, 4.647999958251603e-05, 6.243000098038465e-05, 9.500000305706635e-05, 5.136999971000478e-05, 0e+00, 0e+00, 0e+00, 5.193999822949991e-05, 9.021999721881002e-05, 2.742999931797385e-04, 6.967000081203878e-05, 3.733999983523972e-05, 1.56599999172613e-04, 2.716000017244369e-04, 8.459999662591144e-05, 3.87699983548373e-05, 1.579999952809885e-04, 2.970999921672046e-04, 5.881000106455758e-05, 4.794000051333569e-05, 1.727000053506345e-04, 3.301000106148422e-04, 7.506999827455729e-05, 6.93300025886856e-05, 2.081999991787598e-04, 3.8519999361597e-04, 8.212999819079414e-05, 6.477999704657122e-05, 0e+00, 0e+00, 8.674999844515696e-05, 6.77599964546971e-05, 3.508000077090401e-07, 0e+00, 6.330999894998968e-05, 3.018999996129423e-05, 1.228000037372112e-04, 2.662999904714525e-04, 4.106000051251613e-05, 2.046000008704141e-05, 1.81199997314252e-04, 3.479000006336719e-04, 1.120000015362166e-04, 5.420000161393546e-05, 1.690000062808394e-04, 3.798000107053667e-04, 1.112000027205795e-04, 8.597999840276316e-05, 1.860000047599897e-04, 3.840000135824084e-04, 1.362000039080158e-04, 9.555999713484198e-05, 2.203000040026382e-04, 3.757000085897744e-04, 8.882000111043453e-05, 8.020999666769058e-05, 0e+00, 0e+00, 3.299999889350147e-06] -mWatMod.y=[0e+00, 5.801860243082047e-05, 1.431554846931249e-04, 3.101435722783208e-04, 9.132817649515346e-05, 4.607019218383357e-05, 1.645868760533631e-04, 3.233636089134961e-04, 1.532383321318775e-04, 6.909537478350103e-05, 1.408985699526966e-04, 3.983622009400278e-04, 1.076492335414514e-04, 7.843475032132119e-05, 0e+00, 0e+00, 0e+00, 3.132142592221498e-05, 0e+00, 0e+00, 0e+00, 1.498605433880584e-05, 1.989120646612719e-04, 3.15057608531788e-04, 1.082483286154456e-04, 6.72386449878104e-05, 3.908727376256138e-05, 3.117183223366737e-04, 4.926545443595387e-05, 3.593662768253125e-05, 2.486018056515604e-04, 3.245480183977634e-04, 9.764050628291443e-05, 5.190918091102503e-05, 1.620218536118045e-04, 5.136516410857439e-04, 1.277515402762219e-04, 6.493247929029167e-05, 2.30726451263763e-04, 3.959192254114896e-04, 1.027788821374997e-04, 3.449050927883945e-05, 4.819849709747359e-05, 6.446075713029131e-05, 9.759466047398746e-05, 5.297830648487434e-05, 0e+00, 0e+00, 0e+00, 5.369808786781505e-05, 9.221630898537114e-05, 2.805568801704794e-04, 7.134072802728042e-05, 3.840211138594896e-05, 1.599405513843521e-04, 2.774761524051428e-04, 8.651436655782163e-05, 3.987127638538368e-05, 1.617256639292464e-04, 3.042492608074099e-04, 6.032920282450505e-05, 4.928785710944794e-05, 1.766323548508808e-04, 3.381173009984195e-04, 7.683598232688382e-05, 7.113769243005663e-05, 2.131919900421053e-04, 3.959932073485106e-04, 8.457395597361028e-05, 6.693267641821876e-05, 0e+00, 0e+00, 8.879836241248995e-05, 6.957643199712038e-05, 3.479241854620341e-07, 0e+00, 6.498130096588284e-05, 3.107798329438083e-05, 1.256422838196158e-04, 2.728521649260074e-04, 4.226997407386079e-05, 2.115861752827186e-05, 1.86634817509912e-04, 3.598148177843541e-04, 1.153537523350678e-04, 5.596004484687001e-05, 1.735136756906286e-04, 3.901244781445712e-04, 1.142114342655987e-04, 8.836002234602347e-05, 1.901784853544086e-04, 3.931866958737373e-04, 1.392017438774928e-04, 9.754140774020925e-05, 2.244274946860969e-04, 3.832083311863244e-04, 9.051385859493166e-05, 8.199716103263199e-05, 0e+00, 0e+00, 3.323967121104943e-06] +mWatMod.y=[0e+00, 5.801860606879927e-05, 1.431554992450401e-04, 3.101435431744903e-04, 9.132818377111107e-05, 4.607019218383357e-05, 1.645868906052783e-04, 3.233636089134961e-04, 1.532383321318775e-04, 6.909537478350103e-05, 1.408985554007813e-04, 3.983622009400278e-04, 1.076492335414514e-04, 7.843475032132119e-05, 0e+00, 0e+00, 0e+00, 3.132142592221498e-05, 0e+00, 0e+00, 0e+00, 1.498605433880584e-05, 1.989120646612719e-04, 3.15057608531788e-04, 1.082483286154456e-04, 6.72386449878104e-05, 3.90872846764978e-05, 3.117183514405042e-04, 4.926545443595387e-05, 3.593662768253125e-05, 2.486018056515604e-04, 3.245480475015938e-04, 9.764050628291443e-05, 5.190918091102503e-05, 1.620218536118045e-04, 5.136516410857439e-04, 1.277515257243067e-04, 6.493248656624928e-05, 2.307264367118478e-04, 3.959192254114896e-04, 1.027788821374997e-04, 3.449050927883945e-05, 4.819849709747359e-05, 6.446075713029131e-05, 9.759465319802985e-05, 5.297830648487434e-05, 0e+00, 0e+00, 0e+00, 5.369808786781505e-05, 9.221630170941353e-05, 2.805568801704794e-04, 7.134073530323803e-05, 3.840211502392776e-05, 1.599405513843521e-04, 2.774761524051428e-04, 8.651437383377925e-05, 3.987127638538368e-05, 1.617256639292464e-04, 3.042492608074099e-04, 6.032920646248385e-05, 4.928785710944794e-05, 1.766323548508808e-04, 3.381173009984195e-04, 7.683597505092621e-05, 7.113769243005663e-05, 2.131919900421053e-04, 3.959932073485106e-04, 8.457395597361028e-05, 6.693267641821876e-05, 0e+00, 0e+00, 8.879836241248995e-05, 6.957643199712038e-05, 3.479242138837435e-07, 0e+00, 6.498130096588284e-05, 3.10779687424656e-05, 1.256422838196158e-04, 2.728521649260074e-04, 4.226997407386079e-05, 2.115861752827186e-05, 1.866348320618272e-04, 3.598148177843541e-04, 1.153537523350678e-04, 5.596004484687001e-05, 1.735136611387134e-04, 3.901244781445712e-04, 1.142114342655987e-04, 8.836002234602347e-05, 1.901784853544086e-04, 3.931866958737373e-04, 1.392017438774928e-04, 9.754140774020925e-05, 2.244274946860969e-04, 3.832083311863244e-04, 9.051385859493166e-05, 8.199716103263199e-05, 0e+00, 0e+00, 3.323966666357592e-06] QHea_engPlu.y=[0e+00, 2.156999969482422e+02, 5.435e+02, 1.217e+03, 3.481000061035156e+02, 1.74e+02, 6.325e+02, 1.281e+03, 5.885999755859375e+02, 2.612999877929688e+02, 5.424000244140625e+02, 1.57e+03, 4.117999877929688e+02, 2.952000122070312e+02, 0e+00, 0e+00, 0e+00, 1.163000030517578e+02, 0e+00, 0e+00, 0e+00, 5.536999893188477e+01, 7.48e+02, 1.206e+03, 4.043999938964844e+02, 2.478000030517578e+02, 1.496000061035156e+02, 1.21e+03, 1.873999938964844e+02, 1.353000030517578e+02, 9.537000122070312e+02, 1.275e+03, 3.753999938964844e+02, 1.971000061035156e+02, 6.397000122070312e+02, 2.128e+03, 5.026000061035156e+02, 2.493000030517578e+02, 9.027000122070312e+02, 1.616e+03, 4.002000122070312e+02, 1.311000061035156e+02, 1.823999938964844e+02, 2.435e+02, 3.673999938964844e+02, 1.98e+02, 0e+00, 0e+00, 0e+00, 2.001999969482422e+02, 3.487999877929688e+02, 1.074e+03, 2.691000061035156e+02, 1.438999938964844e+02, 6.062000122070312e+02, 1.065e+03, 3.277999877929688e+02, 1.496000061035156e+02, 6.145999755859375e+02, 1.185e+03, 2.306999969482422e+02, 1.868000030517578e+02, 6.857000122070312e+02, 1.371e+03, 3.026000061035156e+02, 2.747000122070312e+02, 8.47e+02, 1.662e+03, 3.393999938964844e+02, 2.616000061035156e+02, 0e+00, 0e+00, 3.423999938964844e+02, 2.637000122070312e+02, 1.360000014305115e+00, 0e+00, 2.441999969482422e+02, 1.164000015258789e+02, 4.75e+02, 1.046e+03, 1.596000061035156e+02, 7.929000091552734e+01, 7.115999755859375e+02, 1.412e+03, 4.432999877929688e+02, 2.116999969482422e+02, 6.739000244140625e+02, 1.582e+03, 4.472000122070312e+02, 3.382000122070312e+02, 7.480999755859375e+02, 1.618e+03, 5.445e+02, 3.733999938964844e+02, 8.615999755859375e+02, 1.489e+03, 3.442000122070312e+02, 3.092000122070312e+02, 0e+00, 0e+00, 1.272000026702881e+01] -QHeaMod.y=[0e+00, 2.252892761230469e+02, 5.638117065429688e+02, 1.259989868164062e+03, 3.61011474609375e+02, 1.804095001220703e+02, 6.525205688476562e+02, 1.32089794921875e+03, 6.076193237304688e+02, 2.700804443359375e+02, 5.59220458984375e+02, 1.62392578125e+03, 4.262900390625e+02, 3.065046691894531e+02, 0e+00, 0e+00, 0e+00, 1.215812377929688e+02, 0e+00, 0e+00, 0e+00, 5.804571533203125e+01, 7.788659057617188e+02, 1.254269775390625e+03, 4.216901245117188e+02, 2.59813720703125e+02, 1.532783508300781e+02, 1.259737426757812e+03, 1.954586639404297e+02, 1.413062744140625e+02, 9.925645751953125e+02, 1.325755859375e+03, 3.902116394042969e+02, 2.049194641113281e+02, 6.599279174804688e+02, 2.198199462890625e+03, 5.195506591796875e+02, 2.581037292480469e+02, 9.333798828125e+02, 1.67021875e+03, 4.149387512207031e+02, 1.366727447509766e+02, 1.901233520507812e+02, 2.530716857910156e+02, 3.806402893066406e+02, 2.055028533935547e+02, 0e+00, 0e+00, 0e+00, 2.081339569091797e+02, 3.595930480957031e+02, 1.109255859375e+03, 2.78077880859375e+02, 1.490881195068359e+02, 6.250950317382812e+02, 1.099884033203125e+03, 3.385082092285156e+02, 1.549958190917969e+02, 6.348834838867188e+02, 1.224751708984375e+03, 2.388418884277344e+02, 1.936367340087891e+02, 7.082937622070312e+02, 1.416042358398438e+03, 3.127971496582031e+02, 2.843941650390625e+02, 8.749315185546875e+02, 1.717330200195312e+03, 3.519125671386719e+02, 2.719365234375e+02, 0e+00, 0e+00, 3.54067626953125e+02, 2.73134033203125e+02, 1.36028778553009e+00, 0e+00, 2.526269683837891e+02, 1.206008377075195e+02, 4.900700073242188e+02, 1.082103881835938e+03, 1.655519561767578e+02, 8.245832061767578e+01, 7.383040161132812e+02, 1.467679931640625e+03, 4.600376892089844e+02, 2.200424957275391e+02, 6.97910888671875e+02, 1.636169799804688e+03, 4.634853210449219e+02, 3.504216613769531e+02, 7.720964965820312e+02, 1.669642211914062e+03, 5.623526611328125e+02, 3.853689270019531e+02, 8.878026733398438e+02, 1.53529248046875e+03, 3.546426391601562e+02, 3.189999694824219e+02, 0e+00, 0e+00, 1.301728820800781e+01] +QHeaMod.y=[0e+00, 2.252892761230469e+02, 5.638117065429688e+02, 1.259989868164062e+03, 3.61011474609375e+02, 1.804095001220703e+02, 6.525205688476562e+02, 1.32089794921875e+03, 6.076193237304688e+02, 2.700804443359375e+02, 5.59220458984375e+02, 1.62392578125e+03, 4.262900390625e+02, 3.065046691894531e+02, 0e+00, 0e+00, 0e+00, 1.215812377929688e+02, 0e+00, 0e+00, 0e+00, 5.804571533203125e+01, 7.788659057617188e+02, 1.254269775390625e+03, 4.216901245117188e+02, 2.59813720703125e+02, 1.532783660888672e+02, 1.259737426757812e+03, 1.954586639404297e+02, 1.413062744140625e+02, 9.925645751953125e+02, 1.325755859375e+03, 3.902116394042969e+02, 2.049194641113281e+02, 6.599279174804688e+02, 2.198199462890625e+03, 5.195506591796875e+02, 2.581037292480469e+02, 9.333798828125e+02, 1.67021875e+03, 4.149387512207031e+02, 1.366727447509766e+02, 1.901233520507812e+02, 2.530716857910156e+02, 3.806402587890625e+02, 2.055028533935547e+02, 0e+00, 0e+00, 0e+00, 2.081339569091797e+02, 3.595930480957031e+02, 1.109255859375e+03, 2.78077880859375e+02, 1.490881195068359e+02, 6.250950317382812e+02, 1.099884033203125e+03, 3.385082092285156e+02, 1.549958343505859e+02, 6.34883544921875e+02, 1.224751708984375e+03, 2.388418884277344e+02, 1.936367340087891e+02, 7.082937622070312e+02, 1.416042358398438e+03, 3.127971496582031e+02, 2.843941650390625e+02, 8.749315185546875e+02, 1.717330200195312e+03, 3.519125671386719e+02, 2.719365234375e+02, 0e+00, 0e+00, 3.54067626953125e+02, 2.73134033203125e+02, 1.36028790473938e+00, 0e+00, 2.526269836425781e+02, 1.206008071899414e+02, 4.900700073242188e+02, 1.082103881835938e+03, 1.655519561767578e+02, 8.245832061767578e+01, 7.383040161132812e+02, 1.467679931640625e+03, 4.600376892089844e+02, 2.200424957275391e+02, 6.97910888671875e+02, 1.636169799804688e+03, 4.634853210449219e+02, 3.504216613769531e+02, 7.720964965820312e+02, 1.669642211914062e+03, 5.623526611328125e+02, 3.853689270019531e+02, 8.878026733398438e+02, 1.53529248046875e+03, 3.546426391601562e+02, 3.189999694824219e+02, 0e+00, 0e+00, 1.301728820800781e+01] P_engPlu.y=[0e+00, 7.969000244140625e+01, 2.051000061035156e+02, 4.843999938964844e+02, 1.321999969482422e+02, 6.493000030517578e+01, 2.406000061035156e+02, 5.122999877929688e+02, 2.241000061035156e+02, 9.694000244140625e+01, 2.068999938964844e+02, 6.285e+02, 1.568000030517578e+02, 1.098000030517578e+02, 0e+00, 0e+00, 0e+00, 4.29900016784668e+01, 0e+00, 0e+00, 0e+00, 2.042000007629395e+01, 2.805e+02, 4.66e+02, 1.501999969482422e+02, 9.086000061035156e+01, 5.618999862670898e+01, 4.801000061035156e+02, 7.213999938964844e+01, 5.129000091552734e+01, 3.708999938964844e+02, 5.147000122070312e+02, 1.456999969482422e+02, 7.491999816894531e+01, 2.56e+02, 9.185e+02, 1.996999969482422e+02, 9.556999969482422e+01, 3.562000122070312e+02, 6.825999755859375e+02, 1.578000030517578e+02, 5.036000061035156e+01, 6.945999908447266e+01, 9.158000183105469e+01, 1.358999938964844e+02, 7.254000091552734e+01, 0e+00, 0e+00, 0e+00, 7.325e+01, 1.288000030517578e+02, 4.067999877929688e+02, 9.929000091552734e+01, 5.272000122070312e+01, 2.246000061035156e+02, 4.052000122070312e+02, 1.218000030517578e+02, 5.50099983215332e+01, 2.298999938964844e+02, 4.637999877929688e+02, 8.779000091552734e+01, 7.019000244140625e+01, 2.663999938964844e+02, 5.717999877929688e+02, 1.205e+02, 1.064000015258789e+02, 3.425e+02, 7.310999755859375e+02, 1.406000061035156e+02, 1.045999984741211e+02, 0e+00, 0e+00, 1.316999969482422e+02, 9.881999969482422e+01, 5.052000284194946e-01, 0e+00, 8.969999694824219e+01, 4.259999847412109e+01, 1.755e+02, 3.992999877929688e+02, 5.966999816894531e+01, 2.943000030517578e+01, 2.712000122070312e+02, 5.687999877929688e+02, 1.713000030517578e+02, 7.984999847412109e+01, 2.638999938964844e+02, 6.627000122070312e+02, 1.775e+02, 1.291999969482422e+02, 2.971000061035156e+02, 6.89e+02, 2.14e+02, 1.41e+02, 3.26e+02, 5.765e+02, 1.278000030517578e+02, 1.134000015258789e+02, 0e+00, 0e+00, 4.659999847412109e+00] -PMod.y=[0e+00, 8.018390655517578e+01, 2.057777404785156e+02, 4.843162841796875e+02, 1.32598388671875e+02, 6.518727874755859e+01, 2.408863983154297e+02, 5.121609497070312e+02, 2.243680267333984e+02, 9.727191162109375e+01, 2.068311004638672e+02, 6.276161499023438e+02, 1.570577392578125e+02, 1.103382339477539e+02, 0e+00, 0e+00, 0e+00, 4.324590301513672e+01, 0e+00, 0e+00, 0e+00, 2.056537818908691e+01, 2.813839416503906e+02, 4.6630615234375e+02, 1.509595031738281e+02, 9.164890289306641e+01, 5.55205078125e+01, 4.801253356933594e+02, 7.224504852294922e+01, 5.142824935913086e+01, 3.70807861328125e+02, 5.140565795898438e+02, 1.460113220214844e+02, 7.509385681152344e+01, 2.547089233398438e+02, 9.135492553710938e+02, 2.000422058105469e+02, 9.570665740966797e+01, 3.563296813964844e+02, 6.800189819335938e+02, 1.578872680664062e+02, 5.04114875793457e+01, 6.957820892333984e+01, 9.185439300537109e+01, 1.365546112060547e+02, 7.300334167480469e+01, 0e+00, 0e+00, 0e+00, 7.383426666259766e+01, 1.28958740234375e+02, 4.075790710449219e+02, 9.965366363525391e+01, 5.304388046264648e+01, 2.250814056396484e+02, 4.059120788574219e+02, 1.221345138549805e+02, 5.527718734741211e+01, 2.304052734375e+02, 4.638199462890625e+02, 8.795766448974609e+01, 7.036709594726562e+01, 2.665336608886719e+02, 5.704060668945312e+02, 1.206292495727539e+02, 1.064777679443359e+02, 3.417352905273438e+02, 7.269454345703125e+02, 1.403918762207031e+02, 1.045369262695312e+02, 0e+00, 0e+00, 1.319816284179688e+02, 9.912238311767578e+01, 4.90124374628067e-01, 0e+00, 9.010780334472656e+01, 4.287435531616211e+01, 1.758368377685547e+02, 3.996966857910156e+02, 5.983414459228516e+01, 2.954031372070312e+01, 2.715276184082031e+02, 5.6777783203125e+02, 1.715362854003906e+02, 8.008561706542969e+01, 2.639506530761719e+02, 6.604628295898438e+02, 1.778408508300781e+02, 1.294319458007812e+02, 2.964573669433594e+02, 6.86276611328125e+02, 2.142071228027344e+02, 1.414164581298828e+02, 3.265062561035156e+02, 5.768829345703125e+02, 1.282661590576172e+02, 1.139238815307617e+02, 0e+00, 0e+00, 4.70399808883667e+00] +PMod.y=[0e+00, 8.018390655517578e+01, 2.057777252197266e+02, 4.843163146972656e+02, 1.325983734130859e+02, 6.518727874755859e+01, 2.408863830566406e+02, 5.121609497070312e+02, 2.243680267333984e+02, 9.727191162109375e+01, 2.068311309814453e+02, 6.276161499023438e+02, 1.570577239990234e+02, 1.103382339477539e+02, 0e+00, 0e+00, 0e+00, 4.324590301513672e+01, 0e+00, 0e+00, 0e+00, 2.056537818908691e+01, 2.813839416503906e+02, 4.663061218261719e+02, 1.509595031738281e+02, 9.164890289306641e+01, 5.55204963684082e+01, 4.801253356933594e+02, 7.224504852294922e+01, 5.142824935913086e+01, 3.70807861328125e+02, 5.140565795898438e+02, 1.460113220214844e+02, 7.509385681152344e+01, 2.547089233398438e+02, 9.135492553710938e+02, 2.000422210693359e+02, 9.570665740966797e+01, 3.563297424316406e+02, 6.800189819335938e+02, 1.578872680664062e+02, 5.04114875793457e+01, 6.957820892333984e+01, 9.185439300537109e+01, 1.365546264648438e+02, 7.300334167480469e+01, 0e+00, 0e+00, 0e+00, 7.383426666259766e+01, 1.28958740234375e+02, 4.075790710449219e+02, 9.965366363525391e+01, 5.304387664794922e+01, 2.250814056396484e+02, 4.059120788574219e+02, 1.221345138549805e+02, 5.527718734741211e+01, 2.304052734375e+02, 4.638199462890625e+02, 8.795766448974609e+01, 7.036709594726562e+01, 2.665336608886719e+02, 5.704060668945312e+02, 1.206292495727539e+02, 1.064777679443359e+02, 3.417352905273438e+02, 7.269454345703125e+02, 1.403918609619141e+02, 1.045369262695312e+02, 0e+00, 0e+00, 1.319816284179688e+02, 9.912238311767578e+01, 4.901244044303894e-01, 0e+00, 9.010780334472656e+01, 4.287435913085938e+01, 1.758368377685547e+02, 3.996966857910156e+02, 5.983414840698242e+01, 2.954031372070312e+01, 2.715276184082031e+02, 5.6777783203125e+02, 1.715362854003906e+02, 8.008561706542969e+01, 2.639507141113281e+02, 6.604628295898438e+02, 1.778408508300781e+02, 1.294319458007812e+02, 2.964573669433594e+02, 6.86276611328125e+02, 2.142071228027344e+02, 1.414164581298828e+02, 3.265062561035156e+02, 5.768829345703125e+02, 1.282661590576172e+02, 1.139238815307617e+02, 0e+00, 0e+00, 4.703998565673828e+00]