From 265c7de66af502e1524c2c3f6424c5d2084a57fd Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Tue, 21 Nov 2017 14:06:24 -0800
Subject: [PATCH 1/4] Corrected wrong scaling of heat loss with number of
 panels

For #1073
---
 Buildings/Fluid/SolarCollectors/ASHRAE93.mo   |   8 +-
 Buildings/Fluid/SolarCollectors/EN12975.mo    |  10 +-
 .../Validation/EN12975NPanels.mo              | 139 ++++++++++++++++++
 .../SolarCollectors/Validation/FlatPlate.mo   |  28 ++--
 .../Validation/FlatPlateNPanels.mo            |  92 ++++++++++++
 .../SolarCollectors/Validation/package.order  |   2 +
 ...SolarCollectors_Examples_Concentrating.txt |   8 +-
 ...ollectors_Examples_FlatPlateShaCoeTrue.txt |   8 +-
 ...Collectors_Examples_FlatPlateTotalArea.txt |  14 +-
 ...rCollectors_Examples_FlatPlateWithTank.txt |   8 +-
 ...Fluid_SolarCollectors_Examples_Tubular.txt |   8 +-
 ...arCollectors_Validation_EN12975NPanels.txt |  22 +++
 ...Collectors_Validation_FlatPlateNPanels.txt |  22 +++
 .../Validation/EN12975NPanels.mos             |   5 +
 .../Validation/FlatPlateNPanels.mos           |   5 +
 ...arCollectors.Validation.EN12975NPanels.mos |  11 ++
 ...Collectors.Validation.FlatPlateNPanels.mos |  11 ++
 17 files changed, 361 insertions(+), 40 deletions(-)
 create mode 100644 Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo
 create mode 100644 Buildings/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mo
 create mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt
 create mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_FlatPlateNPanels.txt
 create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975NPanels.mos
 create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mos
 create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.EN12975NPanels.mos
 create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.FlatPlateNPanels.mos
diff --git a/Buildings/Fluid/SolarCollectors/ASHRAE93.mo b/Buildings/Fluid/SolarCollectors/ASHRAE93.mo
index 3ddad27c314..3767686244c 100644
--- a/Buildings/Fluid/SolarCollectors/ASHRAE93.mo
+++ b/Buildings/Fluid/SolarCollectors/ASHRAE93.mo
@@ -26,7 +26,7 @@ model ASHRAE93 "Model of a flat plate solar thermal collector"
     final G_nominal=per.G_nominal,
     dT_nominal=per.dT_nominal,
     final A_c=TotalArea_internal,
-    m_flow_nominal=per.mperA_flow_nominal*per.A,
+    m_flow_nominal=per.mperA_flow_nominal*per.A*nPanels_internal,
     final cp_default=cp_default)
     "Calculates the heat lost to the surroundings using the ASHRAE93 standard calculations"
         annotation (Placement(transformation(extent={{-20,6},{0,26}})));
@@ -176,6 +176,12 @@ equation
  </html>", revisions="<html>
  <ul>
  <li>
+ November 21, 2017, by Michael Wetter:<br/>
+ Corrected error in heat loss calculations that did not scale correctly with <code>nPanels</code>.<br/>
+ This is for
+ <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1073\">issue 1073</a>.
+ </li>
+ <li>
  October 18, 2013, by Michael Wetter:<br/>
  Removed duplicate connection.
  </li>
diff --git a/Buildings/Fluid/SolarCollectors/EN12975.mo b/Buildings/Fluid/SolarCollectors/EN12975.mo
index 0af2723f8d7..e605a9ccb2a 100644
--- a/Buildings/Fluid/SolarCollectors/EN12975.mo
+++ b/Buildings/Fluid/SolarCollectors/EN12975.mo
@@ -26,7 +26,7 @@ extends Buildings.Fluid.SolarCollectors.BaseClasses.PartialSolarCollector(final
     redeclare package Medium = Medium,
     final G_nominal=per.G_nominal,
     final dT_nominal=per.dT_nominal,
-    final m_flow_nominal=per.mperA_flow_nominal*per.A,
+    final m_flow_nominal=per.mperA_flow_nominal*per.A*nPanels_internal,
     final cp_default=cp_default)
     "Calculates the heat lost to the surroundings using the EN12975 standard calculations"
            annotation (Placement(transformation(extent={{-20,6},{0,26}})));
@@ -102,7 +102,13 @@ equation
           <a href=\"http://www.energyplus.gov\">EnergyPlus 7.0.0 Engineering Reference</a>, October 13, 2011.<br/>
         </p>
     </html>", revisions="<html>
-      <ul>
+    <ul>
+        <li>
+        November 21, 2017, by Michael Wetter:<br/>
+        Corrected error in heat loss calculations that did not scale correctly with <code>nPanels</code>.<br/>
+        This is for
+        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1073\">issue 1073</a>.
+        </li>
         <li>
           January 4, 2013, by Peter Grant:<br/>
           First implementation.
