From ffc284d70becaa35be8abd40458db88e07809376 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 13 Dec 2023 18:43:03 -0800
Subject: [PATCH] Corrected pressure drop calculation of solar collector
 (#3599)

This corrects a bug in the implementation of the solar collector pressure drop for parallel collectors. This is for #3597
---
 Buildings/Fluid/SolarCollectors/ASHRAE93.mo      |  7 +++++++
 .../BaseClasses/PartialSolarCollector.mo         | 16 ++++++++++++++--
 Buildings/Fluid/SolarCollectors/EN12975.mo       |  9 ++++++++-
 .../Fluid/SolarCollectors/Examples/Tubular.mo    | 13 +++++++++++--
 ...gs_Fluid_SolarCollectors_Examples_Tubular.txt | 10 +++++-----
 Buildings/Resources/Scripts/BuildingsPy/conf.yml |  4 ++++
 Buildings/package.mo                             | 10 +++++++---
 7 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/Buildings/Fluid/SolarCollectors/ASHRAE93.mo b/Buildings/Fluid/SolarCollectors/ASHRAE93.mo
index f519b75a3b6..c4df93e5eec 100644
--- a/Buildings/Fluid/SolarCollectors/ASHRAE93.mo
+++ b/Buildings/Fluid/SolarCollectors/ASHRAE93.mo
@@ -180,6 +180,13 @@ capacity of copper.
 </html>", revisions="<html>
 <ul>
 <li>
+December 11, 2023, by Michael Wetter:<br/>
+Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel,
+e.g., if <code>sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.
+</li>
+<li>
 September 16, 2021, by Michael Wetter:<br/>
 Changed <code>lat</code> from being a parameter to an input from weather bus.<br/>
 This is for
diff --git a/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo b/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo
index 1ead7210c59..e0ce5ff9bcd 100644
--- a/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo
+++ b/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo
@@ -3,7 +3,7 @@ model PartialSolarCollector "Partial model for solar collectors"
  extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations;
   extends Buildings.Fluid.Interfaces.TwoPortFlowResistanceParameters(final dp_nominal = dp_nominal_final);
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    final m_flow_nominal=perPar.mperA_flow_nominal*perPar.A);
+    final m_flow_nominal=m_flow_nominal_final);
 
   constant Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(HideResult=true);
@@ -125,9 +125,14 @@ protected
     "Partial performance data"
     annotation(choicesAllMatching=true);
 
-    Modelica.Blocks.Interfaces.RealInput shaCoe_internal
+  Modelica.Blocks.Interfaces.RealInput shaCoe_internal
     "Internally used shading coefficient";
 
+  final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_final(
+      displayUnit="kg/s") = if sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel
+     then nPanels_internal*perPar.mperA_flow_nominal*perPar.A else perPar.mperA_flow_nominal*perPar.A
+    "Nominal mass flow rate through the system of collectors";
+
   final parameter Modelica.Units.SI.PressureDifference dp_nominal_final(
       displayUnit="Pa") = if sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Series
      then nPanels_internal*perPar.dp_nominal else perPar.dp_nominal
@@ -242,6 +247,13 @@ CEN 2006, European Standard 12975-1:2006, European Committee for Standardization
 revisions="<html>
 <ul>
 <li>
+December 11, 2023, by Michael Wetter:<br/>
+Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel,
+e.g., if <code>sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.
+</li>
+<li>
 September 16, 2021, by Michael Wetter:<br/>
 Changed <code>lat</code> from being a parameter to an input from weather bus.<br/>
 This is for
diff --git a/Buildings/Fluid/SolarCollectors/EN12975.mo b/Buildings/Fluid/SolarCollectors/EN12975.mo
index 90413faec95..3bc2a59fb08 100644
--- a/Buildings/Fluid/SolarCollectors/EN12975.mo
+++ b/Buildings/Fluid/SolarCollectors/EN12975.mo
@@ -108,6 +108,13 @@ capacity of copper.
 </html>", revisions="<html>
 <ul>
 <li>
+December 11, 2023, by Michael Wetter:<br/>
+Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel,
+e.g., if <code>sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.
+</li>
+<li>
 September 16, 2021, by Michael Wetter:<br/>
 Changed <code>lat</code> from being a parameter to an input from weather bus.<br/>
 This is for
