diff --git a/Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo b/Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo
index d850dace5e9..12055def006 100644
--- a/Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo
+++ b/Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo
@@ -4,12 +4,11 @@ model EN12975NPanels
extends Modelica.Icons.Example;
replaceable package Medium = Buildings.Media.Water "Medium in the system";
- parameter Integer nPanels = 10 "Number of panels";
+ parameter Integer nPanels=10 "Number of panels";
- Buildings.Fluid.SolarCollectors.EN12975
- solCol(
+ Buildings.Fluid.SolarCollectors.EN12975 solCol(
redeclare package Medium = Medium,
- per=Data.GlazedFlatPlate.FP_GuangdongFSPTY95(),
+ per=datSolCol,
shaCoe=0,
azi=0,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
@@ -23,7 +22,7 @@ model EN12975NPanels
annotation (Placement(transformation(extent={{20,20},{40,40}})));
Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
- "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos")
+ "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos")
"Weather data file reader"
annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
Buildings.Fluid.Sources.Boundary_pT sou(
@@ -37,13 +36,12 @@ model EN12975NPanels
redeclare package Medium = Medium,
use_m_flow_in=true,
use_T_in=false,
- T=293.15)
- "Inlet for water flow, at a prescribed flow rate and temperature"
+ T=303.15) "Inlet for water flow, at a prescribed flow rate and temperature"
annotation (Placement(transformation(extent={{-12,20},{8,40}})));
Buildings.Fluid.SolarCollectors.EN12975 solCol1(
redeclare package Medium = Medium,
- per=Data.GlazedFlatPlate.FP_GuangdongFSPTY95(),
+ per=datSolCol,
shaCoe=0,
azi=0,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
@@ -66,22 +64,23 @@ model EN12975NPanels
redeclare package Medium = Medium,
use_m_flow_in=true,
use_T_in=false,
- T=293.15)
- "Inlet for water flow, at a prescribed flow rate and temperature"
+ T=303.15) "Inlet for water flow, at a prescribed flow rate and temperature"
annotation (Placement(transformation(extent={{-12,-40},{8,-20}})));
Modelica.Blocks.Math.Gain gaiNPan(k=nPanels) "Gain for number of panels"
annotation (Placement(transformation(extent={{-52,-32},{-32,-12}})));
- Modelica.Blocks.Sources.RealExpression difHeaGai(
- y=solCol.heaGai[30].Q_flow - solCol1.heaGai[30].Q_flow/nPanels)
+ Modelica.Blocks.Sources.RealExpression difHeaGai(y=solCol.heaGai[30].Q_flow
+ - solCol1.heaGai[30].Q_flow/nPanels)
"Difference in heat gain at last panel between model with 1 and with 30 panels"
annotation (Placement(transformation(extent={{-68,-72},{-48,-52}})));
- Modelica.Blocks.Sources.RealExpression difHeaLos(
- y=solCol.QLos[30].Q_flow - solCol1.QLos[30].Q_flow/nPanels)
+ Modelica.Blocks.Sources.RealExpression difHeaLos(y=solCol.QLos[30].Q_flow -
+ solCol1.QLos[30].Q_flow/nPanels)
"Difference in heat loss at last panel between model with 1 and with 30 panels"
annotation (Placement(transformation(extent={{-68,-92},{-48,-72}})));
- Modelica.Blocks.Sources.Constant m_flow_nominal(k=2*0.02)
+ Modelica.Blocks.Sources.Constant m_flow_nominal(k=datSolCol.A*datSolCol.mperA_flow_nominal)
"Nominal flow rate for one panel"
- annotation (Placement(transformation(extent={{-92,28},{-72,48}})));
+ annotation (Placement(transformation(extent={{-88,30},{-68,50}})));
+ parameter Data.Concentrating.C_VerificationModel datSolCol
+ annotation (Placement(transformation(extent={{60,60},{80,80}})));
equation
connect(weaDat.weaBus, solCol1.weaBus) annotation (Line(
points={{-20,70},{14,70},{14,-20},{20,-20},{20,-20.4}},
@@ -106,10 +105,10 @@ equation
points={{20,39.6},{18,39.6},{18,40},{14,40},{14,70},{-20,70}},
color={255,204,51},
thickness=0.5));
- connect(m_flow_nominal.y, bou.m_flow_in)
- annotation (Line(points={{-71,38},{-12,38}}, color={0,0,127}));
- connect(gaiNPan.u, m_flow_nominal.y) annotation (Line(points={{-54,-22},{-60,-22},
- {-60,38},{-71,38}}, color={0,0,127}));
+ connect(m_flow_nominal.y, bou.m_flow_in) annotation (Line(points={{-67,40},{-22,
+ 40},{-22,38},{-12,38}}, color={0,0,127}));
+ connect(gaiNPan.u, m_flow_nominal.y) annotation (Line(points={{-54,-22},{-60,
+ -22},{-60,40},{-67,40}}, color={0,0,127}));
annotation (
Documentation(info="
@@ -123,8 +122,7 @@ The instances difHeaGai
and difHeaLos
compare the heat gain and heat loss between the two models.
The output of these blocks should be zero, except for rounding errors.
-",
-revisions="
+", revisions="
-
November 21, 2017, by Michael Wetter:
@@ -133,7 +131,8 @@ First implementation to validate
"),
- __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975NPanels.mos"
- "Simulate and plot"),
- experiment(Tolerance=1e-6, StopTime=86400));
+ __Dymola_Commands(file=
+ "modelica://Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975NPanels.mos"
+ "Simulate and plot"),
+ experiment(Tolerance=1e-6, StopTime=86400));
end EN12975NPanels;
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt
index 17c55687888..74a7724ea34 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt
@@ -11,12 +11,12 @@ statistics-simulation=
"number of continuous time states": "60",
"linear": " "
}
-solCol1.vol[30].T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931517639160156e+02, 2.931621704101562e+02, 2.931920776367188e+02, 2.932548828125e+02, 2.933973388671875e+02, 2.937286071777344e+02, 2.942196350097656e+02, 2.947657775878906e+02, 2.952323913574219e+02, 2.956859741210938e+02, 2.961311340332031e+02, 2.965460815429688e+02, 2.969107055664062e+02, 2.972357788085938e+02, 2.975095825195312e+02, 2.977089233398438e+02, 2.978078918457031e+02, 2.977393493652344e+02, 2.975513000488281e+02, 2.973549499511719e+02, 2.972716064453125e+02, 2.972815551757812e+02, 2.972854309082031e+02, 2.972822875976562e+02, 2.972709655761719e+02, 2.972504272460938e+02, 2.972196960449219e+02, 2.971766967773438e+02, 2.971194152832031e+02, 2.970861511230469e+02, 2.971514282226562e+02, 2.972239074707031e+02, 2.972127380371094e+02, 2.970367126464844e+02, 2.966586608886719e+02, 2.961563720703125e+02, 2.956093444824219e+02, 2.9506103515625e+02, 2.943673400878906e+02, 2.9370458984375e+02, 2.932673645019531e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-solCol.vol[30].T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931517639160156e+02, 2.931621704101562e+02, 2.931920776367188e+02, 2.932548828125e+02, 2.933973388671875e+02, 2.937286071777344e+02, 2.942196350097656e+02, 2.947657775878906e+02, 2.952323913574219e+02, 2.956859741210938e+02, 2.961311340332031e+02, 2.965460815429688e+02, 2.969107055664062e+02, 2.972357788085938e+02, 2.975095825195312e+02, 2.977089233398438e+02, 2.978078918457031e+02, 2.977393493652344e+02, 2.975513000488281e+02, 2.973549499511719e+02, 2.972716064453125e+02, 2.972815551757812e+02, 2.972854309082031e+02, 2.972822875976562e+02, 2.972709655761719e+02, 2.972504272460938e+02, 2.972196960449219e+02, 2.971766967773438e+02, 2.971194152832031e+02, 2.970861511230469e+02, 2.971514282226562e+02, 2.972239074707031e+02, 2.972127380371094e+02, 2.970367126464844e+02, 2.966586608886719e+02, 2.961563720703125e+02, 2.956093444824219e+02, 2.9506103515625e+02, 2.943673400878906e+02, 2.9370458984375e+02, 2.932673645019531e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+solCol1.vol[30].T=[2.931499938964844e+02, 3.026159973144531e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026166381835938e+02, 3.026147766113281e+02, 3.02611572265625e+02, 3.026078796386719e+02, 3.026045837402344e+02, 3.026014404296875e+02, 3.025981140136719e+02, 3.025946655273438e+02, 3.025908813476562e+02, 3.025838012695312e+02, 3.025727844238281e+02, 3.025611572265625e+02, 3.025522155761719e+02, 3.025477905273438e+02, 3.025465393066406e+02, 3.025476989746094e+02, 3.025505065917969e+02, 3.025559692382812e+02, 3.025663452148438e+02, 3.025801391601562e+02, 3.026034851074219e+02, 3.026420593261719e+02, 3.027028198242188e+02, 3.028269348144531e+02, 3.031476440429688e+02, 3.03644775390625e+02, 3.04204345703125e+02, 3.046839599609375e+02, 3.051048583984375e+02, 3.055056762695312e+02, 3.058727416992188e+02, 3.062033081054688e+02, 3.064872741699219e+02, 3.067221984863281e+02, 3.068948669433594e+02, 3.069858703613281e+02, 3.069493713378906e+02, 3.0677880859375e+02, 3.066054382324219e+02, 3.06505126953125e+02, 3.065032653808594e+02, 3.065051574707031e+02, 3.065038757324219e+02, 3.064985961914062e+02, 3.06488525390625e+02, 3.064728393554688e+02, 3.0644970703125e+02, 3.064168395996094e+02, 3.063916015625e+02, 3.064518127441406e+02, 3.065403747558594e+02, 3.065846557617188e+02, 3.065088195800781e+02, 3.062500305175781e+02, 3.058500061035156e+02, 3.053698425292969e+02, 3.0488525390625e+02, 3.042403259277344e+02, 3.035184936523438e+02, 3.029713745117188e+02, 3.027428894042969e+02, 3.02719482421875e+02, 3.027086791992188e+02, 3.027072143554688e+02, 3.027078552246094e+02, 3.027088623046875e+02, 3.027085266113281e+02, 3.027062377929688e+02, 3.027032775878906e+02, 3.027002258300781e+02, 3.026974792480469e+02, 3.026956787109375e+02, 3.026957092285156e+02, 3.026966552734375e+02, 3.02697021484375e+02, 3.026948852539062e+02, 3.026862487792969e+02, 3.02673828125e+02, 3.026622924804688e+02, 3.026561584472656e+02, 3.026584167480469e+02, 3.026648864746094e+02, 3.026698913574219e+02, 3.0266796875e+02, 3.026599426269531e+02, 3.026505432128906e+02, 3.026407775878906e+02, 3.026318969726562e+02, 3.026242980957031e+02, 3.026175842285156e+02, 3.026116638183594e+02, 3.026065368652344e+02]
+solCol.vol[30].T=[2.931499938964844e+02, 3.026159973144531e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026169128417969e+02, 3.026166381835938e+02, 3.026147766113281e+02, 3.02611572265625e+02, 3.026078796386719e+02, 3.026045837402344e+02, 3.026014404296875e+02, 3.025981140136719e+02, 3.025946655273438e+02, 3.025908813476562e+02, 3.025838012695312e+02, 3.025727844238281e+02, 3.025611572265625e+02, 3.025522155761719e+02, 3.025477905273438e+02, 3.025465393066406e+02, 3.025476989746094e+02, 3.025505065917969e+02, 3.025559692382812e+02, 3.025663452148438e+02, 3.025801391601562e+02, 3.026034851074219e+02, 3.026420593261719e+02, 3.027028198242188e+02, 3.028269348144531e+02, 3.031476440429688e+02, 3.03644775390625e+02, 3.04204345703125e+02, 3.046839599609375e+02, 3.051048583984375e+02, 3.055056762695312e+02, 3.058727416992188e+02, 3.062033081054688e+02, 3.064872741699219e+02, 3.067221984863281e+02, 3.068948669433594e+02, 3.069858703613281e+02, 3.069493713378906e+02, 3.0677880859375e+02, 3.066054382324219e+02, 3.06505126953125e+02, 3.065032653808594e+02, 3.065051574707031e+02, 3.065038757324219e+02, 3.064985961914062e+02, 3.06488525390625e+02, 3.064728393554688e+02, 3.0644970703125e+02, 3.064168395996094e+02, 3.063916015625e+02, 3.064518127441406e+02, 3.065403747558594e+02, 3.065846557617188e+02, 3.065088195800781e+02, 3.062500305175781e+02, 3.058500061035156e+02, 3.053698425292969e+02, 3.0488525390625e+02, 3.042403259277344e+02, 3.035184936523438e+02, 3.029713745117188e+02, 3.027428894042969e+02, 3.02719482421875e+02, 3.027086791992188e+02, 3.027072143554688e+02, 3.027078552246094e+02, 3.027088623046875e+02, 3.027085266113281e+02, 3.027062377929688e+02, 3.027032775878906e+02, 3.027002258300781e+02, 3.026974792480469e+02, 3.026956787109375e+02, 3.026957092285156e+02, 3.026966552734375e+02, 3.02697021484375e+02, 3.026948852539062e+02, 3.026862487792969e+02, 3.02673828125e+02, 3.026622924804688e+02, 3.026561584472656e+02, 3.026584167480469e+02, 3.026648864746094e+02, 3.026698913574219e+02, 3.0266796875e+02, 3.026599426269531e+02, 3.026505432128906e+02, 3.026407775878906e+02, 3.026318969726562e+02, 3.026242980957031e+02, 3.026175842285156e+02, 3.026116638183594e+02, 3.026065368652344e+02]
time=[0e+00, 8.64e+04]
-solCol1.heaGai[30].Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.661944951247278e-08, 2.43942463384883e-06, 3.596355099944049e-06, 1.162049099802985e-01, 7.540842890739441e-01, 2.529398441314697e+00, 6.200979709625244e+00, 1.477398300170898e+01, 3.402671813964844e+01, 6.189625930786146e+01, 9.226679229736315e+01, 1.180183258056641e+02, 1.433284606933594e+02, 1.680821685791016e+02, 1.910588531494141e+02, 2.112015228271484e+02, 2.291701812744141e+02, 2.441856689453125e+02, 2.549487915039062e+02, 2.599251708984375e+02, 2.554158172607422e+02, 2.44664306640625e+02, 2.339329376220703e+02, 2.299792327880859e+02, 2.305142211914062e+02, 2.307042694091797e+02, 2.30497802734375e+02, 2.298285369873047e+02, 2.286454162597656e+02, 2.268843383789062e+02, 2.244310302734375e+02, 2.211712341308593e+02, 2.197111511230469e+02, 2.23575439453125e+02, 2.274446868896484e+02, 2.263041229248047e+02, 2.156324920654297e+02, 1.938639831542969e+02, 1.655123138427734e+02, 1.349629516601562e+02, 1.040386581420898e+02, 6.497190093994141e+01, 2.860624313354492e+01, 5.419902801513566e+00, 1.511303344159389e-05, 1.248735406989001e-05, 9.901913472276647e-06, 7.438204647769453e-06, 5.249504283710849e-06, 3.684503326439881e-06, 3.803104618782527e-06, 2.117582198479795e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-solCol.heaGai[30].Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.661944773611594e-09, 2.439424520161992e-07, 3.596354929413792e-07, 1.162049081176534e-02, 7.540842890739441e-02, 2.529398500919342e-01, 6.200979948043823e-01, 1.477398276329041e+00, 3.402672052383423e+00, 6.189625740051283e+00, 9.226678848266589e+00, 1.1801833152771e+01, 1.433284664154053e+01, 1.680821800231934e+01, 1.910588645935059e+01, 2.112015342712402e+01, 2.291701698303223e+01, 2.441856575012207e+01, 2.54948787689209e+01, 2.599251747131348e+01, 2.554158210754395e+01, 2.44664306640625e+01, 2.339329528808594e+01, 2.299792289733887e+01, 2.305142211914062e+01, 2.307042694091797e+01, 2.304978179931641e+01, 2.298285293579102e+01, 2.286454200744629e+01, 2.268843460083008e+01, 2.24431037902832e+01, 2.211712455749511e+01, 2.197111511230469e+01, 2.23575439453125e+01, 2.274446868896484e+01, 2.263041305541992e+01, 2.156324768066406e+01, 1.938639831542969e+01, 1.655123138427734e+01, 1.349629592895508e+01, 1.040386581420898e+01, 6.497189998626709e+00, 2.860624313354492e+00, 5.419902801513566e-01, 1.511303366896757e-06, 1.248735316039531e-06, 9.901913244902971e-07, 7.438204647769453e-07, 5.249504511084524e-07, 3.684503155909624e-07, 3.803104675625946e-07, 2.117582198479795e-07, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-solCol1.heaLos.QLos[30]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-solCol.heaLos.QLos[30]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-difHeaGai.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.293955920339377e-23, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.440892098500626e-16, -1.869884062104183e-29, 0e+00, 1.77635683940025e-15, -1.77635683940025e-15, 0e+00, 0e+00, 0e+00, -3.552713678800501e-15, 0e+00, 0e+00, 3.552713678800501e-15, 0e+00, 0e+00, 3.552713678800501e-15, 0e+00, -3.552713678800501e-15, 0e+00, 0e+00, 0e+00, -3.552713678800501e-15, 0e+00, 3.552713678800351e-15, 0e+00, 1.498835719919922e-28, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.77635683940025e-15, 0e+00, 4.440892098500626e-16, 2.337355077630229e-30, 2.117582368135751e-22, -8.933757066249385e-36, 0e+00, 0e+00, 1.058791184067875e-22, 0e+00, -5.293955920339377e-23, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-difHeaLos.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+solCol1.heaGai[30].Q_flow=[1.092796355806058e-05, 1.092695401894161e-05, 1.092836464522406e-05, 1.09320226329146e-05, 1.093754508474376e-05, 1.094449817173881e-05, 1.095250263460912e-05, 1.09612674350501e-05, 1.097057975130156e-05, 1.098028860724298e-05, 1.099028668249957e-05, 1.100049576052697e-05, 1.101085945265368e-05, 1.102133319363929e-05, 1.103188424167456e-05, 1.104248440242372e-05, 1.105311366700334e-05, 1.106375293602468e-05, 1.107438583858311e-05, 1.10849987322581e-05, 1.109557888412382e-05, 1.110611356125446e-05, 1.111659094021888e-05, 1.112699919758597e-05, 1.113732741941931e-05, 1.131335011450574e-05, 1.722838533169124e-05, 2.314162520633545e-05, 5.409517884254523e-01, 3.235881567001343e+00, 9.600809097290039e+00, 2.133522415161133e+01, 4.735713577270508e+01, 1.034524230957031e+02, 1.79818756103516e+02, 2.589832763671872e+02, 3.21056640625e+02, 3.79817626953125e+02, 4.35958740234375e+02, 4.869130554199219e+02, 5.33079345703125e+02, 5.715880737304688e+02, 6.032078857421875e+02, 6.250850830078125e+02, 6.3389697265625e+02, 6.220223999023438e+02, 5.941995239257812e+02, 5.69645751953125e+02, 5.598302612304688e+02, 5.598853149414062e+02, 5.595507202148438e+02, 5.587222900390625e+02, 5.572680053710938e+02, 5.5509033203125e+02, 5.520347900390625e+02, 5.478222045898438e+02, 5.421729125976562e+02, 5.408706665039062e+02, 5.518356323242188e+02, 5.632445068359375e+02, 5.637262573242188e+02, 5.425841674804688e+02, 4.952185668945312e+02, 4.295903015136719e+02, 3.590595703125e+02, 2.853131408691406e+02, 1.836988983154297e+02, 8.287001800537109e+01, 1.636507225036589e+01, 5.657480141962883e-05, 5.11341168021318e-05, 4.555787745630369e-05, 3.98680567741394e-05, 3.408707198104821e-05, 2.823770773829892e-05, 2.234300336567685e-05, 1.642618735786527e-05, 1.114628048526356e-05, 1.113603320845868e-05, 1.112569589167833e-05, 1.111527853936423e-05, 1.110479479393689e-05, 1.109425556933274e-05, 1.108367268898292e-05, 1.107305797631852e-05, 1.10624259832548e-05, 1.105179035221227e-05, 1.104116654460086e-05, 1.103057547879871e-05, 1.102003898267867e-05, 1.100958343158709e-05, 1.099924520531204e-05, 1.09890679595992e-05, 1.097911354008829e-05, 1.096946289180778e-05, 1.096022970159538e-05, 1.09515704025398e-05, 1.094370873033768e-05, 1.093694663722999e-05, 1.093167156795971e-05, 1.092831462301547e-05]
+solCol.heaGai[30].Q_flow=[1.092796424018161e-06, 1.092695356419426e-06, 1.092836441785039e-06, 1.093202286028827e-06, 1.093754462999641e-06, 1.094449771699146e-06, 1.095250240723544e-06, 1.096126766242378e-06, 1.097057975130156e-06, 1.098028860724298e-06, 1.099028622775222e-06, 1.1000496442648e-06, 1.101085899790633e-06, 1.102133296626562e-06, 1.103188424167456e-06, 1.104248440242372e-06, 1.10531141217507e-06, 1.106375293602468e-06, 1.107438606595679e-06, 1.10849987322581e-06, 1.109557956624485e-06, 1.110611378862814e-06, 1.111659116759256e-06, 1.112699919758597e-06, 1.113732764679298e-06, 1.131335011450574e-06, 1.722838533169124e-06, 2.314162429684075e-06, 5.409517884254523e-02, 3.235881626605988e-01, 9.600809216499329e-01, 2.133522510528564e+00, 4.735713481903076e+00, 1.034524250030518e+01, 1.798187637329105e+01, 2.589832687377926e+01, 3.210566329956055e+01, 3.798176193237305e+01, 4.359587478637695e+01, 4.869130706787109e+01, 5.330793380737305e+01, 5.715880584716797e+01, 6.03207893371582e+01, 6.250850677490234e+01, 6.338969421386719e+01, 6.220223999023438e+01, 5.941995620727539e+01, 5.696457672119141e+01, 5.598302841186523e+01, 5.598853302001953e+01, 5.595507049560547e+01, 5.587223052978516e+01, 5.572680282592773e+01, 5.5509033203125e+01, 5.52034797668457e+01, 5.478222274780273e+01, 5.421728897094726e+01, 5.408706283569335e+01, 5.518356704711914e+01, 5.63244514465332e+01, 5.637262725830078e+01, 5.425841522216797e+01, 4.952185821533203e+01, 4.295903015136719e+01, 3.590595626831055e+01, 2.853131294250488e+01, 1.83698902130127e+01, 8.287001609802246e+00, 1.636507272720305e+00, 5.657479960063942e-06, 5.11341158926371e-06, 4.555787654680898e-06, 3.986805495515e-06, 3.408707243579556e-06, 2.823770728355157e-06, 2.23430038204242e-06, 1.64261871304916e-06, 1.114628048526356e-06, 1.113603389057971e-06, 1.112569520955731e-06, 1.111527922148525e-06, 1.110479502131057e-06, 1.109425511458539e-06, 1.108367200686189e-06, 1.10730582036922e-06, 1.106242621062847e-06, 1.105178967009124e-06, 1.104116677197453e-06, 1.103057570617239e-06, 1.102003807318397e-06, 1.100958343158709e-06, 1.099924475056469e-06, 1.098906864172022e-06, 1.097911422220932e-06, 1.096946334655513e-06, 1.096022970159538e-06, 1.095157017516613e-06, 1.094370873033768e-06, 1.093694663722999e-06, 1.093167156795971e-06, 1.092831439564179e-06]
+solCol1.heaLos.QLos[30]=[-4.380447387695312e+01, -7.619920349121094e+01, -7.620242309570312e+01, -7.620242309570312e+01, -7.620242309570312e+01, -7.620242309570312e+01, -7.620242309570312e+01, -7.620242309570312e+01, -7.620242309570312e+01, -7.627976989746094e+01, -7.662286376953125e+01, -7.712150573730469e+01, -7.764560699462891e+01, -7.809319305419922e+01, -7.854766845703125e+01, -7.902848815917969e+01, -7.953343200683594e+01, -8.011583709716797e+01, -8.134830474853516e+01, -8.300363922119141e+01, -8.460903167724609e+01, -8.569682312011719e+01, -8.618487548828125e+01, -8.625221252441406e+01, -8.600701904296875e+01, -8.555729675292969e+01, -8.455423736572266e+01, -8.294036865234375e+01, -8.125204467773438e+01, -8.005194854736328e+01, -8.021732330322266e+01, -8.189669036865234e+01, -8.400953674316406e+01, -8.576940155029297e+01, -8.617652893066406e+01, -8.557297515869141e+01, -8.434725189208984e+01, -8.340859985351562e+01, -8.34866943359375e+01, -8.366082763671875e+01, -8.381011962890625e+01, -8.399658203125e+01, -8.429116058349609e+01, -8.448407745361328e+01, -8.441273498535156e+01, -8.388250732421875e+01, -8.283428192138672e+01, -8.174813842773438e+01, -8.091211700439453e+01, -8.041287231445312e+01, -7.992658233642578e+01, -7.942939758300781e+01, -7.891856384277344e+01, -7.839122772216797e+01, -7.784474945068359e+01, -7.730615234375e+01, -7.680028533935547e+01, -7.633739471435547e+01, -7.613288879394531e+01, -7.551459503173828e+01, -7.328083801269531e+01, -7.003519439697266e+01, -6.655142211914062e+01, -6.378825759887695e+01, -6.152143478393555e+01, -5.984132385253906e+01, -5.817507934570312e+01, -5.684889984130859e+01, -5.741002273559572e+01, -5.967306900024412e+01, -6.2177677154541e+01, -6.322102737426758e+01, -6.329348373413086e+01, -6.31524543762207e+01, -6.303263092041016e+01, -6.316926193237305e+01, -6.355314636230469e+01, -6.398552322387695e+01, -6.441464996337891e+01, -6.478802490234375e+01, -6.497110748291016e+01, -6.490216064453125e+01, -6.477236938476562e+01, -6.47757568359375e+01, -6.53017578125e+01, -6.677191925048828e+01, -6.858847808837891e+01, -7.009464263916016e+01, -7.062604522705078e+01, -7.003845977783203e+01, -6.90782470703125e+01, -6.855696105957031e+01, -6.920010375976562e+01, -7.042229461669922e+01, -7.18023681640625e+01, -7.317823791503906e+01, -7.439098358154297e+01, -7.543805694580078e+01, -7.636734771728516e+01, -7.718011474609375e+01, -7.787799072265625e+01]
+solCol.heaLos.QLos[30]=[-4.380447387695312e+00, -7.619920253753662e+00, -7.620242118835449e+00, -7.620242118835449e+00, -7.620242118835449e+00, -7.620242118835449e+00, -7.620242118835449e+00, -7.620242118835449e+00, -7.620242118835449e+00, -7.627976894378662e+00, -7.662286281585693e+00, -7.712150573730469e+00, -7.764560699462891e+00, -7.809319496154785e+00, -7.854766368865967e+00, -7.902848720550537e+00, -7.953343391418457e+00, -8.01158332824707e+00, -8.134830474853516e+00, -8.300363540649414e+00, -8.460903167724609e+00, -8.569682121276855e+00, -8.618487358093262e+00, -8.625221252441406e+00, -8.600702285766602e+00, -8.555729866027832e+00, -8.455424308776855e+00, -8.294036865234375e+00, -8.125204086303711e+00, -8.005194664001465e+00, -8.021732330322266e+00, -8.189668655395508e+00, -8.400954246520996e+00, -8.576939582824707e+00, -8.617652893066406e+00, -8.557297706604004e+00, -8.434724807739258e+00, -8.340860366821289e+00, -8.348669052124023e+00, -8.366082191467285e+00, -8.381011962890625e+00, -8.399658203125e+00, -8.429115295410156e+00, -8.448408126831055e+00, -8.44127368927002e+00, -8.388251304626465e+00, -8.283428192138672e+00, -8.174813270568848e+00, -8.091211318969727e+00, -8.041287422180176e+00, -7.992658138275146e+00, -7.942939758300781e+00, -7.891856670379639e+00, -7.839122772216797e+00, -7.784474849700928e+00, -7.730615139007568e+00, -7.680028915405273e+00, -7.633739471435547e+00, -7.613288879394531e+00, -7.551459789276123e+00, -7.328083992004395e+00, -7.003519058227539e+00, -6.655142307281494e+00, -6.378825664520264e+00, -6.152143478393555e+00, -5.984132289886475e+00, -5.817507743835449e+00, -5.684889793395996e+00, -5.741002082824709e+00, -5.967306613922116e+00, -6.2177677154541e+00, -6.322102546691895e+00, -6.329348564147949e+00, -6.315245151519775e+00, -6.303263187408447e+00, -6.3169264793396e+00, -6.3553147315979e+00, -6.398551940917969e+00, -6.441464900970459e+00, -6.47880220413208e+00, -6.497110366821289e+00, -6.49021577835083e+00, -6.477236747741699e+00, -6.477575778961182e+00, -6.530175685882568e+00, -6.677191734313965e+00, -6.858847618103027e+00, -7.009464263916016e+00, -7.062603950500488e+00, -7.003845691680908e+00, -6.907824516296387e+00, -6.855696201324463e+00, -6.920010089874268e+00, -7.042229652404785e+00, -7.180237293243408e+00, -7.31782341003418e+00, -7.439098358154297e+00, -7.543805599212646e+00, -7.636734485626221e+00, -7.718011379241943e+00, -7.787798881530762e+00]
+difHeaGai.y=[0e+00, 0e+00, 2.117582368135751e-22, 0e+00, 0e+00, 2.117582368135751e-22, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.117582368135751e-22, 0e+00, 2.117582368135751e-22, 0e+00, 2.229088103276721e-36, -2.117582368135751e-22, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.117582368135751e-22, 0e+00, 0e+00, 0e+00, 0e+00, 5.551115123125783e-17, 1.110223024625157e-16, 0e+00, 0e+00, 1.77635683940025e-15, 3.552713678800501e-15, 0e+00, 0e+00, 7.105427357601002e-15, -7.105427357601002e-15, 0e+00, -7.105427357601002e-15, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -7.105427357601002e-15, 7.105427357601002e-15, 0e+00, 0e+00, 7.105427357601002e-15, 0e+00, -7.105427357600703e-15, -7.105427357600703e-15, 7.105427357600702e-15, 0e+00, 0e+00, 7.105427357601002e-15, 7.105427357601002e-15, 7.105427357601002e-15, 0e+00, 7.105427357601002e-15, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.470329472543003e-22, 0e+00, 0e+00, 4.235164736271502e-22, 0e+00, 4.235164736271502e-22, 2.117582368135751e-22, 0e+00, 0e+00, 0e+00, -2.117582368135751e-22, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.117582368135751e-22, 2.117582368135751e-22, 0e+00, 2.117582368135751e-22, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.117582368135751e-22, 2.117582368135751e-22, 2.117582368135751e-22]
+difHeaLos.y=[-3.552713678800501e-15, -6.217248937900877e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -6.217248937900877e-15, -7.105427357601002e-15, -2.575717417130363e-14, -2.664535259100376e-14, -2.664535259100376e-14, -2.664535259100356e-14, -2.575717417130363e-14, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, 1.243449787580175e-14, -7.105427357601002e-15, -8.881784197001252e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, 1.243449787580175e-14, -7.105427357601002e-15, -7.105427357601002e-15, 1.06581410364015e-14, -8.881784197001252e-15, -8.881784197001252e-15, 1.243449787580134e-14, 1.06581410364015e-14, -8.881784197001252e-15, -7.105427357601002e-15, -7.105427357601002e-15, 1.243449787580175e-14, -8.881784197001252e-15, -8.881784197001252e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -2.664535259100376e-14, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -6.217248937900877e-15, -7.105427357601002e-15, -7.993605777301127e-15, 1.243449787580175e-14, -7.105427357601002e-15, -7.105427357600964e-15, -7.105427357601002e-15, -6.217248937900877e-15, -6.217248937900877e-15, -2.575717417130363e-14, -6.217248937900877e-15, -6.217248937900877e-15, -2.398081733190338e-14, -5.329070518200751e-15, -5.329070518200751e-15, -5.329070518200751e-15, -4.440892098500626e-15, -5.329070518200714e-15, -5.329070518200751e-15, -2.486899575160351e-14, -5.329070518200751e-15, -6.217248937900877e-15, -6.217248937900877e-15, -5.329070518200751e-15, 1.4210854715202e-14, -6.217248937900877e-15, -6.217248937900877e-15, -5.329070518200751e-15, -5.329070518200751e-15, -6.217248937900877e-15, -6.217248937900877e-15, 1.332267629550188e-14, -5.329070518200751e-15, -6.217248937900877e-15, -6.217248937900877e-15, -6.217248937900877e-15, -6.217248937900877e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -6.217248937900877e-15, -6.217248937900877e-15, -7.105427357601002e-15, -6.217248937900877e-15, -6.217248937900877e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15, -7.105427357601002e-15]