diff --git a/Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo b/Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo
new file mode 100644
index 00000000000..d850dace5e9
--- /dev/null
+++ b/Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo
@@ -0,0 +1,139 @@
+within Buildings.Fluid.SolarCollectors.Validation;
+model EN12975NPanels
+  "Validation model for collector according to EN12975 with different settings for nPanel"
+  extends Modelica.Icons.Example;
+  replaceable package Medium = Buildings.Media.Water "Medium in the system";
+
+  parameter Integer nPanels = 10 "Number of panels";
+
+  Buildings.Fluid.SolarCollectors.EN12975
+   solCol(
+    redeclare package Medium = Medium,
+    per=Data.GlazedFlatPlate.FP_GuangdongFSPTY95(),
+    shaCoe=0,
+    azi=0,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    rho=0.2,
+    nColType=Buildings.Fluid.SolarCollectors.Types.NumberSelection.Number,
+    nPanels=1,
+    nSeg=30,
+    lat=0.6457718232379,
+    til=0.78539816339745)
+    "Flat plate solar collector model, has been modified for validation purposes"
+    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")
+    "Weather data file reader"
+    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+  Buildings.Fluid.Sources.Boundary_pT sou(
+    redeclare package Medium = Medium,
+    use_p_in=false,
+    p(displayUnit="Pa") = 101325,
+    nPorts=1) "Outlet for water flow"
+    annotation (Placement(transformation(extent={{80,20},{60,40}})));
+  Buildings.Fluid.Sources.MassFlowSource_T bou(
+    nPorts=1,
+    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"
+    annotation (Placement(transformation(extent={{-12,20},{8,40}})));
+
+  Buildings.Fluid.SolarCollectors.EN12975 solCol1(
+    redeclare package Medium = Medium,
+    per=Data.GlazedFlatPlate.FP_GuangdongFSPTY95(),
+    shaCoe=0,
+    azi=0,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    rho=0.2,
+    nColType=Buildings.Fluid.SolarCollectors.Types.NumberSelection.Number,
+    nSeg=30,
+    lat=0.6457718232379,
+    til=0.78539816339745,
+    nPanels=nPanels)
+    "Flat plate solar collector model, has been modified for validation purposes"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+  Buildings.Fluid.Sources.Boundary_pT sou1(
+    redeclare package Medium = Medium,
+    use_p_in=false,
+    p(displayUnit="Pa") = 101325,
+    nPorts=1) "Outlet for water flow"
+    annotation (Placement(transformation(extent={{80,-40},{60,-20}})));
+  Buildings.Fluid.Sources.MassFlowSource_T bou1(
+    nPorts=1,
+    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"
+    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)
+    "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)
+    "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)
+    "Nominal flow rate for one panel"
+    annotation (Placement(transformation(extent={{-92,28},{-72,48}})));
+equation
+  connect(weaDat.weaBus, solCol1.weaBus) annotation (Line(
+      points={{-20,70},{14,70},{14,-20},{20,-20},{20,-20.4}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None));
+  connect(bou1.ports[1], solCol1.port_a) annotation (Line(
+      points={{8,-30},{20,-30}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(sou1.ports[1], solCol1.port_b) annotation (Line(
+      points={{60,-30},{40,-30}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(gaiNPan.y, bou1.m_flow_in)
+    annotation (Line(points={{-31,-22},{-12,-22}}, color={0,0,127}));
+  connect(solCol.port_a, bou.ports[1])
+    annotation (Line(points={{20,30},{8,30}}, color={0,127,255}));
+  connect(solCol.port_b, sou.ports[1])
+    annotation (Line(points={{40,30},{60,30}}, color={0,127,255}));
+  connect(solCol.weaBus, weaDat.weaBus) annotation (Line(
+      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}));
+  annotation (
+    Documentation(info="<html>
+<p>
+This model validates the solar collector model
+<a href=\"modelica://Buildings.Fluid.SolarCollectors.EN12975\">
+Buildings.Fluid.SolarCollectors.EN12975</a>
+for the case
+where the number of panels is <i>1</i> for the instance <code>solCol</code>
+and <i>10</i> for the instance <code>solCol1</code>.
+The instances <code>difHeaGai</code> and <code>difHeaLos</code>
+compare the heat gain and heat loss between the two models.
+The output of these blocks should be zero, except for rounding errors.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+November 21, 2017, by Michael Wetter:<br/>
+First implementation to validate
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1073\">#1073</a>.
+</li>
+</ul>
+</html>"),
+  __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/Fluid/SolarCollectors/Validation/FlatPlate.mo b/Buildings/Fluid/SolarCollectors/Validation/FlatPlate.mo
index 68b791ed61a..f201c3f995f 100644
--- a/Buildings/Fluid/SolarCollectors/Validation/FlatPlate.mo
+++ b/Buildings/Fluid/SolarCollectors/Validation/FlatPlate.mo
@@ -16,25 +16,25 @@ model FlatPlate "Validation model for FlatPlate"
     lat=0.6457718232379,
     til=0.78539816339745)
     "Flat plate solar collector model, has been modified for validation purposes"
-    annotation (Placement(transformation(extent={{20,-20},{40,0}})));
+    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")
     "Weather data file reader"
-    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
+    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
   Buildings.Fluid.Sources.Boundary_pT sou(
     redeclare package Medium = Medium,
     use_p_in=false,
     p(displayUnit="Pa") = 101325,
     nPorts=1) "Outlet for water flow"
-    annotation (Placement(transformation(extent={{80,-20},{60,0}})));
+    annotation (Placement(transformation(extent={{80,20},{60,40}})));
   Buildings.Fluid.Sources.MassFlowSource_T bou(
     nPorts=1,
     redeclare package Medium = Medium,
     use_m_flow_in=true,
     use_T_in=true)
     "Inlet for water flow, at a prescribed flow rate and temperature"
-    annotation (Placement(transformation(extent={{-12,-20},{8,0}})));
+    annotation (Placement(transformation(extent={{-12,20},{8,40}})));
   Modelica.Blocks.Sources.CombiTimeTable datRea(
     tableOnFile=true,
     tableName="TRNSYS",
@@ -43,43 +43,43 @@ model FlatPlate "Validation model for FlatPlate"
        "modelica://Buildings/Fluid/SolarCollectors/Examples/ValidationData/TRNSYSAnnualData.txt"),
     smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments)
     "Data reader with inlet conditions from TRNSYS"
-    annotation (Placement(transformation(extent={{-90,-12},{-70,8}})));
+    annotation (Placement(transformation(extent={{-90,28},{-70,48}})));
 
   Modelica.Blocks.Math.Add add
     "Converts TRNSYS data from degree Celsius to Kelving"
-    annotation (Placement(transformation(extent={{-50,-40},{-30,-20}})));
+    annotation (Placement(transformation(extent={{-50,0},{-30,20}})));
   Modelica.Blocks.Sources.Constant const(k=273.15)
     "Used to convert TRNSYS data from degree Celsius to Kelving"
-    annotation (Placement(transformation(extent={{-90,-46},{-70,-26}})));
+    annotation (Placement(transformation(extent={{-90,-6},{-70,14}})));
 
 equation
   connect(weaDat.weaBus, solCol.weaBus) annotation (Line(
-      points={{-20,30},{20,30},{20,-0.4}},
+      points={{-20,70},{20,70},{20,39.6}},
       color={255,204,51},
       thickness=0.5,
       smooth=Smooth.None));
   connect(bou.ports[1], solCol.port_a)      annotation (Line(
-      points={{8,-10},{20,-10}},
+      points={{8,30},{20,30}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(const.y, add.u2) annotation (Line(
-      points={{-69,-36},{-52,-36}},
+      points={{-69,4},{-52,4}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(add.y, bou.T_in)      annotation (Line(
-      points={{-29,-30},{-24,-30},{-24,-6},{-14,-6}},
+      points={{-29,10},{-24,10},{-24,34},{-14,34}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(datRea.y[1], add.u1)        annotation (Line(
-      points={{-69,-2},{-60,-2},{-60,-24},{-52,-24}},
+      points={{-69,38},{-60,38},{-60,16},{-52,16}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(datRea.y[4], bou.m_flow_in)             annotation (Line(
-      points={{-69,-2},{-12,-2}},
+      points={{-69,38},{-12,38}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(sou.ports[1], solCol.port_b) annotation (Line(
-      points={{60,-10},{40,-10}},
+      points={{60,30},{40,30}},
       color={0,127,255},
       smooth=Smooth.None));
   annotation (
diff --git a/Buildings/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mo b/Buildings/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mo
new file mode 100644
index 00000000000..1001002bd40
--- /dev/null
+++ b/Buildings/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mo
@@ -0,0 +1,92 @@
+within Buildings.Fluid.SolarCollectors.Validation;
+model FlatPlateNPanels
+  "Validation model for flat plate collector with different settings for nPanel"
+  extends Buildings.Fluid.SolarCollectors.Validation.FlatPlate;
+  parameter Integer nPanels = 10 "Number of panels";
+  Buildings.Fluid.SolarCollectors.ASHRAE93
+   solCol1(
+    redeclare package Medium = Medium,
+    shaCoe=0,
+    azi=0,
+    per=Buildings.Fluid.SolarCollectors.Data.GlazedFlatPlate.FP_TRNSYSValidation(),
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    rho=0.2,
+    nColType=Buildings.Fluid.SolarCollectors.Types.NumberSelection.Number,
+    nSeg=30,
+    lat=0.6457718232379,
+    til=0.78539816339745,
+    nPanels=nPanels)
+    "Flat plate solar collector model, has been modified for validation purposes"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+  Buildings.Fluid.Sources.Boundary_pT sou1(
+    redeclare package Medium = Medium,
+    use_p_in=false,
+    p(displayUnit="Pa") = 101325,
+    nPorts=1) "Outlet for water flow"
+    annotation (Placement(transformation(extent={{80,-40},{60,-20}})));
+  Buildings.Fluid.Sources.MassFlowSource_T bou1(
+    nPorts=1,
+    redeclare package Medium = Medium,
+    use_m_flow_in=true,
+    use_T_in=true)
+    "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)
+    "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)
+    "Difference in heat loss at last panel between model with 1 and with 30 panels"
+    annotation (Placement(transformation(extent={{-68,-92},{-48,-72}})));
+equation
+  connect(weaDat.weaBus, solCol1.weaBus) annotation (Line(
+      points={{-20,70},{14,70},{14,-20},{20,-20},{20,-20.4}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None));
+  connect(bou1.ports[1], solCol1.port_a) annotation (Line(
+      points={{8,-30},{20,-30}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(add.y, bou1.T_in) annotation (Line(
+      points={{-29,10},{-24,10},{-24,-26},{-14,-26}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(sou1.ports[1], solCol1.port_b) annotation (Line(
+      points={{60,-30},{40,-30}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(gaiNPan.y, bou1.m_flow_in)
+    annotation (Line(points={{-31,-22},{-12,-22}}, color={0,0,127}));
+  connect(gaiNPan.u, datRea.y[4]) annotation (Line(points={{-54,-22},{-60,-22},{
+          -60,38},{-69,38}}, color={0,0,127}));
+  annotation (
+    Documentation(info="<html>
+<p>
+This model validates the solar collector model
+<a href=\"modelica://Buildings.Fluid.SolarCollectors.ASHRAE\">
+Buildings.Fluid.SolarCollectors.ASHRAE</a>
+for the case
+where the number of panels is <i>1</i> for the instance <code>solCol</code>
+and <i>10</i> for the instance <code>solCol1</code>.
+The instances <code>difHeaGai</code> and <code>difHeaLos</code>
+compare the heat gain and heat loss between the two models.
+The output of these blocks should be zero, except for rounding errors.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+November 21, 2017, by Michael Wetter:<br/>
+First implementation to validate
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1073\">#1073</a>.
+</li>
+</ul>
+</html>"),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mos"
+    "Simulate and plot"),
+  experiment(Tolerance=1e-6, StopTime=86400));
+end FlatPlateNPanels;
diff --git a/Buildings/Fluid/SolarCollectors/Validation/package.order b/Buildings/Fluid/SolarCollectors/Validation/package.order
index 58f8a91afc5..6487f5215f2 100644
--- a/Buildings/Fluid/SolarCollectors/Validation/package.order
+++ b/Buildings/Fluid/SolarCollectors/Validation/package.order
@@ -1,2 +1,4 @@
+EN12975NPanels
 ExtremeAmbientConditions
 FlatPlate
+FlatPlateNPanels
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Concentrating.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Concentrating.txt
index b847f0bf4bf..65d5d9c6806 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Concentrating.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Concentrating.txt
@@ -1,4 +1,4 @@
-last-generated=2017-05-31
+last-generated=2017-11-21
 statistics-initialization=
 {
   "numerical Jacobians": "0", 
@@ -11,8 +11,8 @@ statistics-simulation=
   "number of continuous time states": "11", 
   "linear": " "
 }
-solCol.vol[3].T=[2.931499938964844e+02, 2.928260192871094e+02, 2.925274658203125e+02, 2.923985900878906e+02, 2.924694519042969e+02, 2.925590209960938e+02, 2.926129760742188e+02, 2.926434936523438e+02, 2.926599426269531e+02, 2.926659851074219e+02, 2.926617431640625e+02, 2.926463623046875e+02, 2.926194152832031e+02, 2.925794067382812e+02, 2.925216674804688e+02, 2.924356689453125e+02, 2.922990112304688e+02, 2.919940795898438e+02, 2.886787109375e+02, 2.842298278808594e+02, 2.831361694335938e+02, 2.830441589355469e+02, 2.830451354980469e+02, 2.830498046875e+02, 2.83053955078125e+02, 2.83057373046875e+02, 2.830607604980469e+02, 2.830659484863281e+02, 2.830713500976562e+02, 2.830745239257812e+02, 2.830715942382812e+02, 2.830736694335938e+02, 2.831182556152344e+02, 2.833228454589844e+02, 2.839266662597656e+02, 2.853466796875e+02, 2.899593505859375e+02, 2.952816162109375e+02, 2.974848937988281e+02, 2.983355102539062e+02, 2.989701232910156e+02, 2.995758056640625e+02, 3.0017626953125e+02, 3.007783813476562e+02, 3.013735656738281e+02, 3.019241943359375e+02, 3.023966369628906e+02, 3.029491577148438e+02, 3.038569641113281e+02, 3.055164489746094e+02, 3.086326904296875e+02, 3.106484375e+02, 2.970841064453125e+02, 2.896945495605469e+02, 2.880401916503906e+02, 2.875003967285156e+02, 2.871967468261719e+02, 2.870184326171875e+02, 2.870011291503906e+02, 2.870922241210938e+02, 2.872154541015625e+02, 2.87299560546875e+02, 2.872771301269531e+02, 2.871672668457031e+02, 2.870270690917969e+02, 2.869669494628906e+02, 2.869512023925781e+02, 2.87853271484375e+02, 2.904636840820312e+02, 2.926761474609375e+02, 2.930516967773438e+02, 2.928127136230469e+02, 2.927662963867188e+02, 2.927850036621094e+02, 2.928029479980469e+02, 2.928124389648438e+02, 2.928125915527344e+02, 2.928046264648438e+02, 2.927896423339844e+02, 2.927670288085938e+02, 2.927351379394531e+02, 2.926909790039062e+02, 2.926260375976562e+02, 2.925181884765625e+02, 2.9192333984375e+02, 2.87116943359375e+02, 2.837517700195312e+02, 2.831751403808594e+02, 2.831308288574219e+02, 2.831312561035156e+02, 2.831364440917969e+02, 2.831406860351562e+02, 2.831401977539062e+02, 2.831350708007812e+02, 2.831280822753906e+02, 2.83119873046875e+02, 2.831106872558594e+02, 2.831000671386719e+02, 2.83086181640625e+02, 2.830650634765625e+02, 2.830221252441406e+02]
-solCol.vol[9].T=[2.931499938964844e+02, 2.92992431640625e+02, 2.930223388671875e+02, 2.930491333007812e+02, 2.930628662109375e+02, 2.930707702636719e+02, 2.930755920410156e+02, 2.930784301757812e+02, 2.930797729492188e+02, 2.930797729492188e+02, 2.930780639648438e+02, 2.930746154785156e+02, 2.930692138671875e+02, 2.930611877441406e+02, 2.930487060546875e+02, 2.9302734375e+02, 2.929820251464844e+02, 2.92732177734375e+02, 2.921322937011719e+02, 2.910625915527344e+02, 2.876069641113281e+02, 2.841134643554688e+02, 2.829970703125e+02, 2.828568420410156e+02, 2.828590698242188e+02, 2.828700866699219e+02, 2.828801574707031e+02, 2.828926391601562e+02, 2.829076232910156e+02, 2.829202880859375e+02, 2.829228820800781e+02, 2.829233703613281e+02, 2.829734497070312e+02, 2.832106323242188e+02, 2.887387390136719e+02, 2.930624084472656e+02, 2.936741943359375e+02, 2.937914733886719e+02, 2.938811950683594e+02, 2.939678344726562e+02, 2.940534973144531e+02, 2.941385498046875e+02, 2.942259521484375e+02, 2.943144836425781e+02, 2.944021301269531e+02, 2.944786071777344e+02, 2.945496826171875e+02, 2.946670837402344e+02, 2.949062194824219e+02, 2.954290161132812e+02, 2.971413269042969e+02, 3.055824584960938e+02, 3.146582336425781e+02, 3.156969909667969e+02, 3.054796142578125e+02, 2.983097229003906e+02, 2.958835144042969e+02, 2.949535217285156e+02, 2.945931701660156e+02, 2.946459655761719e+02, 2.949256896972656e+02, 2.952174072265625e+02, 2.95319580078125e+02, 2.951672058105469e+02, 2.948446044921875e+02, 2.945582275390625e+02, 2.94362548828125e+02, 2.944328918457031e+02, 2.934560241699219e+02, 2.931121215820312e+02, 2.93088623046875e+02, 2.930918273925781e+02, 2.930959777832031e+02, 2.930989990234375e+02, 2.93100830078125e+02, 2.931013488769531e+02, 2.931005249023438e+02, 2.930986633300781e+02, 2.930956726074219e+02, 2.930912475585938e+02, 2.930848693847656e+02, 2.930752563476562e+02, 2.930580139160156e+02, 2.930147705078125e+02, 2.9273828125e+02, 2.922879028320312e+02, 2.907314453125e+02, 2.866432189941406e+02, 2.838417053222656e+02, 2.831713256835938e+02, 2.831059875488281e+02, 2.831146240234375e+02, 2.831209106445312e+02, 2.831141967773438e+02, 2.830981140136719e+02, 2.830771484375e+02, 2.830532531738281e+02, 2.830268859863281e+02, 2.829962158203125e+02, 2.829573974609375e+02, 2.829014282226562e+02]
-solCol.vol[6].T=[2.931499938964844e+02, 2.9283154296875e+02, 2.926622009277344e+02, 2.9271142578125e+02, 2.92783203125e+02, 2.928248596191406e+02, 2.928487243652344e+02, 2.928626708984375e+02, 2.928699035644531e+02, 2.928716430664062e+02, 2.928671569824219e+02, 2.928559875488281e+02, 2.928377075195312e+02, 2.92810791015625e+02, 2.927709350585938e+02, 2.927083129882812e+02, 2.925989379882812e+02, 2.92318603515625e+02, 2.916394348144531e+02, 2.884578857421875e+02, 2.8440478515625e+02, 2.830998229980469e+02, 2.829486083984375e+02, 2.829485168457031e+02, 2.829568786621094e+02, 2.829641418457031e+02, 2.829707336425781e+02, 2.829799194335938e+02, 2.829905090332031e+02, 2.82998291015625e+02, 2.829971618652344e+02, 2.82996826171875e+02, 2.830473937988281e+02, 2.832803955078125e+02, 2.839465026855469e+02, 2.880049133300781e+02, 2.935224914550781e+02, 2.953799743652344e+02, 2.9590625e+02, 2.962727966308594e+02, 2.966195983886719e+02, 2.9696240234375e+02, 2.973076782226562e+02, 2.976565246582031e+02, 2.980019226074219e+02, 2.983146667480469e+02, 2.985840759277344e+02, 2.989544067382812e+02, 2.996312255859375e+02, 3.009611511230469e+02, 3.037925720214844e+02, 3.110639953613281e+02, 3.136076965332031e+02, 3.026360168457031e+02, 2.946188354492188e+02, 2.922238159179688e+02, 2.913804931640625e+02, 2.90931640625e+02, 2.907938842773438e+02, 2.909105834960938e+02, 2.91135986328125e+02, 2.913270874023438e+02, 2.91348388671875e+02, 2.911874084472656e+02, 2.909319763183594e+02, 2.907542419433594e+02, 2.906641540527344e+02, 2.914842224121094e+02, 2.93457275390625e+02, 2.933993530273438e+02, 2.929844665527344e+02, 2.929190979003906e+02, 2.929304504394531e+02, 2.929439392089844e+02, 2.929528503417969e+02, 2.929566650390625e+02, 2.929550170898438e+02, 2.929490051269531e+02, 2.929388427734375e+02, 2.929237976074219e+02, 2.929024047851562e+02, 2.928718872070312e+02, 2.928236694335938e+02, 2.927327575683594e+02, 2.924703369140625e+02, 2.914582214355469e+02, 2.872589721679688e+02, 2.839529113769531e+02, 2.831886596679688e+02, 2.831152954101562e+02, 2.83119873046875e+02, 2.831290283203125e+02, 2.831311950683594e+02, 2.831236877441406e+02, 2.831111145019531e+02, 2.830959167480469e+02, 2.830787963867188e+02, 2.830596618652344e+02, 2.830363159179688e+02, 2.830045471191406e+02, 2.829530029296875e+02]
+solCol.vol[3].T=[2.931499938964844e+02, 2.926117248535156e+02, 2.921240844726562e+02, 2.919180908203125e+02, 2.920337829589844e+02, 2.92177978515625e+02, 2.922649230957031e+02, 2.923143005371094e+02, 2.923409118652344e+02, 2.923507080078125e+02, 2.923436889648438e+02, 2.923184814453125e+02, 2.922745056152344e+02, 2.922093811035156e+02, 2.921156005859375e+02, 2.919764404296875e+02, 2.917565002441406e+02, 2.912848510742188e+02, 2.880404357910156e+02, 2.840036010742188e+02, 2.830450439453125e+02, 2.829705505371094e+02, 2.829756164550781e+02, 2.829833679199219e+02, 2.829902648925781e+02, 2.829959106445312e+02, 2.830015869140625e+02, 2.830101928710938e+02, 2.830192260742188e+02, 2.830245666503906e+02, 2.830197448730469e+02, 2.830118408203125e+02, 2.830368957519531e+02, 2.832062377929688e+02, 2.837138366699219e+02, 2.85007568359375e+02, 2.8951318359375e+02, 2.947870483398438e+02, 2.970197143554688e+02, 2.979114074707031e+02, 2.985719604492188e+02, 2.991910400390625e+02, 2.997950134277344e+02, 3.003919067382812e+02, 3.009742431640625e+02, 3.0150439453125e+02, 3.019476928710938e+02, 3.024582214355469e+02, 3.032997436523438e+02, 3.048447875976562e+02, 3.077300109863281e+02, 3.093959045410156e+02, 2.964891052246094e+02, 2.895598754882812e+02, 2.879945068359375e+02, 2.874705200195312e+02, 2.871733703613281e+02, 2.869989624023438e+02, 2.869838256835938e+02, 2.870763854980469e+02, 2.872043762207031e+02, 2.872965087890625e+02, 2.872835388183594e+02, 2.871820068359375e+02, 2.870485229492188e+02, 2.869941711425781e+02, 2.869837341308594e+02, 2.87879150390625e+02, 2.903685302734375e+02, 2.923815002441406e+02, 2.927206420898438e+02, 2.925292053222656e+02, 2.925116882324219e+02, 2.925477600097656e+02, 2.925772705078125e+02, 2.925926208496094e+02, 2.925927429199219e+02, 2.925796813964844e+02, 2.925551147460938e+02, 2.925182495117188e+02, 2.924663696289062e+02, 2.923948364257812e+02, 2.922901000976562e+02, 2.921172180175781e+02, 2.914001159667969e+02, 2.868079833984375e+02, 2.836907958984375e+02, 2.831603088378906e+02, 2.831169738769531e+02, 2.831188049316406e+02, 2.831275024414062e+02, 2.83134521484375e+02, 2.831336975097656e+02, 2.831251220703125e+02, 2.83113525390625e+02, 2.830999145507812e+02, 2.830846252441406e+02, 2.830670471191406e+02, 2.830440979003906e+02, 2.830093688964844e+02, 2.829390563964844e+02]
+solCol.vol[9].T=[2.931499938964844e+02, 2.928876647949219e+02, 2.929375915527344e+02, 2.9298193359375e+02, 2.930046691894531e+02, 2.930177612304688e+02, 2.930257873535156e+02, 2.930304870605469e+02, 2.930327453613281e+02, 2.9303271484375e+02, 2.930299072265625e+02, 2.93024169921875e+02, 2.9301513671875e+02, 2.930018005371094e+02, 2.929810485839844e+02, 2.929456176757812e+02, 2.928704833984375e+02, 2.924585876464844e+02, 2.914916076660156e+02, 2.901234741210938e+02, 2.868126831054688e+02, 2.837132263183594e+02, 2.827647399902344e+02, 2.8265869140625e+02, 2.826712646484375e+02, 2.826896057128906e+02, 2.827062072753906e+02, 2.827268676757812e+02, 2.827517395019531e+02, 2.827729187011719e+02, 2.827774963378906e+02, 2.827660827636719e+02, 2.827867431640625e+02, 2.829751281738281e+02, 2.885588378906251e+02, 2.929563293457031e+02, 2.935959777832031e+02, 2.937284240722656e+02, 2.938262329101562e+02, 2.939176635742188e+02, 2.940063781738281e+02, 2.940932006835938e+02, 2.941811828613281e+02, 2.942693481445312e+02, 2.943557739257812e+02, 2.944300231933594e+02, 2.944976196289062e+02, 2.946092834472656e+02, 2.948383178710938e+02, 2.95340087890625e+02, 2.969783020019531e+02, 3.049269104003906e+02, 3.132198486328125e+02, 3.1391064453125e+02, 3.044212951660156e+02, 2.978652954101562e+02, 2.956270751953125e+02, 2.947490844726562e+02, 2.944107971191406e+02, 2.944726257324219e+02, 2.9475830078125e+02, 2.950603637695312e+02, 2.95177001953125e+02, 2.950383911132812e+02, 2.947236633300781e+02, 2.944347229003906e+02, 2.942166748046875e+02, 2.942530517578125e+02, 2.933751220703125e+02, 2.930643005371094e+02, 2.93046875e+02, 2.930529174804688e+02, 2.930598449707031e+02, 2.930648803710938e+02, 2.930679321289062e+02, 2.930687866210938e+02, 2.930674133300781e+02, 2.930643005371094e+02, 2.930592956542969e+02, 2.930519714355469e+02, 2.930413513183594e+02, 2.93025390625e+02, 2.929967956542969e+02, 2.929252624511719e+02, 2.924716796875e+02, 2.917693481445312e+02, 2.900881652832031e+02, 2.8625537109375e+02, 2.837202453613281e+02, 2.831245727539062e+02, 2.830740356445312e+02, 2.830918579101562e+02, 2.831022033691406e+02, 2.830909423828125e+02, 2.830643615722656e+02, 2.830298461914062e+02, 2.8299072265625e+02, 2.829476318359375e+02, 2.828977661132812e+02, 2.828350524902344e+02, 2.827454833984375e+02]
+solCol.vol[6].T=[2.931499938964844e+02, 2.926208190917969e+02, 2.923444213867188e+02, 2.924260559082031e+02, 2.925431213378906e+02, 2.926111145019531e+02, 2.926501770019531e+02, 2.926730651855469e+02, 2.926849365234375e+02, 2.92687744140625e+02, 2.926803588867188e+02, 2.926618957519531e+02, 2.926317749023438e+02, 2.925874938964844e+02, 2.925220336914062e+02, 2.924194946289062e+02, 2.922410888671875e+02, 2.917875061035156e+02, 2.908242797851562e+02, 2.877066650390625e+02, 2.8405859375e+02, 2.829292297363281e+02, 2.828089294433594e+02, 2.828167114257812e+02, 2.828306579589844e+02, 2.828425903320312e+02, 2.82853515625e+02, 2.828687438964844e+02, 2.828864135742188e+02, 2.828994445800781e+02, 2.82897705078125e+02, 2.828847045898438e+02, 2.829078369140625e+02, 2.830952453613281e+02, 2.836729431152344e+02, 2.876722717285156e+02, 2.931966857910156e+02, 2.9509716796875e+02, 2.956619567871094e+02, 2.960509643554688e+02, 2.964110412597656e+02, 2.967610778808594e+02, 2.971084899902344e+02, 2.974549255371094e+02, 2.977940063476562e+02, 2.980963134765625e+02, 2.983504028320312e+02, 2.98697265625e+02, 2.993348083496094e+02, 3.005917358398438e+02, 3.03253173828125e+02, 3.0996533203125e+02, 3.120767211914062e+02, 3.017396850585938e+02, 2.943179321289062e+02, 2.920851745605469e+02, 2.912790832519531e+02, 2.908458251953125e+02, 2.907162780761719e+02, 2.908363342285156e+02, 2.910673828125e+02, 2.912695922851562e+02, 2.913052062988281e+02, 2.911574401855469e+02, 2.909111328125e+02, 2.90737060546875e+02, 2.906406860351562e+02, 2.914068603515625e+02, 2.9322509765625e+02, 2.931673583984375e+02, 2.928073120117188e+02, 2.927625732421875e+02, 2.927857360839844e+02, 2.928080749511719e+02, 2.928227233886719e+02, 2.928289489746094e+02, 2.928262329101562e+02, 2.928162841796875e+02, 2.927994995117188e+02, 2.927746887207031e+02, 2.927395324707031e+02, 2.926895446777344e+02, 2.926107177734375e+02, 2.924627990722656e+02, 2.920414123535156e+02, 2.9087255859375e+02, 2.868788146972656e+02, 2.83847900390625e+02, 2.831548767089844e+02, 2.83089599609375e+02, 2.831001892089844e+02, 2.831153564453125e+02, 2.83118896484375e+02, 2.831063842773438e+02, 2.830855712890625e+02, 2.830604248046875e+02, 2.830322265625e+02, 2.830007629394531e+02, 2.829625244140625e+02, 2.829107666015625e+02, 2.828274536132812e+02]
 time=[0e+00, 8.64e+04]
 solCol.m_flow=[0e+00, -6.346957385540009e-02, -8.896103501319885e-02, -1.07328400015831e-01, -1.213120967149734e-01, -1.318807005882263e-01, -1.394714266061783e-01, -1.443015187978745e-01, -1.464783847332001e-01, -1.460438817739487e-01, -1.429899781942368e-01, -1.372557431459427e-01, -1.287041306495667e-01, -1.170621886849403e-01, -1.017688736319542e-01, -8.150675892829895e-02, -5.190815031528473e-02, 3.674087300896655e-02, 7.311921566724777e-02, 9.567417204380035e-02, 1.12411767244339e-01, 1.251863241195679e-01, 1.347280442714691e-01, 1.413812190294266e-01, 1.453187614679337e-01, 1.466231197118759e-01, 1.453187614679337e-01, 1.413812190294266e-01, 1.347280442714691e-01, 1.251863241195679e-01, 1.12411767244339e-01, 9.567417204380035e-02, 7.311921566724777e-02, 3.674087300896645e-02, -5.190815031528488e-02, -8.150675892829885e-02, -1.017688736319542e-01, -1.170621886849403e-01, -1.287041306495667e-01, -1.372557431459427e-01, -1.429899781942368e-01, -1.460438817739487e-01, -1.464783847332001e-01, -1.443015187978745e-01, -1.394714266061783e-01, -1.318807005882263e-01, -1.213120967149734e-01, -1.07328400015831e-01, -8.896103501319885e-02, -6.346957385540009e-02, 0e+00, 6.346957385540009e-02, 8.896103501319885e-02, 1.07328400015831e-01, 1.213120967149734e-01, 1.318807005882264e-01, 1.394714266061783e-01, 1.443015187978744e-01, 1.464783847332001e-01, 1.460438817739487e-01, 1.429899781942368e-01, 1.372557431459427e-01, 1.287041306495667e-01, 1.170621886849403e-01, 1.017688736319542e-01, 8.150675892829895e-02, 5.190815031528473e-02, -3.674087300896645e-02, -7.311921566724799e-02, -9.567417204380019e-02, -1.124117672443389e-01, -1.251863241195679e-01, -1.347280442714691e-01, -1.413812190294266e-01, -1.453187614679337e-01, -1.466231197118759e-01, -1.453187614679337e-01, -1.413812190294266e-01, -1.347280442714691e-01, -1.251863241195679e-01, -1.12411767244339e-01, -9.567417204380035e-02, -7.311921566724777e-02, -3.674087300896645e-02, 5.190815031528473e-02, 8.150675892829895e-02, 1.017688736319542e-01, 1.170621886849403e-01, 1.287041306495667e-01, 1.372557431459427e-01, 1.429899781942368e-01, 1.460438817739487e-01, 1.464783847332001e-01, 1.443015187978745e-01, 1.394714266061783e-01, 1.318807005882263e-01, 1.213120967149734e-01, 1.07328400015831e-01, 8.896103501319885e-02, 6.346957385540009e-02, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateShaCoeTrue.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateShaCoeTrue.txt
index 5d906b35bff..d9cf40bbcdd 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateShaCoeTrue.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateShaCoeTrue.txt
@@ -1,4 +1,4 @@
-last-generated=2017-05-31
+last-generated=2017-11-21
 statistics-initialization=
 {
   "numerical Jacobians": "0", 
@@ -11,8 +11,8 @@ statistics-simulation=
   "number of continuous time states": "11", 
   "linear": " "
 }
-solCol.vol[3].T=[2.931499938964844e+02, 2.830756225585938e+02, 2.83072998046875e+02, 2.83072998046875e+02, 2.83072998046875e+02, 2.83072998046875e+02, 2.83072998046875e+02, 2.83072998046875e+02, 2.830729675292969e+02, 2.830725708007812e+02, 2.830700988769531e+02, 2.830661315917969e+02, 2.830617980957031e+02, 2.830580139160156e+02, 2.830542907714844e+02, 2.830503845214844e+02, 2.830462646484375e+02, 2.83041748046875e+02, 2.830325927734375e+02, 2.83019287109375e+02, 2.830057983398438e+02, 2.829959411621094e+02, 2.829912719726562e+02, 2.829902038574219e+02, 2.829918518066406e+02, 2.829953308105469e+02, 2.830025024414062e+02, 2.830152282714844e+02, 2.830295715332031e+02, 2.830526123046875e+02, 2.830746765136719e+02, 2.831242980957031e+02, 2.83279296875e+02, 2.837328491210938e+02, 2.844742126464844e+02, 2.853540649414062e+02, 2.861943054199219e+02, 2.869586486816406e+02, 2.87719482421875e+02, 2.884495239257812e+02, 2.891732177734375e+02, 2.896076049804688e+02, 2.899324645996094e+02, 2.901371765136719e+02, 2.902030944824219e+02, 2.901411437988281e+02, 2.89809326171875e+02, 2.89627197265625e+02, 2.894447021484375e+02, 2.892628479003906e+02, 2.890664367675781e+02, 2.888575744628906e+02, 2.886387634277344e+02, 2.884125366210938e+02, 2.881793823242188e+02, 2.879377746582031e+02, 2.876864929199219e+02, 2.874266662597656e+02, 2.87147705078125e+02, 2.86830322265625e+02, 2.864859619140625e+02, 2.861329345703125e+02, 2.857794189453125e+02, 2.854166870117188e+02, 2.850274658203125e+02, 2.847428283691406e+02, 2.842674560546875e+02, 2.836770629882812e+02, 2.833381652832031e+02, 2.832136535644531e+02, 2.831912536621094e+02, 2.831803283691406e+02, 2.831791687011719e+02, 2.831801452636719e+02, 2.831812744140625e+02, 2.831806030273438e+02, 2.831776428222656e+02, 2.831741027832031e+02, 2.831705627441406e+02, 2.831673889160156e+02, 2.831654968261719e+02, 2.831658325195312e+02, 2.831669006347656e+02, 2.831671447753906e+02, 2.831639709472656e+02, 2.831528625488281e+02, 2.831380615234375e+02, 2.831249389648438e+02, 2.83118896484375e+02, 2.831225891113281e+02, 2.8313037109375e+02, 2.831356506347656e+02, 2.831319885253906e+02, 2.831222839355469e+02, 2.83111083984375e+02, 2.830996704101562e+02, 2.830893859863281e+02, 2.830806274414062e+02, 2.830728149414062e+02, 2.830659790039062e+02, 2.830600891113281e+02]
-solCol.vol[9].T=[2.931499938964844e+02, 2.839635314941406e+02, 2.829257507324219e+02, 2.829252624511719e+02, 2.829252624511719e+02, 2.829252624511719e+02, 2.829252624511719e+02, 2.829252624511719e+02, 2.829252319335938e+02, 2.829245910644531e+02, 2.829188232421875e+02, 2.829080505371094e+02, 2.828954467773438e+02, 2.828839416503906e+02, 2.828732604980469e+02, 2.828619689941406e+02, 2.828500671386719e+02, 2.828373413085938e+02, 2.828145751953125e+02, 2.827778625488281e+02, 2.827379150390625e+02, 2.827059936523438e+02, 2.82689208984375e+02, 2.826838073730469e+02, 2.826869506835938e+02, 2.82696044921875e+02, 2.827135009765625e+02, 2.8274755859375e+02, 2.827889099121094e+02, 2.828484802246094e+02, 2.829137573242188e+02, 2.830323791503906e+02, 2.833803100585938e+02, 2.844870910644531e+02, 2.864801330566406e+02, 2.88969482421875e+02, 2.915229187011719e+02, 2.937483520507812e+02, 2.959770202636719e+02, 2.981328735351562e+02, 3.002233581542969e+02, 3.017252807617188e+02, 3.027442932128906e+02, 3.034260559082031e+02, 3.037145080566406e+02, 3.036123962402344e+02, 3.027103881835938e+02, 3.021768493652344e+02, 3.016399841308594e+02, 3.011137084960938e+02, 3.00550048828125e+02, 2.99948486328125e+02, 2.993161926269531e+02, 2.986605529785156e+02, 2.979850463867188e+02, 2.972859802246094e+02, 2.965592346191406e+02, 2.958061828613281e+02, 2.950100402832031e+02, 2.941096496582031e+02, 2.931199340820312e+02, 2.920929260253906e+02, 2.910592651367188e+02, 2.900359802246094e+02, 2.888279724121094e+02, 2.880021057128906e+02, 2.867685852050781e+02, 2.850303955078125e+02, 2.838819580078125e+02, 2.833805847167969e+02, 2.832838745117188e+02, 2.832431030273438e+02, 2.832353210449219e+02, 2.832371520996094e+02, 2.832406921386719e+02, 2.832402954101562e+02, 2.832328186035156e+02, 2.832227783203125e+02, 2.832123413085938e+02, 2.832027282714844e+02, 2.83196044921875e+02, 2.831956787109375e+02, 2.831986083984375e+02, 2.832001953125e+02, 2.831941833496094e+02, 2.831669006347656e+02, 2.83125244140625e+02, 2.830848388671875e+02, 2.830614624023438e+02, 2.830662536621094e+02, 2.8308740234375e+02, 2.831056823730469e+02, 2.831019287109375e+02, 2.830760498046875e+02, 2.830440979003906e+02, 2.830106811523438e+02, 2.829797058105469e+02, 2.829532775878906e+02, 2.829298400878906e+02, 2.829092102050781e+02, 2.828913879394531e+02]
-solCol.vol[6].T=[2.931499938964844e+02, 2.831172790527344e+02, 2.829981079101562e+02, 2.829980773925781e+02, 2.829980773925781e+02, 2.829980773925781e+02, 2.829980773925781e+02, 2.829980773925781e+02, 2.829980773925781e+02, 2.829974975585938e+02, 2.829931030273438e+02, 2.829855346679688e+02, 2.829769592285156e+02, 2.829693603515625e+02, 2.829620971679688e+02, 2.829544067382812e+02, 2.829463195800781e+02, 2.829376220703125e+02, 2.829209594726562e+02, 2.828953857421875e+02, 2.828684692382812e+02, 2.82847900390625e+02, 2.82837646484375e+02, 2.828347778320312e+02, 2.828374938964844e+02, 2.828440246582031e+02, 2.828568725585938e+02, 2.828810119628906e+02, 2.829091796875e+02, 2.829522094726562e+02, 2.829956359863281e+02, 2.830838623046875e+02, 2.833498840332031e+02, 2.841703186035156e+02, 2.85577392578125e+02, 2.872852478027344e+02, 2.889830627441406e+02, 2.904871215820312e+02, 2.919912414550781e+02, 2.934403991699219e+02, 2.948629455566406e+02, 2.957978820800781e+02, 2.964629821777344e+02, 2.968957824707031e+02, 2.970586242675781e+02, 2.969624328613281e+02, 2.963249816894531e+02, 2.959687805175781e+02, 2.9560693359375e+02, 2.952502746582031e+02, 2.948660278320312e+02, 2.944566955566406e+02, 2.940271911621094e+02, 2.935824584960938e+02, 2.931242370605469e+02, 2.926497497558594e+02, 2.921563110351562e+02, 2.916455383300781e+02, 2.911019287109375e+02, 2.904844970703125e+02, 2.898101501464844e+02, 2.891147766113281e+02, 2.884164428710938e+02, 2.877205505371094e+02, 2.869187316894531e+02, 2.8636376953125e+02, 2.854797058105469e+02, 2.843015441894531e+02, 2.835795288085938e+02, 2.832870483398438e+02, 2.832358093261719e+02, 2.832110900878906e+02, 2.832075500488281e+02, 2.832091674804688e+02, 2.832115173339844e+02, 2.832107849121094e+02, 2.832052612304688e+02, 2.831983947753906e+02, 2.831913452148438e+02, 2.831849670410156e+02, 2.831807861328125e+02, 2.831810302734375e+02, 2.8318310546875e+02, 2.831838989257812e+02, 2.831788940429688e+02, 2.831586608886719e+02, 2.831298828125e+02, 2.831031799316406e+02, 2.830892028808594e+02, 2.830945434570312e+02, 2.831094970703125e+02, 2.831210021972656e+02, 2.831162109375e+02, 2.830977478027344e+02, 2.830758361816406e+02, 2.830532836914062e+02, 2.830326538085938e+02, 2.830150756835938e+02, 2.829994506835938e+02, 2.829857482910156e+02, 2.829739074707031e+02]
+solCol.vol[3].T=[2.931499938964844e+02, 2.829859313964844e+02, 2.82983642578125e+02, 2.82983642578125e+02, 2.82983642578125e+02, 2.82983642578125e+02, 2.82983642578125e+02, 2.82983642578125e+02, 2.82983642578125e+02, 2.829827575683594e+02, 2.829773559570312e+02, 2.829688110351562e+02, 2.829594116210938e+02, 2.829512634277344e+02, 2.829432678222656e+02, 2.829347839355469e+02, 2.829258728027344e+02, 2.829161376953125e+02, 2.828963012695312e+02, 2.828675842285156e+02, 2.828384094238281e+02, 2.828171691894531e+02, 2.828070678710938e+02, 2.828047790527344e+02, 2.828083801269531e+02, 2.828158874511719e+02, 2.828314208984375e+02, 2.828589477539062e+02, 2.828896179199219e+02, 2.8292529296875e+02, 2.829490966796875e+02, 2.829851989746094e+02, 2.83120849609375e+02, 2.835567626953125e+02, 2.842919006347656e+02, 2.851754760742188e+02, 2.860240478515625e+02, 2.867954711914062e+02, 2.8755322265625e+02, 2.882775268554688e+02, 2.889948120117188e+02, 2.894268493652344e+02, 2.897495727539062e+02, 2.89953369140625e+02, 2.900211791992188e+02, 2.899640808105469e+02, 2.896437377929688e+02, 2.894702453613281e+02, 2.892964172363281e+02, 2.891232299804688e+02, 2.889357604980469e+02, 2.887361145019531e+02, 2.885267639160156e+02, 2.883101501464844e+02, 2.880867614746094e+02, 2.878548889160156e+02, 2.876128845214844e+02, 2.873623352050781e+02, 2.870932312011719e+02, 2.867898254394531e+02, 2.864738159179688e+02, 2.861565856933594e+02, 2.858366088867188e+02, 2.854964294433594e+02, 2.851231079101562e+02, 2.848456420898438e+02, 2.843758239746094e+02, 2.837888488769531e+02, 2.834366455078125e+02, 2.832866821289062e+02, 2.832390441894531e+02, 2.832154846191406e+02, 2.832130126953125e+02, 2.832151489257812e+02, 2.832175903320312e+02, 2.832161254882812e+02, 2.832096862792969e+02, 2.832020874023438e+02, 2.831943664550781e+02, 2.831875305175781e+02, 2.831834716796875e+02, 2.831841735839844e+02, 2.831865234375e+02, 2.831870422363281e+02, 2.831800537109375e+02, 2.831561279296875e+02, 2.831241455078125e+02, 2.830957946777344e+02, 2.830828552246094e+02, 2.830908203125e+02, 2.83107666015625e+02, 2.831190185546875e+02, 2.83111083984375e+02, 2.830901184082031e+02, 2.830658569335938e+02, 2.830412292480469e+02, 2.8301904296875e+02, 2.830000915527344e+02, 2.829832153320312e+02, 2.829684448242188e+02, 2.829557189941406e+02]
+solCol.vol[9].T=[2.931499938964844e+02, 2.835852966308594e+02, 2.826802978515625e+02, 2.826799621582031e+02, 2.826799621582031e+02, 2.826799621582031e+02, 2.826799621582031e+02, 2.826799621582031e+02, 2.826799621582031e+02, 2.826786499023438e+02, 2.826663208007812e+02, 2.826437377929688e+02, 2.826173706054688e+02, 2.825933837890625e+02, 2.825710144042969e+02, 2.8254736328125e+02, 2.825224609375e+02, 2.824959106445312e+02, 2.824478759765625e+02, 2.823709106445312e+02, 2.82287353515625e+02, 2.82220947265625e+02, 2.8218603515625e+02, 2.821749877929688e+02, 2.821817321777344e+02, 2.822008361816406e+02, 2.82237548828125e+02, 2.823091430664062e+02, 2.823952026367188e+02, 2.824921264648438e+02, 2.825689697265625e+02, 2.826547241210938e+02, 2.829419555664062e+02, 2.839679260253906e+02, 2.858775329589844e+02, 2.882954711914062e+02, 2.907854614257812e+02, 2.929632873535156e+02, 2.951186218261719e+02, 2.971889038085938e+02, 2.9919677734375e+02, 3.006330261230469e+02, 3.016115112304688e+02, 3.022650146484375e+02, 3.025446166992188e+02, 3.02455078125e+02, 3.016089782714844e+02, 3.011177368164062e+02, 3.006226806640625e+02, 3.00137451171875e+02, 2.996165466308594e+02, 2.990597534179688e+02, 2.984739685058594e+02, 2.978661804199219e+02, 2.972395324707031e+02, 2.965901489257812e+02, 2.959128112792969e+02, 2.952096557617188e+02, 2.944656677246094e+02, 2.93628173828125e+02, 2.927406311035156e+02, 2.918442687988281e+02, 2.909413452148438e+02, 2.900216064453125e+02, 2.889029235839844e+02, 2.881279907226562e+02, 2.869449768066406e+02, 2.852746276855469e+02, 2.84141845703125e+02, 2.835947570800781e+02, 2.834286804199219e+02, 2.8334423828125e+02, 2.833284301757812e+02, 2.833323364257812e+02, 2.833397521972656e+02, 2.833388061523438e+02, 2.833229675292969e+02, 2.83302001953125e+02, 2.832801513671875e+02, 2.832601318359375e+02, 2.832462158203125e+02, 2.8324560546875e+02, 2.832517395019531e+02, 2.832549438476562e+02, 2.832420959472656e+02, 2.831846008300781e+02, 2.830973205566406e+02, 2.830129699707031e+02, 2.829647216796875e+02, 2.829751586914062e+02, 2.830195617675781e+02, 2.830575561523438e+02, 2.830491027832031e+02, 2.829947509765625e+02, 2.829278259277344e+02, 2.828579711914062e+02, 2.827933044433594e+02, 2.827380065917969e+02, 2.826890869140625e+02, 2.826460266113281e+02, 2.826087646484375e+02]
+solCol.vol[6].T=[2.931499938964844e+02, 2.82930908203125e+02, 2.828271484375e+02, 2.828271484375e+02, 2.828271484375e+02, 2.828271484375e+02, 2.828271484375e+02, 2.828271484375e+02, 2.828271484375e+02, 2.82825927734375e+02, 2.828164367675781e+02, 2.828003540039062e+02, 2.827821655273438e+02, 2.827659912109375e+02, 2.827505798339844e+02, 2.827342529296875e+02, 2.82717041015625e+02, 2.826985778808594e+02, 2.826629638671875e+02, 2.826085205078125e+02, 2.825513916015625e+02, 2.825078125e+02, 2.82486083984375e+02, 2.824801025390625e+02, 2.824859008789062e+02, 2.824997863769531e+02, 2.825272521972656e+02, 2.825786437988281e+02, 2.826380920410156e+02, 2.827062683105469e+02, 2.827555847167969e+02, 2.828191528320312e+02, 2.83044921875e+02, 2.838187866210938e+02, 2.85189697265625e+02, 2.868761596679688e+02, 2.885606384277344e+02, 2.900556030273438e+02, 2.915315551757812e+02, 2.9294580078125e+02, 2.943338317871094e+02, 2.952453918457031e+02, 2.9589501953125e+02, 2.963177490234375e+02, 2.964801025390625e+02, 2.963935241699219e+02, 2.957874755859375e+02, 2.954537048339844e+02, 2.951146545410156e+02, 2.947804565429688e+02, 2.944196472167969e+02, 2.940347290039062e+02, 2.936304016113281e+02, 2.932114562988281e+02, 2.92779541015625e+02, 2.923316040039062e+02, 2.918641662597656e+02, 2.913795471191406e+02, 2.908634643554688e+02, 2.902811889648438e+02, 2.896696166992188e+02, 2.890540161132812e+02, 2.884332580566406e+02, 2.877947692871094e+02, 2.870390930175781e+02, 2.865081481933594e+02, 2.856477661132812e+02, 2.844969482421875e+02, 2.837662353515625e+02, 2.834321899414062e+02, 2.833319091796875e+02, 2.832796936035156e+02, 2.832723083496094e+02, 2.832758178710938e+02, 2.8328076171875e+02, 2.832791137695312e+02, 2.83267333984375e+02, 2.832527465820312e+02, 2.832377624511719e+02, 2.832242126464844e+02, 2.832154235839844e+02, 2.832159423828125e+02, 2.832203979492188e+02, 2.832220458984375e+02, 2.832111511230469e+02, 2.831680908203125e+02, 2.831068725585938e+02, 2.830502014160156e+02, 2.830208435058594e+02, 2.830322570800781e+02, 2.830640869140625e+02, 2.830884094238281e+02, 2.830779724121094e+02, 2.830386962890625e+02, 2.829921264648438e+02, 2.829441833496094e+02, 2.829004211425781e+02, 2.828630676269531e+02, 2.828298950195312e+02, 2.828007507324219e+02, 2.827756042480469e+02]
 time=[0e+00, 8.64e+04]
 shaCoe.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, 2.149382047355175e-02, 5.720663070678711e-02, 9.291943907737732e-02, 1.286322474479675e-01, 1.643450558185577e-01, 2.000578641891479e-01, 2.357706725597382e-01, 2.714834809303284e-01, 3.071962893009186e-01, 3.429090976715088e-01, 3.78621906042099e-01, 4.143347144126892e-01, 4.500475227832794e-01, 4.857603311538696e-01, 5.214731693267822e-01, 5.571859478950504e-01, 5.92898786067963e-01, 6.286115646362301e-01, 6.643244028091431e-01, 7.000371813774109e-01, 7.357500195503235e-01, 7.714627981185913e-01, 8.071756362915039e-01, 8.428884148597717e-01, 8.786012530326843e-01, 9.143140316009521e-01, 9.500268697738647e-01, 9.857396483421326e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateTotalArea.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateTotalArea.txt
index a30ee8f36c4..f3f5401e5e7 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateTotalArea.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateTotalArea.txt
@@ -1,4 +1,4 @@
-last-generated=2017-05-31
+last-generated=2017-11-21
 statistics-initialization=
 {
   "numerical Jacobians": "0", 
@@ -11,13 +11,13 @@ statistics-simulation=
   "number of continuous time states": "40", 
   "linear": " "
 }
-solCol.vol[6].T=[2.931499938964844e+02, 2.906071166992188e+02, 2.848051452636719e+02, 2.831600036621094e+02, 2.82977783203125e+02, 2.829651489257812e+02, 2.829644775390625e+02, 2.829644470214844e+02, 2.829644470214844e+02, 2.829642028808594e+02, 2.829613037109375e+02, 2.82954345703125e+02, 2.829447631835938e+02, 2.829349365234375e+02, 2.829258422851562e+02, 2.829166870117188e+02, 2.829070739746094e+02, 2.828969116210938e+02, 2.828819885253906e+02, 2.828568115234375e+02, 2.828254089355469e+02, 2.827962341308594e+02, 2.827767639160156e+02, 2.827676696777344e+02, 2.827667846679688e+02, 2.827718505859375e+02, 2.827827758789062e+02, 2.828047790527344e+02, 2.82835693359375e+02, 2.828666381835938e+02, 2.828861083984375e+02, 2.829451904296875e+02, 2.832463684082031e+02, 2.840508422851562e+02, 2.85637451171875e+02, 2.880541687011719e+02, 2.909857788085938e+02, 2.939405517578125e+02, 2.969703674316406e+02, 3.000620422363281e+02, 3.032228393554688e+02, 3.064110107421875e+02, 3.092743530273438e+02, 3.118019409179688e+02, 3.139090270996094e+02, 3.15481201171875e+02, 3.160828552246094e+02, 3.164409790039062e+02, 3.167744445800781e+02, 3.171659240722656e+02, 3.175638732910156e+02, 3.179044494628906e+02, 3.181755676269531e+02, 3.1837939453125e+02, 3.185158081054688e+02, 3.185730895996094e+02, 3.185316467285156e+02, 3.184056091308594e+02, 3.184164733886719e+02, 3.18550048828125e+02, 3.1848779296875e+02, 3.178555297851562e+02, 3.162667846679688e+02, 3.136407470703125e+02, 3.099588012695312e+02, 3.061302490234375e+02, 3.013534851074219e+02, 2.947991333007812e+02, 2.885810852050781e+02, 2.847456970214844e+02, 2.834960021972656e+02, 2.832623901367188e+02, 2.832261352539062e+02, 2.832217712402344e+02, 2.832236328125e+02, 2.832246704101562e+02, 2.832210693359375e+02, 2.832139282226562e+02, 2.8320556640625e+02, 2.831973571777344e+02, 2.831907043457031e+02, 2.831880798339844e+02, 2.831891479492188e+02, 2.831908264160156e+02, 2.831887512207031e+02, 2.831741333007812e+02, 2.831454467773438e+02, 2.831120910644531e+02, 2.830865478515625e+02, 2.830799255371094e+02, 2.830906982421875e+02, 2.831063232421875e+02, 2.831113586425781e+02, 2.830982666015625e+02, 2.83074951171875e+02, 2.830481567382812e+02, 2.830217590332031e+02, 2.829982604980469e+02, 2.829776611328125e+02, 2.829595031738281e+02, 2.829436645507812e+02]
-solCol1.vol[18].T=[2.931499938964844e+02, 2.920004577636719e+02, 2.838325805664062e+02, 2.829564514160156e+02, 2.829526977539062e+02, 2.829526977539062e+02, 2.829526977539062e+02, 2.829526977539062e+02, 2.829526977539062e+02, 2.829524230957031e+02, 2.829492492675781e+02, 2.829414978027344e+02, 2.829309997558594e+02, 2.829204711914062e+02, 2.82910888671875e+02, 2.829011535644531e+02, 2.828909301757812e+02, 2.828800659179688e+02, 2.828640747070312e+02, 2.828364868164062e+02, 2.828022766113281e+02, 2.827711486816406e+02, 2.827510986328125e+02, 2.827424011230469e+02, 2.827422180175781e+02, 2.827481689453125e+02, 2.827601928710938e+02, 2.827843322753906e+02, 2.828182067871094e+02, 2.828514709472656e+02, 2.828716125488281e+02, 2.829291076660156e+02, 2.8324072265625e+02, 2.840766906738281e+02, 2.857170104980469e+02, 2.882112426757812e+02, 2.912064514160156e+02, 2.941774291992188e+02, 2.972149963378906e+02, 3.003210754394531e+02, 3.0348779296875e+02, 3.066997375488281e+02, 3.095426940917969e+02, 3.120482177734375e+02, 3.1413037109375e+02, 3.156657104492188e+02, 3.162101745605469e+02, 3.165098571777344e+02, 3.168488159179688e+02, 3.172424926757812e+02, 3.176466674804688e+02, 3.17984375e+02, 3.182508850097656e+02, 3.184501953125e+02, 3.185822448730469e+02, 3.186345520019531e+02, 3.185864562988281e+02, 3.184519653320312e+02, 3.184643859863281e+02, 3.186173095703125e+02, 3.185529174804688e+02, 3.178889770507812e+02, 3.162370910644531e+02, 3.135229797363281e+02, 3.097508239746094e+02, 3.058756103515625e+02, 3.01081787109375e+02, 2.943617858886719e+02, 2.880572509765624e+02, 2.843651733398438e+02, 2.833498840332031e+02, 2.832455444335938e+02, 2.832273254394531e+02, 2.832257690429688e+02, 2.832283935546875e+02, 2.832295837402344e+02, 2.832254638671875e+02, 2.832174377441406e+02, 2.832084045410156e+02, 2.831996459960938e+02, 2.831926574707031e+02, 2.831900939941406e+02, 2.83191650390625e+02, 2.83193603515625e+02, 2.831912536621094e+02, 2.831750183105469e+02, 2.831430969238281e+02, 2.831068115234375e+02, 2.830799255371094e+02, 2.8307421875e+02, 2.830874328613281e+02, 2.8310498046875e+02, 2.831099548339844e+02, 2.830944519042969e+02, 2.830683898925781e+02, 2.830394897460938e+02, 2.830113525390625e+02, 2.82986572265625e+02, 2.829649353027344e+02, 2.829458312988281e+02, 2.8292919921875e+02]
-solCol1.vol[9].T=[2.931499938964844e+02, 2.846248474121094e+02, 2.830512390136719e+02, 2.83049560546875e+02, 2.83049560546875e+02, 2.83049560546875e+02, 2.83049560546875e+02, 2.83049560546875e+02, 2.83049560546875e+02, 2.830492858886719e+02, 2.830467834472656e+02, 2.830420227050781e+02, 2.830364074707031e+02, 2.8303125e+02, 2.830264587402344e+02, 2.830214233398438e+02, 2.8301611328125e+02, 2.830104370117188e+02, 2.8300048828125e+02, 2.829842224121094e+02, 2.829663696289062e+02, 2.829519653320312e+02, 2.829442138671875e+02, 2.829416809082031e+02, 2.829429626464844e+02, 2.829469604492188e+02, 2.829545593261719e+02, 2.829696044921875e+02, 2.829878540039062e+02, 2.830037231445312e+02, 2.830102233886719e+02, 2.830610961914062e+02, 2.832892150878906e+02, 2.838341674804688e+02, 2.848483276367188e+02, 2.862586669921875e+02, 2.878249206542969e+02, 2.893240661621094e+02, 2.908955078125e+02, 2.924798889160156e+02, 2.94126953125e+02, 2.957169494628906e+02, 2.970952453613281e+02, 2.983065795898438e+02, 2.992735595703125e+02, 2.999458312988281e+02, 3.00010498046875e+02, 3.002036743164062e+02, 3.003702087402344e+02, 3.005891418457031e+02, 3.007848815917969e+02, 3.009429016113281e+02, 3.010654907226562e+02, 3.011545715332031e+02, 3.012086486816406e+02, 3.012185363769531e+02, 3.011732482910156e+02, 3.010965270996094e+02, 3.011554565429688e+02, 3.012337646484375e+02, 3.011263732910156e+02, 3.006427917480469e+02, 2.995857543945312e+02, 2.980182189941406e+02, 2.95932373046875e+02, 2.93998046875e+02, 2.911992492675781e+02, 2.874851989746094e+02, 2.846301574707031e+02, 2.833424987792969e+02, 2.832109680175781e+02, 2.831920166015625e+02, 2.831881713867188e+02, 2.831889038085938e+02, 2.831904907226562e+02, 2.831903991699219e+02, 2.831871337890625e+02, 2.831826782226562e+02, 2.831780090332031e+02, 2.831737060546875e+02, 2.83170654296875e+02, 2.8317041015625e+02, 2.831716918945312e+02, 2.831724243164062e+02, 2.831698913574219e+02, 2.831580200195312e+02, 2.831395568847656e+02, 2.831213989257812e+02, 2.831106872558594e+02, 2.831123962402344e+02, 2.831217041015625e+02, 2.831300048828125e+02, 2.831287231445312e+02, 2.831173400878906e+02, 2.831031188964844e+02, 2.830881958007812e+02, 2.830743103027344e+02, 2.830624389648438e+02, 2.830519104003906e+02, 2.830426635742188e+02, 2.830346374511719e+02]
+solCol.vol[6].T=[2.931499938964844e+02, 2.892959899902344e+02, 2.838991088867188e+02, 2.826118469238281e+02, 2.8248876953125e+02, 2.824813537597656e+02, 2.824810180664062e+02, 2.824810180664062e+02, 2.824810180664062e+02, 2.824800415039062e+02, 2.82468994140625e+02, 2.824430541992188e+02, 2.824081115722656e+02, 2.823727416992188e+02, 2.823400573730469e+02, 2.823070068359375e+02, 2.822723388671875e+02, 2.82235595703125e+02, 2.821804504394531e+02, 2.820877380371094e+02, 2.819735717773438e+02, 2.818692016601562e+02, 2.81801025390625e+02, 2.817702026367188e+02, 2.817684631347656e+02, 2.817877502441406e+02, 2.818284301757812e+02, 2.819101257324219e+02, 2.820228881835938e+02, 2.821340942382812e+02, 2.822013549804688e+02, 2.822378234863281e+02, 2.824464416503906e+02, 2.831167907714844e+02, 2.845606079101562e+02, 2.868263854980469e+02, 2.895848083496094e+02, 2.923560180664062e+02, 2.951661376953125e+02, 2.979910278320312e+02, 3.008678588867188e+02, 3.037504577636719e+02, 3.063207702636719e+02, 3.085809326171875e+02, 3.104566345214844e+02, 3.118505859375e+02, 3.123620300292969e+02, 3.126995544433594e+02, 3.130215454101562e+02, 3.133990783691406e+02, 3.137785339355469e+02, 3.141045532226562e+02, 3.143684997558594e+02, 3.145726928710938e+02, 3.147168579101562e+02, 3.147894287109375e+02, 3.147708129882812e+02, 3.146763916015625e+02, 3.147151794433594e+02, 3.148641357421875e+02, 3.148669128417969e+02, 3.144010009765625e+02, 3.130862121582031e+02, 3.108193359375e+02, 3.075656127929688e+02, 3.041827697753906e+02, 2.998653869628906e+02, 2.939205322265625e+02, 2.883512573242187e+02, 2.849334106445312e+02, 2.837816162109375e+02, 2.834919128417969e+02, 2.83418212890625e+02, 2.834083862304688e+02, 2.834158630371094e+02, 2.834192504882812e+02, 2.834053344726562e+02, 2.833790893554688e+02, 2.833487548828125e+02, 2.833192138671875e+02, 2.832956237792969e+02, 2.832869873046875e+02, 2.832914123535156e+02, 2.832974853515625e+02, 2.832890930175781e+02, 2.832335205078125e+02, 2.831277160644531e+02, 2.830069580078125e+02, 2.829169921875e+02, 2.828969421386719e+02, 2.82938720703125e+02, 2.829954223632812e+02, 2.830107421875e+02, 2.829602966308594e+02, 2.828746948242188e+02, 2.82777587890625e+02, 2.826826477050781e+02, 2.825985107421875e+02, 2.825247497558594e+02, 2.824597473144531e+02, 2.824031066894531e+02]
+solCol1.vol[18].T=[2.931499938964844e+02, 2.904804992675781e+02, 2.831289367675781e+02, 2.824611206054688e+02, 2.824586181640625e+02, 2.824586181640625e+02, 2.824586181640625e+02, 2.824586181640625e+02, 2.824586181640625e+02, 2.824576416015625e+02, 2.824460144042969e+02, 2.824181823730469e+02, 2.823812255859375e+02, 2.823444213867188e+02, 2.823108825683594e+02, 2.822767944335938e+02, 2.822408447265625e+02, 2.822027893066406e+02, 2.821455688476562e+02, 2.820474853515625e+02, 2.8192724609375e+02, 2.818190307617188e+02, 2.817503356933594e+02, 2.817211608886719e+02, 2.81721435546875e+02, 2.817428894042969e+02, 2.817859802246094e+02, 2.818723754882812e+02, 2.819917297363281e+02, 2.82107666015625e+02, 2.821758422851562e+02, 2.822071228027344e+02, 2.824184265136719e+02, 2.831134338378906e+02, 2.846088562011719e+02, 2.869564514160156e+02, 2.897915649414062e+02, 2.926020202636719e+02, 2.954430847167969e+02, 2.983012084960938e+02, 3.012062683105469e+02, 3.041335144042969e+02, 3.067111206054688e+02, 3.089757385253906e+02, 3.10850830078125e+02, 3.122317199707031e+02, 3.127090454101562e+02, 3.130072937011719e+02, 3.13337158203125e+02, 3.137198486328125e+02, 3.141077575683594e+02, 3.144349975585938e+02, 3.14698486328125e+02, 3.149017639160156e+02, 3.150446166992188e+02, 3.151148071289062e+02, 3.150917663574219e+02, 3.14990478515625e+02, 3.150304565429688e+02, 3.151956176757812e+02, 3.151998901367188e+02, 3.147147521972656e+02, 3.133500671386719e+02, 3.110027770996094e+02, 3.076544494628906e+02, 3.042063293457031e+02, 2.998422241210938e+02, 2.937229309082031e+02, 2.880351257324218e+02, 2.846807556152344e+02, 2.836813049316406e+02, 2.834793395996094e+02, 2.834200134277344e+02, 2.834157104492188e+02, 2.834251403808594e+02, 2.834288330078125e+02, 2.834136047363281e+02, 2.833853149414062e+02, 2.833535461425781e+02, 2.833229675292969e+02, 2.832987670898438e+02, 2.832904663085938e+02, 2.832961730957031e+02, 2.833029479980469e+02, 2.832939453125e+02, 2.832347106933594e+02, 2.831214294433594e+02, 2.829943542480469e+02, 2.829019775390625e+02, 2.828848266601562e+02, 2.829330444335938e+02, 2.829942016601562e+02, 2.830090637207031e+02, 2.829524841308594e+02, 2.828606262207031e+02, 2.827591552734375e+02, 2.826608276367188e+02, 2.825744323730469e+02, 2.824989624023438e+02, 2.82432373046875e+02, 2.823743286132812e+02]
+solCol1.vol[9].T=[2.931499938964844e+02, 2.84158447265625e+02, 2.827811279296875e+02, 2.827798461914062e+02, 2.827798461914062e+02, 2.827798461914062e+02, 2.827798461914062e+02, 2.827798461914062e+02, 2.827798461914062e+02, 2.827789001464844e+02, 2.827695007324219e+02, 2.827519226074219e+02, 2.82731201171875e+02, 2.827122192382812e+02, 2.826946105957031e+02, 2.826759948730469e+02, 2.826564331054688e+02, 2.826355590820312e+02, 2.825984802246094e+02, 2.825384216308594e+02, 2.824725952148438e+02, 2.824197082519531e+02, 2.823915100097656e+02, 2.823822937011719e+02, 2.823872375488281e+02, 2.824020080566406e+02, 2.824303283691406e+02, 2.824859313964844e+02, 2.825533142089844e+02, 2.826116027832031e+02, 2.826347961425781e+02, 2.8265576171875e+02, 2.828249206542969e+02, 2.833090515136719e+02, 2.842860412597656e+02, 2.856810913085938e+02, 2.872392272949219e+02, 2.8873095703125e+02, 2.902640991210938e+02, 2.917916259765625e+02, 2.933785400390625e+02, 2.949006042480469e+02, 2.962180786132812e+02, 2.973716125488281e+02, 2.982925109863281e+02, 2.989352722167969e+02, 2.990046081542969e+02, 2.992010498046875e+02, 2.993725891113281e+02, 2.995937805175781e+02, 2.997922668457031e+02, 2.999552001953125e+02, 3.00084716796875e+02, 3.001826171875e+02, 3.002474060058594e+02, 3.0027001953125e+02, 3.002385559082031e+02, 3.001773376464844e+02, 3.002457885742188e+02, 3.003359375e+02, 3.002844848632812e+02, 2.999041442871094e+02, 2.989814758300781e+02, 2.975513000488281e+02, 2.956062316894531e+02, 2.937869567871094e+02, 2.911223754882812e+02, 2.875888977050781e+02, 2.848531799316406e+02, 2.835732727050781e+02, 2.833727722167969e+02, 2.833043823242188e+02, 2.832906494140625e+02, 2.832934265136719e+02, 2.832992553710938e+02, 2.832987976074219e+02, 2.832866821289062e+02, 2.832702026367188e+02, 2.832530212402344e+02, 2.832371826171875e+02, 2.832260131835938e+02, 2.832252197265625e+02, 2.8322998046875e+02, 2.832326354980469e+02, 2.832230834960938e+02, 2.83178955078125e+02, 2.831106872558594e+02, 2.830439453125e+02, 2.830048828125e+02, 2.830116882324219e+02, 2.83046142578125e+02, 2.830765075683594e+02, 2.830711975097656e+02, 2.830291748046875e+02, 2.829766540527344e+02, 2.829216613769531e+02, 2.828705749511719e+02, 2.828268432617188e+02, 2.827881469726562e+02, 2.827540893554688e+02, 2.82724609375e+02]
 time=[0e+00, 8.64e+04]
-solCol.vol[3].T=[2.931499938964844e+02, 2.854114990234375e+02, 2.831917724609375e+02, 2.830608215332031e+02, 2.830557861328125e+02, 2.830556335449219e+02, 2.830556335449219e+02, 2.830556335449219e+02, 2.830556335449219e+02, 2.830553894042969e+02, 2.8305322265625e+02, 2.830489196777344e+02, 2.830437316894531e+02, 2.830388488769531e+02, 2.830343322753906e+02, 2.830296020507812e+02, 2.830246276855469e+02, 2.830193176269531e+02, 2.830102844238281e+02, 2.829954833984375e+02, 2.829788513183594e+02, 2.82965087890625e+02, 2.829573059082031e+02, 2.829544982910156e+02, 2.829554443359375e+02, 2.82958984375e+02, 2.829658813476562e+02, 2.829794006347656e+02, 2.829963073730469e+02, 2.830113830566406e+02, 2.830181274414062e+02, 2.830662536621094e+02, 2.832821350097656e+02, 2.838014221191406e+02, 2.847746276855469e+02, 2.861478881835938e+02, 2.876944885253906e+02, 2.891932373046875e+02, 2.907539978027344e+02, 2.923322448730469e+02, 2.939725952148438e+02, 2.955599975585938e+02, 2.969499206542969e+02, 2.981712341308594e+02, 2.9915478515625e+02, 2.998487548828125e+02, 2.999645385742188e+02, 3.00145751953125e+02, 3.003136291503906e+02, 3.005271911621094e+02, 3.007239074707031e+02, 3.008841857910156e+02, 3.01009033203125e+02, 3.011003112792969e+02, 3.011567077636719e+02, 3.011697692871094e+02, 3.011287536621094e+02, 3.010554809570312e+02, 3.01102783203125e+02, 3.011782531738281e+02, 3.010840454101562e+02, 3.006290588378906e+02, 2.996192016601562e+02, 2.980944213867188e+02, 2.960578308105469e+02, 2.941153869628906e+02, 2.913910522460938e+02, 2.877665710449219e+02, 2.848551940917969e+02, 2.834486999511719e+02, 2.832207336425781e+02, 2.8319140625e+02, 2.831862182617188e+02, 2.831865234375e+02, 2.831879272460938e+02, 2.831879272460938e+02, 2.831851196289062e+02, 2.831810302734375e+02, 2.831766662597656e+02, 2.83172607421875e+02, 2.831696472167969e+02, 2.83169189453125e+02, 2.831702880859375e+02, 2.831709899902344e+02, 2.831688537597656e+02, 2.831584167480469e+02, 2.831415710449219e+02, 2.831245422363281e+02, 2.831139221191406e+02, 2.831145935058594e+02, 2.831227111816406e+02, 2.831305541992188e+02, 2.831300659179688e+02, 2.831201782226562e+02, 2.831070251464844e+02, 2.830930786132812e+02, 2.830799560546875e+02, 2.830686340332031e+02, 2.830586547851562e+02, 2.830498657226562e+02, 2.83042236328125e+02]
-solCol.vol[9].T=[2.931499938964844e+02, 2.923916015625e+02, 2.884631652832031e+02, 2.843250122070312e+02, 2.830814514160156e+02, 2.828958435058594e+02, 2.828777770996094e+02, 2.828764343261719e+02, 2.828763427734375e+02, 2.828760681152344e+02, 2.82873046875e+02, 2.828648986816406e+02, 2.82852294921875e+02, 2.828380737304688e+02, 2.828243408203125e+02, 2.828108215332031e+02, 2.82796875e+02, 2.827821655273438e+02, 2.827623901367188e+02, 2.827304077148438e+02, 2.82687744140625e+02, 2.826441040039062e+02, 2.826106872558594e+02, 2.825917053222656e+02, 2.825858459472656e+02, 2.825899658203125e+02, 2.826029357910156e+02, 2.826298217773438e+02, 2.8267041015625e+02, 2.827154235839844e+02, 2.827494812011719e+02, 2.828190002441406e+02, 2.831471557617188e+02, 2.840813293457031e+02, 2.860213317871094e+02, 2.891405639648438e+02, 2.931670532226562e+02, 2.9747705078125e+02, 3.019097595214844e+02, 3.064344177246094e+02, 3.110586853027344e+02, 3.157400817871094e+02, 3.201174926757812e+02, 3.240254211425781e+02, 3.273526916503906e+02, 3.299512329101562e+02, 3.313175354003906e+02, 3.320433044433594e+02, 3.325600280761719e+02, 3.331131896972656e+02, 3.3369189453125e+02, 3.342210083007812e+02, 3.346575012207031e+02, 3.349944458007812e+02, 3.352318420410156e+02, 3.353580017089844e+02, 3.353486328125e+02, 3.352090759277344e+02, 3.351685791015625e+02, 3.352963562011719e+02, 3.352871704101562e+02, 3.346354064941406e+02, 3.327791748046875e+02, 3.294606628417969e+02, 3.245873107910156e+02, 3.190936889648438e+02, 3.124920043945312e+02, 3.037270202636719e+02, 2.945379943847656e+02, 2.877359313964844e+02, 2.845096740722656e+02, 2.835055236816406e+02, 2.832947387695312e+02, 2.832604675292969e+02, 2.832580261230469e+02, 2.832594909667969e+02, 2.832564086914062e+02, 2.832478942871094e+02, 2.832363891601562e+02, 2.832242736816406e+02, 2.832137451171875e+02, 2.832078552246094e+02, 2.832073974609375e+02, 2.832093505859375e+02, 2.832080078125e+02, 2.831925354003906e+02, 2.831577758789062e+02, 2.831117248535156e+02, 2.830707397460938e+02, 2.830515747070312e+02, 2.830579223632812e+02, 2.830774536132812e+02, 2.830895080566406e+02, 2.830794982910156e+02, 2.830511779785156e+02, 2.830139770507812e+02, 2.8297509765625e+02, 2.829390258789062e+02, 2.829070739746094e+02, 2.828789672851562e+02, 2.828543395996094e+02]
-solCol1.vol[27].T=[2.931499938964844e+02, 2.925464782714844e+02, 2.894816284179688e+02, 2.833726196289062e+02, 2.82863525390625e+02, 2.828593444824219e+02, 2.828593139648438e+02, 2.828593139648438e+02, 2.828593139648438e+02, 2.828590393066406e+02, 2.828558044433594e+02, 2.82846923828125e+02, 2.828329772949219e+02, 2.828175659179688e+02, 2.828028869628906e+02, 2.827886352539062e+02, 2.827738037109375e+02, 2.827581787109375e+02, 2.827370910644531e+02, 2.827027282714844e+02, 2.826561584472656e+02, 2.826089172363281e+02, 2.825735168457031e+02, 2.825544738769531e+02, 2.825495300292969e+02, 2.82554931640625e+02, 2.825694580078125e+02, 2.825986328125e+02, 2.826430053710938e+02, 2.826920471191406e+02, 2.827284240722656e+02, 2.827970275878906e+02, 2.831248779296875e+02, 2.840801086425781e+02, 2.860731506347656e+02, 2.892784118652344e+02, 2.934085998535156e+02, 2.977925720214844e+02, 3.022337951660156e+02, 3.067699584960938e+02, 3.114067993164062e+02, 3.16093994140625e+02, 3.204906921386719e+02, 3.24361572265625e+02, 3.2765380859375e+02, 3.302090454101562e+02, 3.315169677734375e+02, 3.32139892578125e+02, 3.326138000488281e+02, 3.331673278808594e+02, 3.337525634765625e+02, 3.342856140136719e+02, 3.34716796875e+02, 3.350468444824219e+02, 3.352775573730469e+02, 3.353971557617188e+02, 3.353799743652344e+02, 3.352302551269531e+02, 3.35178955078125e+02, 3.353188781738281e+02, 3.353309631347656e+02, 3.346665649414062e+02, 3.327560424804688e+02, 3.29337646484375e+02, 3.243451538085938e+02, 3.187256164550781e+02, 3.120966186523438e+02, 3.032554931640625e+02, 2.938403625488281e+02, 2.870199584960938e+02, 2.840416259765625e+02, 2.833511962890625e+02, 2.83274658203125e+02, 2.832626647949219e+02, 2.832641296386719e+02, 2.832665100097656e+02, 2.832632446289062e+02, 2.83253662109375e+02, 2.832409362792969e+02, 2.832279052734375e+02, 2.832167053222656e+02, 2.832106018066406e+02, 2.832105712890625e+02, 2.83213134765625e+02, 2.832118530273438e+02, 2.83195068359375e+02, 2.831567993164062e+02, 2.831060791015625e+02, 2.830617370605469e+02, 2.830421142578125e+02, 2.83051025390625e+02, 2.830740661621094e+02, 2.830877075195312e+02, 2.830760803222656e+02, 2.83043701171875e+02, 2.830027770996094e+02, 2.829609985351562e+02, 2.829226989746094e+02, 2.828890991210938e+02, 2.82859619140625e+02, 2.828337707519531e+02]
+solCol.vol[3].T=[2.931499938964844e+02, 2.848710021972656e+02, 2.828970642089844e+02, 2.827961730957031e+02, 2.827928161621094e+02, 2.82792724609375e+02, 2.82792724609375e+02, 2.82792724609375e+02, 2.82792724609375e+02, 2.827918090820312e+02, 2.827833251953125e+02, 2.827669067382812e+02, 2.827471313476562e+02, 2.827286987304688e+02, 2.827116088867188e+02, 2.826937255859375e+02, 2.826748962402344e+02, 2.826548156738281e+02, 2.826200561523438e+02, 2.825636596679688e+02, 2.825006103515625e+02, 2.824487609863281e+02, 2.824198608398438e+02, 2.8240966796875e+02, 2.824134521484375e+02, 2.824270324707031e+02, 2.824535522460938e+02, 2.825053405761719e+02, 2.825694885253906e+02, 2.826262817382812e+02, 2.826508483886719e+02, 2.826729736328125e+02, 2.828328857421875e+02, 2.832909240722656e+02, 2.842212524414062e+02, 2.85568115234375e+02, 2.870919799804688e+02, 2.885675048828125e+02, 2.900775146484375e+02, 2.915854187011719e+02, 2.931509399414062e+02, 2.946553039550781e+02, 2.95968994140625e+02, 2.971191711425781e+02, 2.980441589355469e+02, 2.986978454589844e+02, 2.988082275390625e+02, 2.989918212890625e+02, 2.991626281738281e+02, 2.993768920898438e+02, 2.995740356445312e+02, 2.997369384765625e+02, 2.998667602539062e+02, 2.999652099609375e+02, 3.000310363769531e+02, 3.000557861328125e+02, 3.000280456542969e+02, 2.999702453613281e+02, 3.000281982421875e+02, 3.001146850585938e+02, 3.000712280273438e+02, 2.997146911621094e+02, 2.988382873535156e+02, 2.974578247070312e+02, 2.955743103027344e+02, 2.937672424316406e+02, 2.911918029785156e+02, 2.877685546875e+02, 2.850164794921875e+02, 2.836561584472656e+02, 2.83380859375e+02, 2.833041687011719e+02, 2.832868041992188e+02, 2.832882995605469e+02, 2.832936706542969e+02, 2.832936096191406e+02, 2.8328271484375e+02, 2.832671203613281e+02, 2.832506103515625e+02, 2.832352294921875e+02, 2.832241821289062e+02, 2.832226867675781e+02, 2.832268676757812e+02, 2.832295532226562e+02, 2.832210388183594e+02, 2.831807861328125e+02, 2.831166076660156e+02, 2.830522155761719e+02, 2.830127258300781e+02, 2.830161743164062e+02, 2.830474853515625e+02, 2.83076904296875e+02, 2.830740966796875e+02, 2.830361022949219e+02, 2.829862060546875e+02, 2.829333190917969e+02, 2.828837585449219e+02, 2.828410339355469e+02, 2.828033447265625e+02, 2.827701721191406e+02, 2.827413940429688e+02]
+solCol.vol[9].T=[2.931499938964844e+02, 2.908348693847656e+02, 2.865489807128906e+02, 2.831826477050781e+02, 2.823287658691406e+02, 2.822189636230469e+02, 2.82209716796875e+02, 2.822091064453125e+02, 2.822090759277344e+02, 2.822081298828125e+02, 2.821965942382812e+02, 2.821666564941406e+02, 2.821218872070312e+02, 2.820728149414062e+02, 2.820257568359375e+02, 2.819792785644531e+02, 2.819311828613281e+02, 2.818804321289062e+02, 2.818102416992188e+02, 2.816958312988281e+02, 2.815459594726562e+02, 2.813964233398438e+02, 2.812855529785156e+02, 2.812252807617188e+02, 2.81209228515625e+02, 2.812264099121094e+02, 2.812739868164062e+02, 2.813714599609375e+02, 2.815153198242188e+02, 2.81670654296875e+02, 2.817828979492188e+02, 2.818487548828125e+02, 2.82075439453125e+02, 2.828251342773438e+02, 2.84523681640625e+02, 2.873394775390625e+02, 2.9097998046875e+02, 2.948447265625e+02, 2.987814331054688e+02, 3.027461242675781e+02, 3.067698669433594e+02, 3.108167419433594e+02, 3.145593872070312e+02, 3.178788146972656e+02, 3.206864624023438e+02, 3.228597717285156e+02, 3.239459533691406e+02, 3.245507507324219e+02, 3.250165405273438e+02, 3.255271911621094e+02, 3.260562438964844e+02, 3.265362548828125e+02, 3.269351806640625e+02, 3.272495422363281e+02, 3.274794006347656e+02, 3.276132202148438e+02, 3.276272277832031e+02, 3.275293884277344e+02, 3.275362854003906e+02, 3.276930541992188e+02, 3.277491760253906e+02, 3.272885131835938e+02, 3.258023376464844e+02, 3.23041015625e+02, 3.18901123046875e+02, 3.142571411132812e+02, 3.08556396484375e+02, 3.008959045410156e+02, 2.930125427246093e+02, 2.873231506347657e+02, 2.846798400878906e+02, 2.838037109375e+02, 2.835717163085938e+02, 2.835211486816406e+02, 2.835214233398438e+02, 2.835268859863281e+02, 2.835144653320312e+02, 2.834834594726562e+02, 2.834430847167969e+02, 2.834014282226562e+02, 2.833658447265625e+02, 2.83347412109375e+02, 2.833475646972656e+02, 2.83354736328125e+02, 2.833486328125e+02, 2.832899169921875e+02, 2.831638793945312e+02, 2.830027465820312e+02, 2.8286474609375e+02, 2.828070068359375e+02, 2.828371887207031e+02, 2.829075927734375e+02, 2.829448547363281e+02, 2.829024658203125e+02, 2.827997436523438e+02, 2.826695861816406e+02, 2.825357666015625e+02, 2.824130249023438e+02, 2.823045349121094e+02, 2.822090759277344e+02, 2.821256103515625e+02]
+solCol1.vol[27].T=[2.931499938964844e+02, 2.90953125e+02, 2.872694396972656e+02, 2.825200805664062e+02, 2.821822814941406e+02, 2.821799011230469e+02, 2.821798706054688e+02, 2.821798706054688e+02, 2.821798706054688e+02, 2.821788940429688e+02, 2.821670532226562e+02, 2.821356506347656e+02, 2.820882568359375e+02, 2.820367431640625e+02, 2.819880981445312e+02, 2.819404602050781e+02, 2.81890869140625e+02, 2.818384094238281e+02, 2.817660522460938e+02, 2.816473693847656e+02, 2.8148974609375e+02, 2.813332214355469e+02, 2.81218994140625e+02, 2.81159423828125e+02, 2.811459655761719e+02, 2.811660766601562e+02, 2.812168273925781e+02, 2.813185424804688e+02, 2.814699096679688e+02, 2.816331787109375e+02, 2.817496337890625e+02, 2.818133544921875e+02, 2.820331115722656e+02, 2.827918701171875e+02, 2.845306091308594e+02, 2.874229125976562e+02, 2.911640319824219e+02, 2.951130065917969e+02, 2.99086181640625e+02, 3.030871887207031e+02, 3.071459045410156e+02, 3.112254638671875e+02, 3.150117492675781e+02, 3.183323059082031e+02, 3.21140380859375e+02, 3.233050537109375e+02, 3.243683776855469e+02, 3.249110412597656e+02, 3.253555603027344e+02, 3.258707580566406e+02, 3.264087524414062e+02, 3.26895751953125e+02, 3.272950439453125e+02, 3.276082458496094e+02, 3.278365173339844e+02, 3.279682006835938e+02, 3.279784240722656e+02, 3.278741455078125e+02, 3.278730773925781e+02, 3.280391235351562e+02, 3.281123962402344e+02, 3.276488037109375e+02, 3.261307678222656e+02, 3.232959899902344e+02, 3.190559387207031e+02, 3.142924194335938e+02, 3.08539306640625e+02, 3.007816467285156e+02, 2.926824340820312e+02, 2.869212951660157e+02, 2.843987426757812e+02, 2.837102355957031e+02, 2.835588073730469e+02, 2.835254211425781e+02, 2.835317687988281e+02, 2.835391845703125e+02, 2.835263671875e+02, 2.834931030273438e+02, 2.834502868652344e+02, 2.834069213867188e+02, 2.833701782226562e+02, 2.833514404296875e+02, 2.833526916503906e+02, 2.83361328125e+02, 2.8335546875e+02, 2.8329443359375e+02, 2.83161376953125e+02, 2.829906921386719e+02, 2.828462524414062e+02, 2.827880859375e+02, 2.828243408203125e+02, 2.829026184082031e+02, 2.829434509277344e+02, 2.828975524902344e+02, 2.827860107421875e+02, 2.826484375e+02, 2.825093078613281e+02, 2.823826904296875e+02, 2.822716064453125e+02, 2.821740417480469e+02, 2.820886840820312e+02]
 solCol1.m_flow=[3.885820135474205e-02, 3.885820135474205e-02]
 solCol.m_flow_nominal=[3.885820135474205e-02, 3.885820135474205e-02]
 solCol.m_flow=[3.885820135474205e-02, 3.885820135474205e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt
index 22d7d89c648..5e9d3b4a3e6 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt
@@ -1,4 +1,4 @@
-last-generated=2017-05-31
+last-generated=2017-11-21
 statistics-initialization=
 {
   "numerical Jacobians": "0", 
@@ -11,8 +11,8 @@ statistics-simulation=
   "number of continuous time states": "27", 
   "linear": " "
 }
-tan.vol[1].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.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931500244140625e+02, 2.9314990234375e+02, 2.931496887207031e+02, 2.931495056152344e+02, 2.931839904785156e+02, 2.933442993164062e+02, 2.936049194335938e+02, 2.939510192871094e+02, 2.9438134765625e+02, 2.948890991210938e+02, 2.954652099609375e+02, 2.960998840332031e+02, 2.96781005859375e+02, 2.974891357421875e+02, 2.982071838378906e+02, 2.989314880371094e+02, 2.996619262695312e+02, 3.00400146484375e+02, 3.011461791992188e+02, 3.018992614746094e+02, 3.026583251953125e+02, 3.034222412109375e+02, 3.041896057128906e+02, 3.049587707519531e+02, 3.057278137207031e+02, 3.064976806640625e+02, 3.072731628417969e+02, 3.080552978515625e+02, 3.088372497558594e+02, 3.096021118164062e+02, 3.10325439453125e+02, 3.109789123535156e+02, 3.115462646484375e+02, 3.120165405273438e+02, 3.123551330566406e+02, 3.123912963867188e+02, 3.123807067871094e+02, 3.123699951171875e+02, 3.123592224121094e+02, 3.12348388671875e+02, 3.123374938964844e+02, 3.123265075683594e+02, 3.123154602050781e+02, 3.123043518066406e+02, 3.122931518554688e+02, 3.122818908691406e+02, 3.122705688476562e+02, 3.122591857910156e+02, 3.122477416992188e+02, 3.122362060546875e+02, 3.12224609375e+02, 3.122129516601562e+02, 3.122012329101562e+02, 3.12189453125e+02, 3.121776123046875e+02, 3.121656799316406e+02, 3.121537170410156e+02, 3.121416931152344e+02, 3.121295776367188e+02, 3.12117431640625e+02, 3.121051940917969e+02, 3.120928955078125e+02, 3.1208056640625e+02, 3.120681457519531e+02, 3.120556945800781e+02, 3.120431823730469e+02, 3.120305786132812e+02, 3.120179443359375e+02]
-solCol.vol[9].T=[2.931499938964844e+02, 2.921874389648438e+02, 2.912972717285156e+02, 2.904740905761719e+02, 2.897127685546875e+02, 2.890086975097656e+02, 2.883576049804688e+02, 2.877554321289062e+02, 2.871985778808594e+02, 2.866831359863281e+02, 2.862017822265625e+02, 2.85746826171875e+02, 2.853143615722656e+02, 2.849034423828125e+02, 2.845134582519531e+02, 2.841422424316406e+02, 2.83787841796875e+02, 2.834483337402344e+02, 2.831146545410156e+02, 2.82772705078125e+02, 2.824189147949219e+02, 2.820605773925781e+02, 2.817119750976562e+02, 2.81383544921875e+02, 2.810820007324219e+02, 2.808111267089844e+02, 2.805756530761719e+02, 2.803883056640625e+02, 2.802532043457031e+02, 2.80162353515625e+02, 2.801167907714844e+02, 2.8019970703125e+02, 2.806553955078125e+02, 2.821843872070312e+02, 2.851214904785156e+02, 2.899308776855469e+02, 2.966729431152344e+02, 3.040882263183594e+02, 3.107695922851562e+02, 3.167716979980469e+02, 3.223611450195312e+02, 3.276720581054688e+02, 3.323696594238281e+02, 3.365062255859375e+02, 3.400143737792969e+02, 3.427810363769531e+02, 3.441552124023438e+02, 3.451956176757812e+02, 3.461269226074219e+02, 3.47160400390625e+02, 3.482429504394531e+02, 3.493056030273438e+02, 3.503222045898438e+02, 3.512837524414062e+02, 3.521850891113281e+02, 3.530118713378906e+02, 3.537421264648438e+02, 3.543974609375e+02, 3.55265625e+02, 3.563462524414062e+02, 3.572941284179688e+02, 3.576310119628906e+02, 3.567915649414062e+02, 3.545617065429688e+02, 3.507164306640625e+02, 3.464266967773438e+02, 3.405967407226562e+02, 3.321702880859375e+02, 3.300457458496094e+02, 3.269440307617188e+02, 3.237823791503906e+02, 3.208167724609375e+02, 3.180643920898438e+02, 3.155201721191406e+02, 3.131706237792969e+02, 3.109980773925781e+02, 3.089825134277344e+02, 3.071091613769531e+02, 3.05366943359375e+02, 3.037466125488281e+02, 3.022414245605469e+02, 3.008482971191406e+02, 2.995626220703125e+02, 2.983753967285156e+02, 2.972730407714844e+02, 2.962304992675781e+02, 2.952280883789062e+02, 2.94262451171875e+02, 2.933452758789062e+02, 2.924987487792969e+02, 2.917347412109375e+02, 2.910463562011719e+02, 2.904091491699219e+02, 2.897969360351562e+02, 2.892012023925781e+02, 2.886189880371094e+02, 2.880511474609375e+02, 2.875008239746094e+02, 2.869696350097656e+02, 2.864588012695312e+02, 2.859693603515625e+02]
-TIn.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.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.811519470214844e+02, 2.8260888671875e+02, 2.854076538085938e+02, 2.899993896484375e+02, 2.954933471679688e+02, 2.999299621582031e+02, 3.036148986816406e+02, 3.067721252441406e+02, 3.096190185546875e+02, 3.122666625976562e+02, 3.145899658203125e+02, 3.166418762207031e+02, 3.184144592285156e+02, 3.198760986328125e+02, 3.207714538574219e+02, 3.215310668945312e+02, 3.222491455078125e+02, 3.230112609863281e+02, 3.237970886230469e+02, 3.24578857421875e+02, 3.253459777832031e+02, 3.260946655273438e+02, 3.268226928710938e+02, 3.275242004394531e+02, 3.28190185546875e+02, 3.28827880859375e+02, 3.295483093261719e+02, 3.30354248046875e+02, 3.311142883300781e+02, 3.316444702148438e+02, 3.317207336425781e+02, 3.31239013671875e+02, 3.300654296875e+02, 3.286239318847656e+02, 3.264276733398438e+02, 3.228660278320312e+02, 3.205836181640625e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02, 3.205836486816406e+02]
+tan.vol[1].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.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.93149658203125e+02, 2.931494140625e+02, 2.931492309570312e+02, 2.932360534667969e+02, 2.934271240234375e+02, 2.936940002441406e+02, 2.940329895019531e+02, 2.944379272460938e+02, 2.9490087890625e+02, 2.954132385253906e+02, 2.959644470214844e+02, 2.965372009277344e+02, 2.971168212890625e+02, 2.977006530761719e+02, 2.982890625e+02, 2.988836059570312e+02, 2.994843444824219e+02, 3.00090576171875e+02, 3.007013854980469e+02, 3.013156433105469e+02, 3.019322204589844e+02, 3.025495910644531e+02, 3.031659851074219e+02, 3.037824096679688e+02, 3.044031677246094e+02, 3.050294189453125e+02, 3.056555480957031e+02, 3.06266845703125e+02, 3.068414916992188e+02, 3.073539123535156e+02, 3.077900085449219e+02, 3.081402282714844e+02, 3.083743591308594e+02, 3.084183044433594e+02, 3.08409912109375e+02, 3.084014587402344e+02, 3.083929443359375e+02, 3.083843383789062e+02, 3.083757019042969e+02, 3.083670043945312e+02, 3.083582763671875e+02, 3.083494567871094e+02, 3.083406066894531e+02, 3.083316955566406e+02, 3.083227233886719e+02, 3.083136901855469e+02, 3.083045959472656e+02, 3.082954711914062e+02, 3.082862854003906e+02, 3.082770690917969e+02, 3.082677612304688e+02, 3.082584228515625e+02, 3.082490539550781e+02, 3.082395935058594e+02, 3.082301025390625e+02, 3.082205505371094e+02, 3.082109680175781e+02, 3.082013244628906e+02, 3.081916198730469e+02, 3.08181884765625e+02, 3.081720886230469e+02, 3.081622619628906e+02, 3.081523742675781e+02, 3.081424255371094e+02, 3.081324462890625e+02, 3.081224365234375e+02]
+solCol.vol[9].T=[2.931499938964844e+02, 2.909994506835938e+02, 2.892102355957031e+02, 2.877216491699219e+02, 2.864831237792969e+02, 2.854526672363281e+02, 2.845953674316406e+02, 2.838821105957031e+02, 2.832886657714844e+02, 2.827940368652344e+02, 2.823716430664062e+02, 2.819984741210938e+02, 2.816617431640625e+02, 2.813570251464844e+02, 2.810812683105469e+02, 2.808283386230469e+02, 2.805930786132812e+02, 2.803710327148438e+02, 2.801419982910156e+02, 2.79876708984375e+02, 2.795720825195312e+02, 2.792493591308594e+02, 2.789425964355469e+02, 2.786740112304688e+02, 2.784556274414062e+02, 2.782919311523438e+02, 2.78189453125e+02, 2.781724548339844e+02, 2.782436828613281e+02, 2.783788452148438e+02, 2.78548095703125e+02, 2.787841796875e+02, 2.793065185546875e+02, 2.807712707519531e+02, 2.83458984375e+02, 2.877584838867188e+02, 2.936190795898438e+02, 3.003251037597656e+02, 3.064369201660156e+02, 3.118125610351562e+02, 3.1677587890625e+02, 3.214699401855469e+02, 3.255930786132812e+02, 3.292036437988281e+02, 3.322420959472656e+02, 3.346045837402344e+02, 3.356740417480469e+02, 3.364847106933594e+02, 3.372201843261719e+02, 3.380656433105469e+02, 3.389580688476562e+02, 3.398298645019531e+02, 3.406568603515625e+02, 3.414313659667969e+02, 3.421489562988281e+02, 3.42796142578125e+02, 3.433508911132812e+02, 3.438353271484375e+02, 3.445265502929688e+02, 3.454161987304688e+02, 3.462028503417969e+02, 3.464475708007812e+02, 3.456038818359375e+02, 3.434540100097656e+02, 3.39782958984375e+02, 3.357163696289062e+02, 3.301760864257812e+02, 3.222041320800781e+02, 3.170888061523437e+02, 3.120320739746094e+02, 3.074723815917969e+02, 3.035860900878906e+02, 3.003315734863281e+02, 2.976266479492188e+02, 2.953836975097656e+02, 2.935180053710938e+02, 2.919512634277344e+02, 2.906270751953125e+02, 2.895034790039062e+02, 2.885482788085938e+02, 2.877386169433594e+02, 2.870629577636719e+02, 2.865066223144531e+02, 2.860476989746094e+02, 2.8565576171875e+02, 2.852774963378906e+02, 2.848772888183594e+02, 2.84458251953125e+02, 2.840560302734375e+02, 2.837255249023438e+02, 2.834929809570312e+02, 2.833399047851562e+02, 2.832106323242188e+02, 2.830517578125e+02, 2.828534545898438e+02, 2.826184997558594e+02, 2.823573913574219e+02, 2.820839538574219e+02, 2.818068237304688e+02, 2.815325012207031e+02, 2.81266357421875e+02]
+TIn.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.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.798575439453125e+02, 2.812545471191406e+02, 2.838162231445312e+02, 2.879219665527344e+02, 2.934434204101562e+02, 2.977407836914062e+02, 3.012612915039062e+02, 3.041965026855469e+02, 3.068153686523438e+02, 3.092378845214844e+02, 3.1134619140625e+02, 3.131949462890625e+02, 3.147763671875e+02, 3.16058837890625e+02, 3.167856750488281e+02, 3.174002685546875e+02, 3.179842224121094e+02, 3.186170043945312e+02, 3.192727661132812e+02, 3.199226989746094e+02, 3.20556396484375e+02, 3.211705017089844e+02, 3.217629089355469e+02, 3.223278503417969e+02, 3.228558044433594e+02, 3.233547058105469e+02, 3.239384765625e+02, 3.246065368652344e+02, 3.252365112304688e+02, 3.256487731933594e+02, 3.2561328125e+02, 3.250200500488281e+02, 3.237332763671875e+02, 3.221903076171875e+02, 3.198782043457031e+02, 3.16184814453125e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02, 3.139351806640625e+02]
 time=[0e+00, 8.64e+04]
 pumCon.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Tubular.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Tubular.txt
index f8a2d90729b..924283737d8 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Tubular.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Examples_Tubular.txt
@@ -1,4 +1,4 @@
-last-generated=2017-05-31
+last-generated=2017-11-21
 statistics-initialization=
 {
   "numerical Jacobians": "0", 
@@ -11,8 +11,8 @@ statistics-simulation=
   "number of continuous time states": "11", 
   "linear": " "
 }
-solCol.vol[3].T=[2.931499938964844e+02, 2.928240661621094e+02, 2.925667419433594e+02, 2.925802001953125e+02, 2.926786804199219e+02, 2.927355651855469e+02, 2.927673034667969e+02, 2.927857971191406e+02, 2.927955627441406e+02, 2.927982788085938e+02, 2.927933349609375e+02, 2.927799682617188e+02, 2.927578430175781e+02, 2.927252502441406e+02, 2.926775512695312e+02, 2.926040649414062e+02, 2.924808044433594e+02, 2.921425476074219e+02, 2.869971313476562e+02, 2.833860778808594e+02, 2.830740051269531e+02, 2.830705261230469e+02, 2.830742797851562e+02, 2.830776672363281e+02, 2.830806274414062e+02, 2.830830383300781e+02, 2.830855712890625e+02, 2.830894775390625e+02, 2.830933837890625e+02, 2.830953979492188e+02, 2.830924377441406e+02, 2.831212158203125e+02, 2.832866821289062e+02, 2.839686279296875e+02, 2.861429443359375e+02, 2.908534240722656e+02, 2.989782409667969e+02, 3.027133483886719e+02, 3.040310363769531e+02, 3.051778564453125e+02, 3.064268188476562e+02, 3.077906494140625e+02, 3.090841979980469e+02, 3.104360656738281e+02, 3.118541870117188e+02, 3.133704833984375e+02, 3.147789611816406e+02, 3.168806762695312e+02, 3.201069946289062e+02, 3.25385498046875e+02, 3.355172729492188e+02, 3.38762939453125e+02, 3.054696044921875e+02, 2.963159790039062e+02, 2.942352600097656e+02, 2.931808166503906e+02, 2.925227355957031e+02, 2.921208190917969e+02, 2.919828491210938e+02, 2.920077514648438e+02, 2.920958251953125e+02, 2.921630249023438e+02, 2.921175842285156e+02, 2.919933471679688e+02, 2.917797546386719e+02, 2.919667663574219e+02, 2.921787414550781e+02, 2.951061706542969e+02, 3.029590454101563e+02, 3.007881774902344e+02, 2.940932617187501e+02, 2.929050903320312e+02, 2.928714599609375e+02, 2.928883972167969e+02, 2.929001770019531e+02, 2.929054870605469e+02, 2.929039916992188e+02, 2.928968200683594e+02, 2.928844909667969e+02, 2.928662109375e+02, 2.9284033203125e+02, 2.928038330078125e+02, 2.927477722167969e+02, 2.926478271484375e+02, 2.916217651367188e+02, 2.85260986328125e+02, 2.832564697265625e+02, 2.831395568847656e+02, 2.831347045898438e+02, 2.831366882324219e+02, 2.831406555175781e+02, 2.831435241699219e+02, 2.831427001953125e+02, 2.831386413574219e+02, 2.831334228515625e+02, 2.831273193359375e+02, 2.831204833984375e+02, 2.831124572753906e+02, 2.831016235351562e+02, 2.830842895507812e+02, 2.830448608398438e+02]
-solCol.vol[9].T=[2.931499938964844e+02, 2.930247192382812e+02, 2.930596923828125e+02, 2.930781860351562e+02, 2.930874328613281e+02, 2.930928955078125e+02, 2.930962524414062e+02, 2.930982360839844e+02, 2.930991516113281e+02, 2.930990600585938e+02, 2.930977783203125e+02, 2.930951843261719e+02, 2.930911254882812e+02, 2.930851135253906e+02, 2.9307568359375e+02, 2.930592041015625e+02, 2.930225830078125e+02, 2.927746887207031e+02, 2.921298217773438e+02, 2.896376342773438e+02, 2.846432495117188e+02, 2.830396728515625e+02, 2.829237060546875e+02, 2.82930908203125e+02, 2.829403686523438e+02, 2.829483032226562e+02, 2.829554138183594e+02, 2.829652404785156e+02, 2.829767456054688e+02, 2.829853515625e+02, 2.829844970703125e+02, 2.830139465332031e+02, 2.832440490722656e+02, 2.841215209960938e+02, 2.910078735351562e+02, 2.942247009277344e+02, 2.94519287109375e+02, 2.946573486328125e+02, 2.948110046386719e+02, 2.949714660644531e+02, 2.95171630859375e+02, 2.953515014648438e+02, 2.955410766601562e+02, 2.957430419921875e+02, 2.959571228027344e+02, 2.961960144042969e+02, 2.964208068847656e+02, 2.968340454101562e+02, 2.975232849121094e+02, 2.989129943847656e+02, 3.04035888671875e+02, 3.335229797363281e+02, 3.59948486328125e+02, 3.439875183105469e+02, 3.216085205078125e+02, 3.146592712402343e+02, 3.118869934082031e+02, 3.102867736816406e+02, 3.095149230957031e+02, 3.093735656738281e+02, 3.095473937988281e+02, 3.09767333984375e+02, 3.097701110839844e+02, 3.095061340332031e+02, 3.089416809082031e+02, 3.088669738769531e+02, 3.091099243164062e+02, 3.055836486816406e+02, 2.944749755859375e+02, 2.931404418945312e+02, 2.931053771972656e+02, 2.931080322265625e+02, 2.931110229492188e+02, 2.931131591796875e+02, 2.931144409179688e+02, 2.9311474609375e+02, 2.931141052246094e+02, 2.931127014160156e+02, 2.931104736328125e+02, 2.93107177734375e+02, 2.931023864746094e+02, 2.930950927734375e+02, 2.930816650390625e+02, 2.930455627441406e+02, 2.927617492675781e+02, 2.921289672851562e+02, 2.882507629394531e+02, 2.839975280761719e+02, 2.83156005859375e+02, 2.8310888671875e+02, 2.831168823242188e+02, 2.831270751953125e+02, 2.831297607421875e+02, 2.831217956542969e+02, 2.831081848144531e+02, 2.830917663574219e+02, 2.830733032226562e+02, 2.830526428222656e+02, 2.830277404785156e+02, 2.829942321777344e+02, 2.829412231445312e+02]
-solCol.vol[6].T=[2.931499938964844e+02, 2.92838623046875e+02, 2.92763916015625e+02, 2.928434143066406e+02, 2.928919982910156e+02, 2.929179992675781e+02, 2.929334411621094e+02, 2.929425659179688e+02, 2.929471435546875e+02, 2.929478149414062e+02, 2.9294384765625e+02, 2.929349060058594e+02, 2.929205932617188e+02, 2.928995361328125e+02, 2.928678283691406e+02, 2.928164672851562e+02, 2.927214965820312e+02, 2.924420776367188e+02, 2.912766723632812e+02, 2.859552307128906e+02, 2.832445983886719e+02, 2.829972839355469e+02, 2.829977416992188e+02, 2.830046691894531e+02, 2.830108032226562e+02, 2.830158386230469e+02, 2.830206298828125e+02, 2.830278015136719e+02, 2.8303564453125e+02, 2.830407104492188e+02, 2.830379638671875e+02, 2.830683898925781e+02, 2.832860412597656e+02, 2.841195983886719e+02, 2.86420654296875e+02, 2.936654663085937e+02, 2.98051513671875e+02, 2.989567565917969e+02, 2.99582275390625e+02, 3.002295227050781e+02, 3.009742126464844e+02, 3.017371215820312e+02, 3.024815979003906e+02, 3.032709655761719e+02, 3.041029968261719e+02, 3.050085144042969e+02, 3.058348693847656e+02, 3.072424926757812e+02, 3.0945361328125e+02, 3.133678894042969e+02, 3.22279296875e+02, 3.472091064453125e+02, 3.434623107910156e+02, 3.152515258789062e+02, 3.063424987792969e+02, 3.035887756347656e+02, 3.020737915039062e+02, 3.011470947265625e+02, 3.007546081542969e+02, 3.00739990234375e+02, 3.008915405273438e+02, 3.010384521484375e+02, 3.009989624023438e+02, 3.007862243652344e+02, 3.003605346679688e+02, 3.004763793945312e+02, 3.007862243652344e+02, 3.035740356445312e+02, 3.042231445312499e+02, 2.950148925781251e+02, 2.930569458007812e+02, 2.929812622070312e+02, 2.929923095703125e+02, 2.93001708984375e+02, 2.930076293945312e+02, 2.930097961425781e+02, 2.93008056640625e+02, 2.930032043457031e+02, 2.929952697753906e+02, 2.929835510253906e+02, 2.929668273925781e+02, 2.929425354003906e+02, 2.929024353027344e+02, 2.9282080078125e+02, 2.925456848144531e+02, 2.902236328125e+02, 2.847439270019531e+02, 2.832239074707031e+02, 2.831227722167969e+02, 2.83122314453125e+02, 2.831295471191406e+02, 2.831360168457031e+02, 2.831362609863281e+02, 2.8312939453125e+02, 2.831195983886719e+02, 2.831080322265625e+02, 2.830950622558594e+02, 2.830802917480469e+02, 2.830616149902344e+02, 2.830346374511719e+02, 2.829862670898438e+02]
+solCol.vol[3].T=[2.931499938964844e+02, 2.921913452148438e+02, 2.91472412109375e+02, 2.915185852050781e+02, 2.917891235351562e+02, 2.919460144042969e+02, 2.920345764160156e+02, 2.920865478515625e+02, 2.921139831542969e+02, 2.921216125488281e+02, 2.921072387695312e+02, 2.920690612792969e+02, 2.920060424804688e+02, 2.919138488769531e+02, 2.917797241210938e+02, 2.915751037597656e+02, 2.912362976074219e+02, 2.904327697753906e+02, 2.858624267578125e+02, 2.83112060546875e+02, 2.829074096679688e+02, 2.829146118164062e+02, 2.829254760742188e+02, 2.829353637695312e+02, 2.829440612792969e+02, 2.829511413574219e+02, 2.829586791992188e+02, 2.829703369140625e+02, 2.829820251464844e+02, 2.829881896972656e+02, 2.829795837402344e+02, 2.829834289550781e+02, 2.830994873046875e+02, 2.836806030273438e+02, 2.855038146972656e+02, 2.897046813964844e+02, 2.975372619628906e+02, 3.013650512695312e+02, 3.028389282226562e+02, 3.040684509277344e+02, 3.053557739257812e+02, 3.067239379882812e+02, 3.080009155273438e+02, 3.093129272460938e+02, 3.106672973632812e+02, 3.12091552734375e+02, 3.133753967285156e+02, 3.152881774902344e+02, 3.18197998046875e+02, 3.229029235839844e+02, 3.317449951171875e+02, 3.334533081054688e+02, 3.039870910644531e+02, 2.959667053222656e+02, 2.940238952636719e+02, 2.930155334472656e+02, 2.923831481933594e+02, 2.919967346191406e+02, 2.918668823242188e+02, 2.918964233398438e+02, 2.919951782226562e+02, 2.920780944824219e+02, 2.920490112304688e+02, 2.919352416992188e+02, 2.917266540527344e+02, 2.919030456542969e+02, 2.920794677734375e+02, 2.947425231933594e+02, 3.012563171386719e+02, 2.987707824707032e+02, 2.932099914550781e+02, 2.923180541992188e+02, 2.9233740234375e+02, 2.92386962890625e+02, 2.924202270507812e+02, 2.924352111816406e+02, 2.924306030273438e+02, 2.924099426269531e+02, 2.923746643066406e+02, 2.923226928710938e+02, 2.922496032714844e+02, 2.921476440429688e+02, 2.919927062988281e+02, 2.917205505371094e+02, 2.904015808105469e+02, 2.848620910644531e+02, 2.832209777832031e+02, 2.831146545410156e+02, 2.831046447753906e+02, 2.831105651855469e+02, 2.83122314453125e+02, 2.831307678222656e+02, 2.831282348632812e+02, 2.831162109375e+02, 2.831007080078125e+02, 2.830826721191406e+02, 2.830624389648438e+02, 2.830388488769531e+02, 2.830072021484375e+02, 2.829571228027344e+02, 2.828445739746094e+02]
+solCol.vol[9].T=[2.931499938964844e+02, 2.927783813476562e+02, 2.928816223144531e+02, 2.929358215332031e+02, 2.929630737304688e+02, 2.929791870117188e+02, 2.929891662597656e+02, 2.929950256347656e+02, 2.929977416992188e+02, 2.929975280761719e+02, 2.9299365234375e+02, 2.929859619140625e+02, 2.929739074707031e+02, 2.929560546875e+02, 2.929281005859375e+02, 2.928794555664062e+02, 2.927718505859375e+02, 2.920541076660156e+02, 2.903502807617188e+02, 2.875117797851562e+02, 2.836275329589844e+02, 2.825390014648438e+02, 2.824891357421875e+02, 2.82516357421875e+02, 2.825426940917969e+02, 2.825651550292969e+02, 2.825857849121094e+02, 2.826148071289062e+02, 2.826489562988281e+02, 2.826748657226562e+02, 2.82673583984375e+02, 2.8266552734375e+02, 2.828091735839844e+02, 2.835317687988281e+02, 2.905838623046876e+02, 2.939869384765625e+02, 2.943450927734375e+02, 2.945150146484375e+02, 2.946852416992188e+02, 2.9485546875e+02, 2.950615234375e+02, 2.952444152832031e+02, 2.954343872070312e+02, 2.956343688964844e+02, 2.958442687988281e+02, 2.960762329101562e+02, 2.96290771484375e+02, 2.966863708496094e+02, 2.973438720703125e+02, 2.986640014648438e+02, 3.034955444335938e+02, 3.300435180664062e+02, 3.517184143066406e+02, 3.375083312988281e+02, 3.190718994140625e+02, 3.131846313476562e+02, 3.106997375488281e+02, 3.092420349121094e+02, 3.085460510253906e+02, 3.084342041015625e+02, 3.086220703125e+02, 3.088565673828125e+02, 3.088690490722656e+02, 3.08594970703125e+02, 3.079862670898438e+02, 3.077981262207031e+02, 3.077739562988281e+02, 3.041209716796875e+02, 2.941978454589844e+02, 2.930382995605469e+02, 2.930159912109375e+02, 2.930245666503906e+02, 2.930334167480469e+02, 2.930397338867188e+02, 2.930435485839844e+02, 2.930444641113281e+02, 2.930425415039062e+02, 2.93038330078125e+02, 2.930316772460938e+02, 2.930219116210938e+02, 2.930077209472656e+02, 2.929861755371094e+02, 2.929465637207031e+02, 2.928406372070312e+02, 2.920318603515625e+02, 2.907241516113281e+02, 2.871135864257812e+02, 2.837191772460938e+02, 2.830655822753906e+02, 2.830290832519531e+02, 2.830545349121094e+02, 2.830839233398438e+02, 2.830912475585938e+02, 2.830677185058594e+02, 2.830281677246094e+02, 2.829806823730469e+02, 2.829276733398438e+02, 2.828690490722656e+02, 2.827990417480469e+02, 2.827063293457031e+02, 2.825634460449219e+02]
+solCol.vol[6].T=[2.931499938964844e+02, 2.92233642578125e+02, 2.920276184082031e+02, 2.922537841796875e+02, 2.923914184570312e+02, 2.924658203125e+02, 2.925103149414062e+02, 2.925366821289062e+02, 2.925498962402344e+02, 2.925517883300781e+02, 2.925401000976562e+02, 2.925140991210938e+02, 2.924724731445312e+02, 2.924114990234375e+02, 2.92320068359375e+02, 2.921729736328125e+02, 2.919034118652344e+02, 2.911297607421875e+02, 2.892664489746094e+02, 2.847982177734375e+02, 2.82834716796875e+02, 2.826875610351562e+02, 2.827044982910156e+02, 2.827241821289062e+02, 2.827416687011719e+02, 2.827563171386719e+02, 2.827703552246094e+02, 2.827917175292969e+02, 2.828150939941406e+02, 2.828304748535156e+02, 2.828230590820312e+02, 2.828179626464844e+02, 2.829603881835938e+02, 2.836552124023438e+02, 2.856342468261719e+02, 2.927257080078124e+02, 2.972311096191406e+02, 2.982821655273438e+02, 2.989888916015625e+02, 2.996778869628906e+02, 3.004448547363281e+02, 3.012144470214844e+02, 3.01954833984375e+02, 3.02728271484375e+02, 3.035328979492188e+02, 3.043970642089844e+02, 3.051663818359375e+02, 3.064801635742188e+02, 3.085291748046875e+02, 3.121259155273438e+02, 3.201816101074219e+02, 3.415920104980469e+02, 3.371617431640625e+02, 3.130990295410156e+02, 3.054686584472656e+02, 3.029573974609375e+02, 3.015450439453125e+02, 3.006768798828125e+02, 3.003150939941406e+02, 3.003125e+02, 3.004775085449219e+02, 3.0064404296875e+02, 3.006236267089844e+02, 3.004175109863281e+02, 2.999803466796875e+02, 3.000416870117188e+02, 3.002081604003906e+02, 3.024135131835938e+02, 3.023266601562499e+02, 2.942781677246094e+02, 2.926849060058594e+02, 2.926500244140625e+02, 2.926846618652344e+02, 2.927117919921875e+02, 2.927289428710938e+02, 2.927351989746094e+02, 2.9272998046875e+02, 2.927157897949219e+02, 2.92692626953125e+02, 2.926586608886719e+02, 2.926102905273438e+02, 2.9254052734375e+02, 2.924262084960938e+02, 2.92196044921875e+02, 2.914586791992188e+02, 2.889518127441406e+02, 2.843671875e+02, 2.831588745117188e+02, 2.830658264160156e+02, 2.830689697265625e+02, 2.830902404785156e+02, 2.83109130859375e+02, 2.831095886230469e+02, 2.830892944335938e+02, 2.83060546875e+02, 2.830267639160156e+02, 2.82989013671875e+02, 2.829464416503906e+02, 2.828929443359375e+02, 2.828167724609375e+02, 2.826830444335938e+02]
 time=[0e+00, 8.64e+04]
 solCol.m_flow=[0e+00, -3.683869168162346e-02, -5.163431912660599e-02, -6.229501217603683e-02, -7.041136175394058e-02, -7.654553651809692e-02, -8.095130324363708e-02, -8.3754763007164e-02, -8.501824736595154e-02, -8.476606011390686e-02, -8.29935297369957e-02, -7.966528832912445e-02, -7.470180839300156e-02, -6.794465333223343e-02, -5.90681806206703e-02, -4.730774462223053e-02, -3.012827038764954e-02, 2.132495492696768e-02, 4.243948683142662e-02, 5.553072318434715e-02, 6.524547934532166e-02, 7.266001403331757e-02, 7.819817960262299e-02, 8.205977827310562e-02, 8.434519171714783e-02, 8.510225266218185e-02, 8.434519171714783e-02, 8.205977827310562e-02, 7.819817960262297e-02, 7.266001403331757e-02, 6.524547934532166e-02, 5.553072318434715e-02, 4.243948683142662e-02, 2.132495492696762e-02, -3.012827038764962e-02, -4.730774462223047e-02, -5.906818062067032e-02, -6.794465333223343e-02, -7.470180839300156e-02, -7.966528832912445e-02, -8.29935297369957e-02, -8.476606011390686e-02, -8.501824736595154e-02, -8.3754763007164e-02, -8.095130324363708e-02, -7.654553651809692e-02, -7.041136175394058e-02, -6.229501217603683e-02, -5.163431912660599e-02, -3.683869168162346e-02, 0e+00, 3.683869168162346e-02, 5.163431912660599e-02, 6.229501217603683e-02, 7.041136175394058e-02, 7.654553651809697e-02, 8.095130324363711e-02, 8.375476300716399e-02, 8.501824736595154e-02, 8.476606011390686e-02, 8.29935297369957e-02, 7.966528832912445e-02, 7.470180839300156e-02, 6.794465333223343e-02, 5.906818062067032e-02, 4.730774462223053e-02, 3.012827038764954e-02, -2.132495492696762e-02, -4.243948683142675e-02, -5.553072318434706e-02, -6.524547934532159e-02, -7.266001403331757e-02, -7.819817960262299e-02, -8.205977827310562e-02, -8.434519171714783e-02, -8.510225266218185e-02, -8.434519171714783e-02, -8.205977827310562e-02, -7.819817960262299e-02, -7.266001403331757e-02, -6.524547934532166e-02, -5.553072318434715e-02, -4.243948683142662e-02, -2.132495492696762e-02, 3.012827038764954e-02, 4.730774462223053e-02, 5.906818062067032e-02, 6.794465333223343e-02, 7.470180839300156e-02, 7.966528832912445e-02, 8.29935297369957e-02, 8.476606011390686e-02, 8.501824736595154e-02, 8.3754763007164e-02, 8.095130324363708e-02, 7.654553651809692e-02, 7.041136175394058e-02, 6.229501217603683e-02, 5.163431912660599e-02, 3.683869168162346e-02, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt
new file mode 100644
index 00000000000..17c55687888
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_EN12975NPanels.txt
@@ -0,0 +1,22 @@
+last-generated=2017-11-21
+statistics-initialization=
+{
+  "numerical Jacobians": "0", 
+  "nonlinear": "1, 1"
+}
+statistics-simulation=
+{
+  "numerical Jacobians": "0", 
+  "nonlinear": "1", 
+  "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]
+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]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_FlatPlateNPanels.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_FlatPlateNPanels.txt
new file mode 100644
index 00000000000..540700dcff8
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_SolarCollectors_Validation_FlatPlateNPanels.txt
@@ -0,0 +1,22 @@
+last-generated=2017-11-21
+statistics-initialization=
+{
+  "numerical Jacobians": "0", 
+  "nonlinear": "1, 1"
+}
+statistics-simulation=
+{
+  "numerical Jacobians": "0", 
+  "nonlinear": "1", 
+  "number of continuous time states": "60", 
+  "linear": " "
+}
+solCol1.vol[30].T=[2.931499938964844e+02, 2.920196838378906e+02, 2.828678588867188e+02, 2.808581848144531e+02, 2.804525451660156e+02, 2.803706970214844e+02, 2.803541564941406e+02, 2.80350830078125e+02, 2.803501586914062e+02, 2.803432312011719e+02, 2.802834167480469e+02, 2.801638793945312e+02, 2.800144653320312e+02, 2.798703308105469e+02, 2.797347106933594e+02, 2.795948486328125e+02, 2.794482116699219e+02, 2.792920532226562e+02, 2.790313720703125e+02, 2.786127319335938e+02, 2.7813134765625e+02, 2.7771923828125e+02, 2.774702453613281e+02, 2.773678894042969e+02, 2.773796081542969e+02, 2.77472900390625e+02, 2.776675720214844e+02, 2.780472106933594e+02, 2.785316467285156e+02, 2.791278686523438e+02, 2.801219177246094e+02, 2.8199609375e+02, 2.86424560546875e+02, 2.990252685546875e+02, 3.215756835937501e+02, 2.918401184082031e+02, 2.9302197265625e+02, 2.941342468261719e+02, 2.952121887207031e+02, 2.962212219238281e+02, 2.973812255859375e+02, 2.982140197753906e+02, 2.989338989257812e+02, 2.994938354492188e+02, 2.998432922363281e+02, 2.999404907226562e+02, 2.995455322265625e+02, 2.994108276367188e+02, 2.993613586425781e+02, 2.993786315917969e+02, 2.993782043457031e+02, 2.993606872558594e+02, 2.993262023925781e+02, 2.992749328613281e+02, 2.992035522460938e+02, 2.991053161621094e+02, 2.989735107421875e+02, 2.988707885742188e+02, 2.988821411132812e+02, 2.988614501953125e+02, 2.986831665039062e+02, 2.982122802734375e+02, 2.973687438964844e+02, 2.961147766113281e+02, 2.948999328613281e+02, 2.936343688964844e+02, 2.916820983886719e+02, 2.896263732910156e+02, 2.910962524414062e+02, 2.874590454101563e+02, 2.853428344726562e+02, 2.845166015625e+02, 2.842742309570312e+02, 2.842440795898438e+02, 2.8427294921875e+02, 2.842738037109375e+02, 2.841988830566406e+02, 2.84083984375e+02, 2.839569702148438e+02, 2.838361511230469e+02, 2.8374609375e+02, 2.837249145507812e+02, 2.837498474121094e+02, 2.837697448730469e+02, 2.837113342285156e+02, 2.834261169433594e+02, 2.829536437988281e+02, 2.824580383300781e+02, 2.821301574707031e+02, 2.8211376953125e+02, 2.823214416503906e+02, 2.825430297851562e+02, 2.82546142578125e+02, 2.822886657714844e+02, 2.819183044433594e+02, 2.815115356445312e+02, 2.811223449707031e+02, 2.807808837890625e+02, 2.804793701171875e+02, 2.802139282226562e+02, 2.799833374023438e+02]
+solCol.vol[30].T=[2.931499938964844e+02, 2.920196838378906e+02, 2.828678588867188e+02, 2.808581848144531e+02, 2.804525451660156e+02, 2.803706970214844e+02, 2.803541564941406e+02, 2.80350830078125e+02, 2.803501586914062e+02, 2.803432312011719e+02, 2.802834167480469e+02, 2.801638793945312e+02, 2.800144653320312e+02, 2.798703308105469e+02, 2.797347106933594e+02, 2.795948486328125e+02, 2.794482116699219e+02, 2.792920532226562e+02, 2.790313720703125e+02, 2.786127319335938e+02, 2.7813134765625e+02, 2.7771923828125e+02, 2.774702453613281e+02, 2.773678894042969e+02, 2.773796081542969e+02, 2.77472900390625e+02, 2.776675720214844e+02, 2.780472106933594e+02, 2.785316467285156e+02, 2.791278686523438e+02, 2.801219177246094e+02, 2.8199609375e+02, 2.86424560546875e+02, 2.990252685546875e+02, 3.215756835937501e+02, 2.918401184082031e+02, 2.9302197265625e+02, 2.941342468261719e+02, 2.952121887207031e+02, 2.962212219238281e+02, 2.973812255859375e+02, 2.982140197753906e+02, 2.989338989257812e+02, 2.994938354492188e+02, 2.998432922363281e+02, 2.999404907226562e+02, 2.995455322265625e+02, 2.994108276367188e+02, 2.993613586425781e+02, 2.993786315917969e+02, 2.993782043457031e+02, 2.993606872558594e+02, 2.993262023925781e+02, 2.992749328613281e+02, 2.992035522460938e+02, 2.991053161621094e+02, 2.989735107421875e+02, 2.988707885742188e+02, 2.988821411132812e+02, 2.988614501953125e+02, 2.986831665039062e+02, 2.982122802734375e+02, 2.973687438964844e+02, 2.961147766113281e+02, 2.948999328613281e+02, 2.936343688964844e+02, 2.916820983886719e+02, 2.896263732910156e+02, 2.910962524414062e+02, 2.874590454101563e+02, 2.853428344726562e+02, 2.845166015625e+02, 2.842742309570312e+02, 2.842440795898438e+02, 2.8427294921875e+02, 2.842738037109375e+02, 2.841988830566406e+02, 2.84083984375e+02, 2.839569702148438e+02, 2.838361511230469e+02, 2.8374609375e+02, 2.837249145507812e+02, 2.837498474121094e+02, 2.837697448730469e+02, 2.837113342285156e+02, 2.834261169433594e+02, 2.829536437988281e+02, 2.824580383300781e+02, 2.821301574707031e+02, 2.8211376953125e+02, 2.823214416503906e+02, 2.825430297851562e+02, 2.82546142578125e+02, 2.822886657714844e+02, 2.819183044433594e+02, 2.815115356445312e+02, 2.811223449707031e+02, 2.807808837890625e+02, 2.804793701171875e+02, 2.802139282226562e+02, 2.799833374023438e+02]
+time=[0e+00, 8.64e+04]
+solCol1.heaGai[30].Q_flow=[7.011649039156964e-09, 7.010347413682894e-09, 7.01216595899723e-09, 7.016882186405837e-09, 7.024005821421042e-09, 7.032979976173692e-09, 7.043318372979002e-09, 7.054647088722277e-09, 7.06669345262867e-09, 7.079264285891895e-09, 7.092221032678481e-09, 7.105464217005419e-09, 7.118919231885457e-09, 7.132530122078151e-09, 7.146254699108567e-09, 7.160057435839917e-09, 7.17391079874119e-09, 7.187790362905844e-09, 7.201675700230226e-09, 7.215548158967522e-09, 7.229390863727758e-09, 7.24318693912096e-09, 7.256921286113993e-09, 7.270577917495302e-09, 7.284141734231753e-09, 7.312034089324015e-09, 7.8400859138128e-09, 8.368787440815595e-09, 1.59432906657472e-02, 1.371469736099243e+00, 6.191872596740723e+00, 1.746418762207031e+01, 4.63894157409668e+01, 1.151535873413086e+02, 2.137755584716801e+02, 3.267873840332025e+02, 4.164201965332031e+02, 5.02172119140625e+02, 5.862847290039062e+02, 6.651103515625e+02, 7.5602490234375e+02, 8.211771850585938e+02, 8.776056518554688e+02, 9.213994140625e+02, 9.484442138671875e+02, 9.543013305664062e+02, 9.234913330078125e+02, 9.123045654296875e+02, 9.080307006835938e+02, 9.088628540039062e+02, 9.082916259765625e+02, 9.063649291992188e+02, 9.03091796875e+02, 8.984871215820312e+02, 8.922798461914062e+02, 8.839676513671874e+02, 8.730526733398436e+02, 8.646583862304688e+02, 8.6517822265625e+02, 8.624545288085938e+02, 8.455488891601562e+02, 8.046111450195312e+02, 7.345835571289062e+02, 6.318309936523438e+02, 5.363439331054688e+02, 4.354010009765625e+02, 2.800372009277344e+02, 1.190268402099609e+02, 2.295613098144487e+01, 1.685498851600188e-08, 1.511867786518907e-08, 1.343299960154809e-08, 1.181092645907711e-08, 1.02641619648125e-08, 8.825213448915292e-09, 8.297457831929478e-09, 7.768548471176473e-09, 7.295910542381989e-09, 7.282442204825657e-09, 7.26886684176975e-09, 7.255200440425824e-09, 7.241458988005434e-09, 7.227658027630923e-09, 7.213813102424638e-09, 7.199941087776551e-09, 7.186058414987428e-09, 7.172185068071713e-09, 7.158341475133057e-09, 7.144552505167212e-09, 7.130847023972819e-09, 7.117261446865086e-09, 7.103840182764998e-09, 7.090641407359044e-09, 7.077742836258949e-09, 7.065248830429027e-09, 7.05330505113011e-09, 7.042114003041888e-09, 7.031960791437086e-09, 7.023233106195903e-09, 7.01642921541179e-09, 7.012101121972591e-09]
+solCol.heaGai[30].Q_flow=[7.011649039156964e-10, 7.010347302660591e-10, 7.012165847974927e-10, 7.016882075383535e-10, 7.024005821421042e-10, 7.032979754129087e-10, 7.043318706045909e-10, 7.054646866677672e-10, 7.066693341606367e-10, 7.079264396914198e-10, 7.092221254723086e-10, 7.105463994960814e-10, 7.118918787796247e-10, 7.132530122078151e-10, 7.146254699108567e-10, 7.16005754686222e-10, 7.173910909763492e-10, 7.187790362905844e-10, 7.201675922274831e-10, 7.215548158967522e-10, 7.229390419638548e-10, 7.243186606054053e-10, 7.256921175091691e-10, 7.270578028517605e-10, 7.28414162320945e-10, 7.31203431136862e-10, 7.840085247678985e-10, 8.368787884904805e-10, 1.594329020008591e-03, 1.371469646692276e-01, 6.191872358322144e-01, 1.746418714523315e+00, 4.638941764831543e+00, 1.151535892486572e+01, 2.137755584716801e+01, 3.26787376403808e+01, 4.164201736450195e+01, 5.021721267700195e+01, 5.862847518920898e+01, 6.651103973388672e+01, 7.560249328613281e+01, 8.211771392822266e+01, 8.776056671142578e+01, 9.213993835449219e+01, 9.484442138671875e+01, 9.543013000488281e+01, 9.234912872314453e+01, 9.123045349121094e+01, 9.080307006835938e+01, 9.088628387451172e+01, 9.082916259765625e+01, 9.063648986816406e+01, 9.030918121337891e+01, 8.984870910644531e+01, 8.922798156738281e+01, 8.839675903320311e+01, 8.730526733398436e+01, 8.646583557128906e+01, 8.6517822265625e+01, 8.624545288085938e+01, 8.455489349365234e+01, 8.046111297607422e+01, 7.345835876464844e+01, 6.318309783935547e+01, 5.363439178466797e+01, 4.354010009765625e+01, 2.800372123718262e+01, 1.190268421173096e+01, 2.295613050460771e+00, 1.685498740577886e-09, 1.511867853132289e-09, 1.343299915745888e-09, 1.181092668112171e-09, 1.02641617427679e-09, 8.82521333789299e-10, 8.297457720907175e-10, 7.768548582198775e-10, 7.295910542381989e-10, 7.282441871758749e-10, 7.268866619725145e-10, 7.255200329403522e-10, 7.241459099027736e-10, 7.227657916608621e-10, 7.213813435491545e-10, 7.199940643687341e-10, 7.186058414987428e-10, 7.172185068071713e-10, 7.158341142066149e-10, 7.144552172100305e-10, 7.130847023972819e-10, 7.117261224820481e-10, 7.1038402937873e-10, 7.090641407359044e-10, 7.077742836258949e-10, 7.06524894145133e-10, 7.053305162152412e-10, 7.042114114064191e-10, 7.031960569392481e-10, 7.023233106195903e-10, 7.016429104389488e-10, 7.012100899927987e-10]
+solCol1.heaLos.QLos[30]=[-4.591486358642578e+01, -4.18603515625e+01, -9.031764030456543e+00, -1.822856664657593e+00, -3.678215444087982e-01, -7.419591397047043e-02, -1.492120698094368e-02, -2.9578935354948e-03, -5.751066491939127e-04, -5.783722177147865e-02, -2.095008492469788e-01, -3.149820566177368e-01, -3.415690958499908e-01, -3.054795265197754e-01, -3.067476451396942e-01, -3.208876252174377e-01, -3.365486860275269e-01, -4.004370272159583e-01, -7.82515823841095e-01, -1.055492758750916e+00, -1.053150534629822e+00, -7.470732927322388e-01, -3.813998997211456e-01, -8.934181183576584e-02, 1.298261135816574e-01, 2.765285074710846e-01, 6.492927670478821e-01, 1.016395807266235e+00, 1.09771716594696e+00, 3.007520437240601e-01, -3.300036430358887e+00, -1.156526565551758e+01, -2.921999168395996e+01, -7.51142578125e+01, -1.546482391357426e+02, -4.534391403198241e+01, -4.657826232910156e+01, -4.807434463500977e+01, -5.058502960205078e+01, -5.307040405273438e+01, -5.620212936401367e+01, -5.836628723144531e+01, -6.041479873657227e+01, -6.200608825683594e+01, -6.285839462280273e+01, -6.278221130371094e+01, -6.087853622436523e+01, -5.987886428833008e+01, -5.918487930297852e+01, -5.873029708862305e+01, -5.821220397949219e+01, -5.76328125e+01, -5.69925537109375e+01, -5.629209899902344e+01, -5.55195198059082e+01, -5.468556594848632e+01, -5.380041885375976e+01, -5.303726196289063e+01, -5.264753723144531e+01, -5.160758972167969e+01, -4.846792221069336e+01, -4.364875793457031e+01, -3.789960098266602e+01, -3.194015312194824e+01, -2.692887496948242e+01, -2.236626625061035e+01, -1.593021488189697e+01, -9.755396842956543e+00, -1.757869720458986e+01, -7.723320484161468e+00, -2.841440439224266e+00, -1.010083913803101e+00, -2.219189256429672e-01, 3.642300888895988e-02, 6.201666221022606e-02, -8.533637970685959e-02, -2.272466123104095e-01, -2.789990305900574e-01, -2.841010093688965e-01, -2.519538700580597e-01, -1.272012293338776e-01, 2.117547765374184e-02, 7.114114612340927e-02, -2.563443034887314e-03, -3.51913183927536e-01, -9.008861780166626e-01, -1.154614567756653e+00, -9.969925284385681e-01, -3.997848033905029e-01, 2.829251289367676e-01, 5.67622184753418e-01, 3.372334837913513e-01, -3.549799621105194e-01, -7.412725687026978e-01, -8.931151628494263e-01, -9.110673069953918e-01, -8.181514739990234e-01, -7.180052399635315e-01, -6.346622109413147e-01, -5.556554794311523e-01, -4.783177673816681e-01]
+solCol.heaLos.QLos[30]=[-4.59148645401001e+00, -4.18603515625e+00, -9.031764268875122e-01, -1.822856664657593e-01, -3.67821529507637e-02, -7.419591769576073e-03, -1.492120674811304e-03, -2.957893593702461e-04, -5.751066055381671e-05, -5.783722270280123e-03, -2.095008455216885e-02, -3.149820491671562e-02, -3.415690734982491e-02, -3.054795227944851e-02, -3.06747667491436e-02, -3.208876401185989e-02, -3.365486860275269e-02, -4.004370421171195e-02, -7.825158536434174e-02, -1.055492758750916e-01, -1.053150519728661e-01, -7.470732927322388e-02, -3.813998773694038e-02, -8.934181183576584e-03, 1.298261154443026e-02, 2.765285037457943e-02, 6.492927670478821e-02, 1.016395837068558e-01, 1.097717210650443e-01, 3.00752054899931e-02, -3.300036489963531e-01, -1.156526565551758e+00, -2.921999216079712e+00, -7.511425971984863e+00, -1.546482372283939e+01, -4.53439140319824e+00, -4.65782642364502e+00, -4.807434558868408e+00, -5.058502674102783e+00, -5.307040214538574e+00, -5.620213031768799e+00, -5.836628913879395e+00, -6.041479587554932e+00, -6.200608730316162e+00, -6.285839557647705e+00, -6.278221130371094e+00, -6.08785343170166e+00, -5.987886428833008e+00, -5.918488025665283e+00, -5.873029708862305e+00, -5.821220397949219e+00, -5.763281345367432e+00, -5.699255466461182e+00, -5.629209995269775e+00, -5.551951885223389e+00, -5.468556404113769e+00, -5.380041599273681e+00, -5.303726196289063e+00, -5.264753818511963e+00, -5.160758972167969e+00, -4.846792221069336e+00, -4.364875793457031e+00, -3.789960145950317e+00, -3.194015264511108e+00, -2.692887544631958e+00, -2.236626625061035e+00, -1.593021512031555e+00, -9.755396842956543e-01, -1.757869720458986e+00, -7.723320722580047e-01, -2.841440439224266e-01, -1.010083854198456e-01, -2.219189144670963e-02, 3.64230084232986e-03, 6.201666314154863e-03, -8.533637970685959e-03, -2.272466197609901e-02, -2.789990417659283e-02, -2.841010130941868e-02, -2.519538626074791e-02, -1.272012293338776e-02, 2.117547672241926e-03, 7.114114239811897e-03, -2.563442976679653e-04, -3.519131988286972e-02, -9.00886207818985e-02, -1.154614612460136e-01, -9.969925135374069e-02, -3.997848182916641e-02, 2.829251252114773e-02, 5.67622184753418e-02, 3.372335061430931e-02, -3.549799695611e-02, -7.412725687026978e-02, -8.931151777505875e-02, -9.110672771930695e-02, -8.181514590978622e-02, -7.180052250623703e-02, -6.346622109413147e-02, -5.556555092334747e-02, -4.783177748322487e-02]
+difHeaGai.y=[-1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, 0e+00, -2.067951531382569e-25, -2.067951531382569e-25, -1.033975765691285e-25, -1.03397576569129e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -2.067951531382569e-25, -2.067951531382569e-25, -1.033975765691285e-25, -2.067951531382569e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -2.067951531382569e-25, -3.101927297073854e-25, -1.033975765691285e-25, -2.067951531382569e-25, -2.067951531382569e-25, 0e+00, -2.067951531382569e-25, -2.067951531382569e-25, -1.033975765691285e-25, -2.168404344971228e-19, -2.775557561562891e-17, -2.220446049250313e-16, -2.220446049250313e-16, -8.881784197001252e-16, -1.77635683940025e-15, -3.552713678800501e-15, -7.105427357600927e-15, -7.105427357601002e-15, -1.4210854715202e-14, -7.105427357601002e-15, 0e+00, -1.4210854715202e-14, -1.4210854715202e-14, 0e+00, -2.842170943040401e-14, -2.842170943040401e-14, -2.842170943040401e-14, -1.4210854715202e-14, -1.4210854715202e-14, -1.4210854715202e-14, -1.4210854715202e-14, -1.4210854715202e-14, 0e+00, -1.4210854715202e-14, -2.842170943040401e-14, -1.4210854715202e-14, -2.842170943040281e-14, -1.4210854715202e-14, -5.99534287967969e-28, -1.4210854715202e-14, -2.842170943040401e-14, -1.4210854715202e-14, -1.4210854715202e-14, -1.4210854715202e-14, -7.105427357601002e-15, -7.105427357601002e-15, -1.4210854715202e-14, -7.105427357601002e-15, -1.77635683940025e-15, -4.440892098500532e-16, -2.067951531382569e-25, 0e+00, -2.067951531382569e-25, -2.067951531382569e-25, -2.067951531382569e-25, 0e+00, -1.033975765691285e-25, -1.033975765691285e-25, 0e+00, -2.067951531382569e-25, -1.033975765691285e-25, -1.033975765691285e-25, -2.067951531382569e-25, -2.067951531382569e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -2.067951531382569e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -1.033975765691285e-25, -2.067951531382569e-25, -1.033975765691285e-25, -1.033975765691285e-25, -2.067951531382569e-25, -1.033975765691285e-25, -1.033975765691285e-25, -2.067951531382569e-25, -1.033975765691285e-25]
+difHeaLos.y=[1.77635683940025e-15, 8.881784197001252e-16, 8.193445921733655e-14, 5.551115123125783e-17, -2.037259250187162e-14, 2.602085213965211e-18, 4.336808689942018e-19, 1.084202172485502e-19, 2.032879073410321e-20, 1.734723475976807e-18, 6.938893903907228e-18, 1.387778780781446e-17, 6.938893903907228e-18, 1.040834085586084e-17, 2.040034807748704e-14, 1.387778780781446e-17, 1.387778780781446e-17, 1.387778780781446e-17, 2.775557561562891e-17, 4.163336342344337e-17, -2.035871471406381e-14, 6.118716644465394e-14, 1.387778780781446e-17, 1.734723475976807e-18, 2.038473556620346e-14, -6.938893903907228e-18, -2.775557561562891e-17, -4.163336342344337e-17, -4.16333634234429e-17, -1.040834085586084e-17, 1.110223024625157e-16, 4.440892098500626e-16, 8.881784197001252e-16, 2.664535259100376e-15, -3.552713678800464e-14, 8.88178419700144e-16, 8.881784197001252e-16, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, -1.865174681370263e-14, 2.664535259100376e-15, 2.664535259100376e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, 2.664535259100376e-15, 1.77635683940025e-15, 1.77635683940025e-15, 1.77635683940025e-15, -1.865174681370181e-14, 1.77635683940025e-15, 1.77635683940025e-15, 2.220446049250313e-14, -1.865174681370263e-14, 8.881784197001252e-16, 1.332267629550188e-15, 8.881784197001252e-16, 8.881784197001252e-16, 6.661338147750939e-16, 2.065014825802791e-14, 2.087219286295208e-14, -2.009503674571619e-14, -2.026157019940911e-14, 2.775557561562891e-17, -2.038300084272748e-14, -6.117155393337015e-14, -2.602085213965211e-18, -2.038820501315541e-14, 3.469446951953614e-18, 6.938893903907228e-18, 1.040834085586084e-17, 6.938893903907228e-18, 5.204170427930421e-18, -2.039080709836938e-14, -2.039254182184536e-14, -2.039021078717451e-14, 1.387778780781446e-17, 2.775557561562891e-17, 4.163336342344337e-17, 2.775557561562891e-17, 1.387778780781446e-17, -1.040834085586084e-17, -2.081668171172169e-17, -1.387778780781446e-17, 1.387778780781446e-17, 1.387778780781446e-17, 2.775557561562891e-17, 4.163336342344337e-17, -8.153200337090993e-14, 2.041422586529507e-14, 1.387778780781446e-17, 1.387778780781446e-17, 1.387778780781446e-17]
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975NPanels.mos b/Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975NPanels.mos
new file mode 100644
index 00000000000..1f9a481d586
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975NPanels.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Fluid.SolarCollectors.Validation.EN12975NPanels", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="EN12975NPanels");
+createPlot(id=1, position={210, 54, 1727, 864}, y={"solCol.vol[30].T", "solCol1.vol[30].T"}, range={0.0, 90000.0, 0.0, 100.0}, grid=true, colors={{0,0,255}, {255,0,0}});
+createPlot(id=1, position={210, 54, 1727, 213}, y={"solCol.heaGai[30].Q_flow", "solCol1.heaGai[30].Q_flow"}, range={0.0, 90000.0, -1000.0, 1000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={210, 54, 1727, 212}, y={"solCol.heaLos.QLos[30]", "solCol1.heaLos.QLos[30]"}, range={0.0, 90000.0, -200.0, 200.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={210, 54, 1727, 212}, y={"difHeaGai.y", "difHeaLos.y"}, range={0.0, 90000.0, -2.0000000000000003E-13, 2.0000000000000003E-13}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mos b/Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mos
new file mode 100644
index 00000000000..6262187e98d
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Fluid.SolarCollectors.Validation.FlatPlateNPanels", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="ValidationFlatPlateNPanels");
+createPlot(id=1, position={210, 54, 1727, 864}, y={"solCol.vol[30].T", "solCol1.vol[30].T"}, range={0.0, 90000.0, 0.0, 100.0}, grid=true, colors={{0,0,255}, {255,0,0}});
+createPlot(id=1, position={210, 54, 1727, 213}, y={"solCol.heaGai[30].Q_flow", "solCol1.heaGai[30].Q_flow"}, range={0.0, 90000.0, -1000.0, 1000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={210, 54, 1727, 212}, y={"solCol.heaLos.QLos[30]", "solCol1.heaLos.QLos[30]"}, range={0.0, 90000.0, -200.0, 200.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={210, 54, 1727, 212}, y={"difHeaGai.y", "difHeaLos.y"}, range={0.0, 90000.0, -2.0000000000000003E-13, 2.0000000000000003E-13}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.EN12975NPanels.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.EN12975NPanels.mos
new file mode 100644
index 00000000000..11c9c8ae1be
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.EN12975NPanels.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "solCol.vol[30].T",
+    "solCol1.vol[30].T",
+    "solCol.heaGai[30].Q_flow",
+    "solCol1.heaGai[30].Q_flow",
+    "solCol.heaLos.QLos[30]",
+    "solCol1.heaLos.QLos[30]",
+    "difHeaGai.y",
+    "difHeaLos.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.FlatPlateNPanels.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.FlatPlateNPanels.mos
new file mode 100644
index 00000000000..11c9c8ae1be
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.SolarCollectors.Validation.FlatPlateNPanels.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "solCol.vol[30].T",
+    "solCol1.vol[30].T",
+    "solCol.heaGai[30].Q_flow",
+    "solCol1.heaGai[30].Q_flow",
+    "solCol.heaLos.QLos[30]",
+    "solCol1.heaLos.QLos[30]",
+    "difHeaGai.y",
+    "difHeaLos.y"
+  };

From 02a7f2302dea71583a63b48058a6ba5d4c9117ef Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Tue, 21 Nov 2017 14:11:18 -0800
Subject: [PATCH 2/4] Removed brackets

---
 .../Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo   | 6 +++---
 .../Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Buildings/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo b/Buildings/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo
index 92afc03d89c..0e2ff735a36 100644
--- a/Buildings/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo
+++ b/Buildings/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo
@@ -14,13 +14,13 @@ protected
     "Coefficient describing heat loss to ambient conditions";
 initial equation
    //Identifies useful heat gain at nominal conditions
-   QUse_nominal = G_nominal * A_c * y_intercept + slope * A_c * (dT_nominal);
+   QUse_nominal = G_nominal * A_c * y_intercept + slope * A_c * dT_nominal;
    //Identifies TFlu[nSeg] at nominal conditions
    m_flow_nominal * cp_default * (dT_nominal_fluid[nSeg]) = QUse_nominal;
    //Identifies heat lost to environment at nominal conditions
-   QLos_nominal = -slope * A_c * (dT_nominal);
+   QLos_nominal = -slope * A_c * dT_nominal;
    //Governing equation for the first segment (i=1)
-   G_nominal * y_intercept * A_c/nSeg - UA/nSeg * (dT_nominal) = m_flow_nominal * cp_default
+   G_nominal * y_intercept * A_c/nSeg - UA/nSeg * dT_nominal = m_flow_nominal * cp_default
    * (dT_nominal_fluid[1]);
    //Loop with the governing equations for segments 2:nSeg-1
    for i in 2:nSeg-1 loop
diff --git a/Buildings/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo b/Buildings/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo
index c0e677bcc78..2691558e5c8 100644
--- a/Buildings/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo
+++ b/Buildings/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo
@@ -12,18 +12,18 @@ block EN12975HeatLoss
 protected
   final parameter Modelica.SIunits.ThermalConductance UA(
      fixed = false,
-     start=QLos_nominal/(dT_nominal))
+     start=QLos_nominal/dT_nominal)
     "Coefficient describing heat loss to ambient conditions";
 initial equation
    //Identifies useful heat gain at nominal conditions
    QUse_nominal = G_nominal * A_c * y_intercept -C1 * A_c *
-      (dT_nominal) - C2 * A_c * (dT_nominal)^2;
+      dT_nominal - C2 * A_c * dT_nominal^2;
    //Identifies TFlu[nSeg] at nominal conditions
    m_flow_nominal * cp_default * (dT_nominal_fluid[nSeg]) = QUse_nominal;
    //Identifies heat lost to environment at nominal conditions
-   QLos_nominal = -C1 * A_c * (dT_nominal)-C2 * A_c * (dT_nominal)^2;
+   QLos_nominal = -C1 * A_c * dT_nominal-C2 * A_c * dT_nominal^2;
    //Governing equation for the first segment (i=1)
-   G_nominal * y_intercept * A_c/nSeg - UA/nSeg * (dT_nominal)
+   G_nominal * y_intercept * A_c/nSeg - UA/nSeg * dT_nominal
      = m_flow_nominal * cp_default * (dT_nominal_fluid[1]);
    //Loop with the governing equations for segments 2:nSeg-1
    for i in 2:nSeg-1 loop

From e19b958d6cdfb7d4f19ebabd14a80fc9ade78db1 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Tue, 21 Nov 2017 14:40:38 -0800
Subject: [PATCH 3/4] Changed data record to ratings based on EN12975

---
 .../Validation/EN12975NPanels.mo              | 49 +++++++++----------
 ...arCollectors_Validation_EN12975NPanels.txt | 16 +++---
 2 files changed, 32 insertions(+), 33 deletions(-)

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="<html>
 <p>
@@ -123,8 +122,7 @@ The instances <code>difHeaGai</code> and <code>difHeaLos</code>
 compare the heat gain and heat loss between the two models.
 The output of these blocks should be zero, except for rounding errors.
 </p>
-</html>",
-revisions="<html>
+</html>", revisions="<html>
 <ul>
 <li>
 November 21, 2017, by Michael Wetter:<br/>
@@ -133,7 +131,8 @@ First implementation to validate
 </li>
 </ul>
 </html>"),
-  __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]

From cec8ef4f275a79ceb68fb3ba1c338d8bb72bae25 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Tue, 21 Nov 2017 14:46:46 -0800
Subject: [PATCH 4/4] Updated release notes

---
 Buildings/package.mo | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Buildings/package.mo b/Buildings/package.mo
index 3507659217c..9b9c422f6f2 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -207,12 +207,15 @@ its class name ends with the string <code>Beta</code>.
    that can lead to wrong simulation results):
    </p>
    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>xxx</b>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
        </td>
    </tr>
-   <tr><td valign=\"top\">xxx
+   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                          Buildings.Fluid.SolarCollectors.EN12975
        </td>
-       <td valign=\"top\">xxx.
+       <td valign=\"top\">Corrected error in parameterization of heat loss calculation
+                          that led to too small heat losses if the number of panels is different from one.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1073\">issue 1073</a>.
        </td>
    </tr>
    </table>

xxx +
Buildings.Fluid.SolarCollectors
xxx +
Buildings.Fluid.SolarCollectors.ASHRAE93 + Buildings.Fluid.SolarCollectors.EN12975	xxx. +	Corrected error in parameterization of heat loss calculation + that led to too small heat losses if the number of panels is different from one. + This is for issue 1073.