@@ -134,7 +141,7 @@ First implementation.
 </html>"),
       Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
             100}}),
-         graphics={
+      graphics={
         Rectangle(
           extent={{-84,100},{84,-100}},
           lineColor={27,0,55},
diff --git a/Buildings/Fluid/SolarCollectors/Examples/Tubular.mo b/Buildings/Fluid/SolarCollectors/Examples/Tubular.mo
index 28466b74b87..7e2f37e7649 100644
--- a/Buildings/Fluid/SolarCollectors/Examples/Tubular.mo
+++ b/Buildings/Fluid/SolarCollectors/Examples/Tubular.mo
@@ -38,14 +38,15 @@ model Tubular "Example showing the use of Tubular"
   Modelica.Blocks.Sources.Sine sine(
     f=3/86400,
     offset=101325,
-    amplitude=-1.5*solCol.dp_nominal)
+    amplitude=-0.1*solCol.dp_nominal)
     annotation (Placement(transformation(extent={{-100,-20},{-80,0}})));
   Buildings.Fluid.Sources.Boundary_pT sou(
     redeclare package Medium = Medium,
     T=273.15 + 10,
     nPorts=1,
     use_p_in=true,
-    p(displayUnit="Pa")) "Inlet for water flow"                                annotation (Placement(
+    p(displayUnit="Pa")) "Inlet for water flow"
+    annotation (Placement(
         transformation(
         extent={{10,-10},{-10,10}},
         rotation=180,
@@ -92,6 +93,14 @@ equation
 revisions="<html>
 <ul>
 <li>
+December 11, 2023, by Michael Wetter:<br/>
+Changed design flow rate. This is due to correction for the
+implementation of the pressure drop calculation for the situation where collectors are in parallel,
+e.g., if <code>sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.
+</li>
+<li>
 September 16, 2021, by Michael Wetter:<br/>
 Removed parameter assignment for <code>lat</code>.<br/>
 This is for
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 cc63d3f6594..c4ec08a5124 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=2021-09-16
+last-generated=2023-12-11
 statistics-simulation=
 {
   "linear": " ",
@@ -7,7 +7,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-solCol.vol[3].T=[2.931499938964844e+02, 2.919305419921875e+02, 2.91035888671875e+02, 2.910977783203125e+02, 2.914320983886719e+02, 2.916263122558594e+02, 2.917364501953125e+02, 2.918013000488281e+02, 2.918355712890625e+02, 2.918450317382812e+02, 2.918268737792969e+02, 2.917788696289062e+02, 2.916997985839844e+02, 2.915844421386719e+02, 2.914170837402344e+02, 2.911626892089844e+02, 2.907439270019531e+02, 2.897762451171875e+02, 2.854419555664062e+02, 2.830054931640625e+02, 2.828385925292969e+02, 2.828497009277344e+02, 2.828634033203125e+02, 2.828759155273438e+02, 2.82886962890625e+02, 2.8289599609375e+02, 2.829056396484375e+02, 2.829205627441406e+02, 2.82935546875e+02, 2.829435119628906e+02, 2.829380493164062e+02, 2.829585266113281e+02, 2.831075439453125e+02, 2.838595275878906e+02, 2.861387023925781e+02, 2.908436584472656e+02, 2.985640258789062e+02, 3.022300415039062e+02, 3.037222900390625e+02, 3.049939575195312e+02, 3.062251281738281e+02, 3.074563598632812e+02, 3.087409362792969e+02, 3.100741882324219e+02, 3.114456481933594e+02, 3.128721313476562e+02, 3.144710083007812e+02, 3.163765258789062e+02, 3.192970275878906e+02, 3.240956726074219e+02, 3.330659484863281e+02, 3.345177001953125e+02, 3.048251037597656e+02, 2.967297973632812e+02, 2.947060241699219e+02, 2.936444702148438e+02, 2.929769287109375e+02, 2.925689697265625e+02, 2.924362182617188e+02, 2.924761657714844e+02, 2.92646484375e+02, 2.927496948242188e+02, 2.927188720703125e+02, 2.925965576171875e+02, 2.925583190917969e+02, 2.927740173339844e+02, 2.930754699707031e+02, 2.964302978515625e+02, 3.034049072265625e+02, 2.996808776855469e+02, 2.931159973144532e+02, 2.920925903320312e+02, 2.92120849609375e+02, 2.921827392578125e+02, 2.92224365234375e+02, 2.922430419921875e+02, 2.92237060546875e+02, 2.922110290527344e+02, 2.921666564941406e+02, 2.921014709472656e+02, 2.920101623535156e+02, 2.918832397460938e+02, 2.916912841796875e+02, 2.913562927246094e+02, 2.899408874511719e+02, 2.847178955078125e+02, 2.832078857421875e+02, 2.831043090820312e+02, 2.830921325683594e+02, 2.830996704101562e+02, 2.831146545410156e+02, 2.831254577636719e+02, 2.831221618652344e+02, 2.831068115234375e+02, 2.830870361328125e+02, 2.830640258789062e+02, 2.830382385253906e+02, 2.830082397460938e+02, 2.829681091308594e+02, 2.829047546386719e+02, 2.82763427734375e+02]
-solCol.vol[6].T=[2.931499938964844e+02, 2.919840393066406e+02, 2.917291870117188e+02, 2.920128479003906e+02, 2.921851196289062e+02, 2.922786865234375e+02, 2.923347778320312e+02, 2.923680419921875e+02, 2.92384765625e+02, 2.923871459960938e+02, 2.923722839355469e+02, 2.923392944335938e+02, 2.922866516113281e+02, 2.922095642089844e+02, 2.9209423828125e+02, 2.919091796875e+02, 2.915714721679688e+02, 2.906121215820312e+02, 2.885163879394531e+02, 2.843773193359375e+02, 2.826753540039062e+02, 2.82561767578125e+02, 2.825846252441406e+02, 2.826091918945312e+02, 2.826311950683594e+02, 2.82649658203125e+02, 2.826675415039062e+02, 2.8269482421875e+02, 2.827247314453125e+02, 2.827445373535156e+02, 2.827411193847656e+02, 2.827639465332031e+02, 2.8295263671875e+02, 2.838497314453125e+02, 2.862701721191406e+02, 2.934894409179687e+02, 2.977778930664062e+02, 2.988129577636719e+02, 2.995441589355469e+02, 3.002586975097656e+02, 3.009594421386719e+02, 3.016759033203125e+02, 3.02432373046875e+02, 3.032225036621094e+02, 3.040422668457031e+02, 3.049123229980469e+02, 3.059262390136719e+02, 3.071897277832031e+02, 3.092953796386719e+02, 3.130213928222656e+02, 3.213198852539062e+02, 3.429164428710938e+02, 3.382171630859375e+02, 3.14322021484375e+02, 3.066818542480469e+02, 3.040908203125e+02, 3.026192626953125e+02, 3.017124633789062e+02, 3.013418579101562e+02, 3.013551635742188e+02, 3.016401062011719e+02, 3.018568725585938e+02, 3.018363037109375e+02, 3.015976867675781e+02, 3.014117431640625e+02, 3.015606079101562e+02, 3.018356323242188e+02, 3.045715026855469e+02, 3.04002227783203e+02, 2.944256591796876e+02, 2.925515441894531e+02, 2.925135192871094e+02, 2.925572204589844e+02, 2.925914611816406e+02, 2.926131286621094e+02, 2.926210327148438e+02, 2.926143493652344e+02, 2.925963439941406e+02, 2.925669860839844e+02, 2.925239868164062e+02, 2.924629211425781e+02, 2.923750610351562e+02, 2.922315368652344e+02, 2.919439697265625e+02, 2.910379028320312e+02, 2.884861145019531e+02, 2.842343444824219e+02, 2.831340026855469e+02, 2.830425720214844e+02, 2.830471801757812e+02, 2.830741577148438e+02, 2.830981140136719e+02, 2.830985717773438e+02, 2.8307275390625e+02, 2.830362243652344e+02, 2.829933471679688e+02, 2.82945556640625e+02, 2.828917846679688e+02, 2.828245239257812e+02, 2.827292175292969e+02, 2.825635070800781e+02]
-solCol.vol[9].T=[2.931499938964844e+02, 2.926755981445312e+02, 2.928070983886719e+02, 2.928759460449219e+02, 2.9291064453125e+02, 2.929311828613281e+02, 2.929438781738281e+02, 2.929513549804688e+02, 2.92954833984375e+02, 2.929545593261719e+02, 2.929495849609375e+02, 2.929397583007812e+02, 2.929244079589844e+02, 2.92901611328125e+02, 2.928659362792969e+02, 2.928039245605469e+02, 2.926670837402344e+02, 2.917600402832031e+02, 2.896695861816406e+02, 2.867433776855469e+02, 2.832599792480469e+02, 2.8234375e+02, 2.823152770996094e+02, 2.82349609375e+02, 2.823823547363281e+02, 2.824104919433594e+02, 2.824365234375e+02, 2.824735412597656e+02, 2.825171508789062e+02, 2.825503845214844e+02, 2.825550537109375e+02, 2.825789184570312e+02, 2.827796020507812e+02, 2.837156066894531e+02, 2.90867431640625e+02, 2.941568298339844e+02, 2.944860534667969e+02, 2.946612854003906e+02, 2.948378601074219e+02, 2.950147399902344e+02, 2.951897583007812e+02, 2.953734741210938e+02, 2.955687561035156e+02, 2.95774169921875e+02, 2.959894409179688e+02, 2.962242736816406e+02, 2.965107116699219e+02, 2.968928833007812e+02, 2.975822448730469e+02, 2.989706726074219e+02, 3.040387268066406e+02, 3.313504028320312e+02, 3.528372497558594e+02, 3.386445617675781e+02, 3.205668029785156e+02, 3.146877746582031e+02, 3.121414794921875e+02, 3.10636962890625e+02, 3.09927001953125e+02, 3.0983349609375e+02, 3.101619262695312e+02, 3.104875183105469e+02, 3.105058898925781e+02, 3.101812438964844e+02, 3.098133239746094e+02, 3.097652893066406e+02, 3.0982568359375e+02, 3.058333435058594e+02, 2.94423828125e+02, 2.930054321289062e+02, 2.929783935546875e+02, 2.929893188476562e+02, 2.930006408691406e+02, 2.930086975097656e+02, 2.930135498046875e+02, 2.930147399902344e+02, 2.930122375488281e+02, 2.930068969726562e+02, 2.929983825683594e+02, 2.929859008789062e+02, 2.929678039550781e+02, 2.929403076171875e+02, 2.928898620605469e+02, 2.927552795410156e+02, 2.917400817871094e+02, 2.9019873046875e+02, 2.867106018066406e+02, 2.836216735839844e+02, 2.830302124023438e+02, 2.829971313476562e+02, 2.830296325683594e+02, 2.830666809082031e+02, 2.8307568359375e+02, 2.830457153320312e+02, 2.829956359863281e+02, 2.829356689453125e+02, 2.828689270019531e+02, 2.827953796386719e+02, 2.827079772949219e+02, 2.825930480957031e+02, 2.824178771972656e+02]
-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]
+solCol.vol[3].T=[2.931499938964844e+02, 2.920088806152344e+02, 2.92182861328125e+02, 2.924005126953125e+02, 2.925002746582031e+02, 2.925581359863281e+02, 2.9259375e+02, 2.926148071289062e+02, 2.926249084472656e+02, 2.926251220703125e+02, 2.926129760742188e+02, 2.925880432128906e+02, 2.925487976074219e+02, 2.924910583496094e+02, 2.924026184082031e+02, 2.922551879882812e+02, 2.919652099609375e+02, 2.907052612304688e+02, 2.8315966796875e+02, 2.830168762207031e+02, 2.830265808105469e+02, 2.830322875976562e+02, 2.830377807617188e+02, 2.830426635742188e+02, 2.830469360351562e+02, 2.830503540039062e+02, 2.830544738769531e+02, 2.830606079101562e+02, 2.830662841796875e+02, 2.830684814453125e+02, 2.830656433105469e+02, 2.830785522460938e+02, 2.831708679199219e+02, 2.836784057617188e+02, 2.86162353515625e+02, 2.952066345214843e+02, 2.966784973144531e+02, 2.971533813476562e+02, 2.976360778808594e+02, 2.981170654296875e+02, 2.9859130859375e+02, 2.99083984375e+02, 2.996069946289062e+02, 3.00155517578125e+02, 3.007279663085938e+02, 3.013447875976562e+02, 3.020827941894531e+02, 3.030349426269531e+02, 3.046984558105469e+02, 3.078059997558594e+02, 3.161016845703125e+02, 2.979342041015625e+02, 2.893954162597656e+02, 2.882162475585938e+02, 2.87604736328125e+02, 2.872316284179688e+02, 2.869899291992188e+02, 2.868474426269531e+02, 2.868118591308594e+02, 2.868368225097656e+02, 2.869092407226562e+02, 2.86946533203125e+02, 2.86927978515625e+02, 2.868842468261719e+02, 2.868948669433594e+02, 2.870414123535156e+02, 2.872420654296875e+02, 2.909888610839844e+02, 2.954678039550781e+02, 2.927665710449219e+02, 2.926858520507812e+02, 2.927153625488281e+02, 2.927463073730469e+02, 2.927687072753906e+02, 2.927824401855469e+02, 2.927865295410156e+02, 2.927805480957031e+02, 2.927669677734375e+02, 2.927451782226562e+02, 2.927132263183594e+02, 2.926674194335938e+02, 2.925998229980469e+02, 2.924830932617188e+02, 2.922240600585938e+02, 2.877989196777344e+02, 2.831725769042969e+02, 2.831389465332031e+02, 2.831294250488281e+02, 2.83126953125e+02, 2.831311340332031e+02, 2.831371459960938e+02, 2.831407470703125e+02, 2.8313818359375e+02, 2.831316528320312e+02, 2.831235046386719e+02, 2.831140747070312e+02, 2.831033935546875e+02, 2.830904541015625e+02, 2.83072021484375e+02, 2.830390625e+02, 2.829216613769531e+02]
+solCol.vol[6].T=[2.931499938964844e+02, 2.923529357910156e+02, 2.926210632324219e+02, 2.927261962890625e+02, 2.927793579101562e+02, 2.9281103515625e+02, 2.928306579589844e+02, 2.928421936035156e+02, 2.928475646972656e+02, 2.928471374511719e+02, 2.928394165039062e+02, 2.928241271972656e+02, 2.9280029296875e+02, 2.927649536132812e+02, 2.92709716796875e+02, 2.926142272949219e+02, 2.924083557128906e+02, 2.914356994628906e+02, 2.847609558105469e+02, 2.828863220214844e+02, 2.829043884277344e+02, 2.829158935546875e+02, 2.829266967773438e+02, 2.829364624023438e+02, 2.829450073242188e+02, 2.829519348144531e+02, 2.82959716796875e+02, 2.829717102050781e+02, 2.829832458496094e+02, 2.829886169433594e+02, 2.829830627441406e+02, 2.830032043457031e+02, 2.831431884765625e+02, 2.838665161132812e+02, 2.879019165039063e+02, 2.948712158203125e+02, 2.952271728515625e+02, 2.954942321777344e+02, 2.957675170898438e+02, 2.9604150390625e+02, 2.963125305175781e+02, 2.965971984863281e+02, 2.968998718261719e+02, 2.972183227539062e+02, 2.975519714355469e+02, 2.979158935546875e+02, 2.983597106933594e+02, 2.989510192871094e+02, 3.000152587890625e+02, 3.0213232421875e+02, 3.093583984375e+02, 3.208563842773438e+02, 2.963608093261719e+02, 2.933755493164062e+02, 2.920699462890625e+02, 2.91293701171875e+02, 2.907957458496094e+02, 2.904952087402344e+02, 2.904096984863281e+02, 2.904509582519531e+02, 2.905906066894531e+02, 2.906685180664062e+02, 2.906373596191406e+02, 2.905436096191406e+02, 2.905369567871094e+02, 2.907620239257812e+02, 2.910567016601562e+02, 2.945724487304688e+02, 2.940154113769531e+02, 2.92876708984375e+02, 2.928835754394531e+02, 2.929010009765625e+02, 2.929185791015625e+02, 2.929310913085938e+02, 2.929385681152344e+02, 2.929403991699219e+02, 2.929364929199219e+02, 2.929281921386719e+02, 2.929150085449219e+02, 2.928955993652344e+02, 2.928675537109375e+02, 2.928250732421875e+02, 2.927477111816406e+02, 2.925503234863281e+02, 2.912494506835938e+02, 2.836165161132812e+02, 2.831319885253906e+02, 2.831109008789062e+02, 2.83104248046875e+02, 2.83111572265625e+02, 2.831235046386719e+02, 2.8313134765625e+02, 2.831275024414062e+02, 2.831148986816406e+02, 2.830990905761719e+02, 2.830807189941406e+02, 2.830600891113281e+02, 2.8303564453125e+02, 2.83001953125e+02, 2.829462585449219e+02, 2.828022155761719e+02]
+solCol.vol[9].T=[2.931499938964844e+02, 2.929591674804688e+02, 2.930217895507812e+02, 2.93044921875e+02, 2.930574340820312e+02, 2.930650329589844e+02, 2.930697631835938e+02, 2.930725402832031e+02, 2.930737609863281e+02, 2.930735168457031e+02, 2.930713806152344e+02, 2.930672912597656e+02, 2.930609436035156e+02, 2.930514526367188e+02, 2.930362854003906e+02, 2.930088195800781e+02, 2.929409484863281e+02, 2.920398254394531e+02, 2.878099670410156e+02, 2.828258666992188e+02, 2.82783203125e+02, 2.828008422851562e+02, 2.828168334960938e+02, 2.828313903808594e+02, 2.828442077636719e+02, 2.828547058105469e+02, 2.828658447265625e+02, 2.828833312988281e+02, 2.829007873535156e+02, 2.829100646972656e+02, 2.829032592773438e+02, 2.829263916015625e+02, 2.830929260253906e+02, 2.839198303222656e+02, 2.928136291503906e+02, 2.936186828613281e+02, 2.936842346191406e+02, 2.937503051757812e+02, 2.938180236816406e+02, 2.938863220214844e+02, 2.939541931152344e+02, 2.940261535644531e+02, 2.941028137207031e+02, 2.941837463378906e+02, 2.942688903808594e+02, 2.943630676269531e+02, 2.944802551269531e+02, 2.946419067382812e+02, 2.949431457519531e+02, 2.955956726074219e+02, 2.999102172851562e+02, 3.273375854492188e+02, 3.058724060058594e+02, 2.986751403808594e+02, 2.965566101074219e+02, 2.953408203125e+02, 2.945702514648438e+02, 2.940975952148438e+02, 2.939465942382812e+02, 2.939951171875e+02, 2.941957092285156e+02, 2.943157653808594e+02, 2.9427880859375e+02, 2.941338500976562e+02, 2.940882568359375e+02, 2.943355102539062e+02, 2.946805725097656e+02, 2.953063659667969e+02, 2.932301330566406e+02, 2.930783081054688e+02, 2.930830993652344e+02, 2.930876159667969e+02, 2.930919494628906e+02, 2.930950012207031e+02, 2.930967712402344e+02, 2.930971069335938e+02, 2.930960083007812e+02, 2.930937805175781e+02, 2.930903015136719e+02, 2.930851440429688e+02, 2.930776062011719e+02, 2.930658264160156e+02, 2.930428771972656e+02, 2.92968017578125e+02, 2.918729553222656e+02, 2.855220642089844e+02, 2.831377563476562e+02, 2.830947875976562e+02, 2.830823059082031e+02, 2.830914306640625e+02, 2.831090698242188e+02, 2.831216430664062e+02, 2.831177368164062e+02, 2.830996704101562e+02, 2.830766296386719e+02, 2.830498352050781e+02, 2.830198364257812e+02, 2.829849853515625e+02, 2.829384765625e+02, 2.82865966796875e+02, 2.827080383300781e+02]
+solCol.m_flow=[0e+00, -9.511709213256836e-02, -1.333192437887192e-01, -1.608450263738632e-01, -1.818013489246368e-01, -1.976397335529327e-01, -2.090153694152832e-01, -2.162538766860962e-01, -2.195161730051041e-01, -2.188650369644165e-01, -2.142883688211441e-01, -2.056948840618134e-01, -1.92879244685173e-01, -1.754323393106461e-01, -1.525133848190307e-01, -1.221480742096901e-01, -7.779085636138916e-02, 5.273890495300311e-02, 1.095782816410065e-01, 1.433797180652618e-01, 1.684630960226059e-01, 1.876073479652405e-01, 2.01906830072403e-01, 2.118774354457855e-01, 2.177783399820328e-01, 2.197330743074417e-01, 2.177783399820328e-01, 2.118774354457855e-01, 2.019068300724029e-01, 1.876073479652405e-01, 1.684630960226059e-01, 1.433797180652618e-01, 1.095782816410065e-01, 5.273890495300293e-02, -7.779085636138938e-02, -1.221480742096899e-01, -1.525133848190308e-01, -1.754323393106461e-01, -1.92879244685173e-01, -2.056948840618134e-01, -2.142883688211441e-01, -2.188650369644165e-01, -2.195161730051041e-01, -2.162538766860962e-01, -2.090153694152832e-01, -1.976397335529327e-01, -1.818013489246368e-01, -1.608450263738632e-01, -1.333192437887192e-01, -9.511709213256836e-02, 0e+00, 9.511709213256836e-02, 1.333192437887192e-01, 1.608450263738632e-01, 1.818013489246368e-01, 1.976397335529329e-01, 2.090153694152833e-01, 2.162538766860961e-01, 2.195161730051041e-01, 2.188650369644165e-01, 2.142883688211441e-01, 2.056948840618134e-01, 1.92879244685173e-01, 1.754323393106461e-01, 1.525133848190308e-01, 1.221480742096901e-01, 7.779085636138916e-02, -5.273890495300293e-02, -1.095782816410068e-01, -1.433797180652616e-01, -1.684630960226057e-01, -1.876073479652405e-01, -2.01906830072403e-01, -2.118774354457855e-01, -2.177783399820328e-01, -2.197330743074417e-01, -2.177783399820328e-01, -2.118774354457855e-01, -2.01906830072403e-01, -1.876073479652405e-01, -1.684630960226059e-01, -1.433797180652618e-01, -1.095782816410065e-01, -5.273890495300293e-02, 7.779085636138916e-02, 1.221480742096901e-01, 1.525133848190308e-01, 1.754323393106461e-01, 1.92879244685173e-01, 2.056948840618134e-01, 2.142883688211441e-01, 2.188650369644165e-01, 2.195161730051041e-01, 2.162538766860962e-01, 2.090153694152832e-01, 1.976397335529327e-01, 1.818013489246368e-01, 1.608450263738632e-01, 1.333192437887192e-01, 9.511709213256836e-02, 0e+00]
diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
index ec05fd48020..cb8395e4b3f 100644
--- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml
+++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
@@ -423,6 +423,10 @@
   openmodelica:
     comment: Timeout on travis, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/604300629#L376
     simulate: false
+- model_name: Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx.Case995
+  openmodelica:
+    comment: Timeout on travis, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/614899187
+    time_out: 600
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones1
   dymola:
     comment: Requires docker update to Ubuntu 22.04 due to libgc.
diff --git a/Buildings/package.mo b/Buildings/package.mo
index 19bd0761054..780b107c754 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -308,12 +308,16 @@ The following <b style=\"color:red\">critical errors</b> have been fixed (i.e.,
 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 implementation of pressure drop calculation for the situation where the collectors are in parallel,
+                       e.g., if <code>sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.
     </td>
 </tr>
 </table>

xxx +
Buildings.Fluid.SolarCollectors
xxx +
Buildings.Fluid.SolarCollectors.ASHRAE93 + Buildings.Fluid.SolarCollectors.EN12975	xxx. +	Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel, + e.g., if `sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel`. + This is for + Buildings, #3597.