From 7117c820f1a94a719ee14a5334998e6987d2a0e4 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Fri, 22 Sep 2023 11:54:28 -0700 Subject: [PATCH] Simplified pressure drop calculation This leads to a 1x1 rather than a 2x2 nonlinear system of equations during the initialization --- IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo | 165 ++++++++++-------- ...thermal_Aquifer_Examples_CoolingOffice.txt | 8 +- ...thermal_Aquifer_Validation_NumberWells.txt | 6 +- ...rmal_Aquifer_Validation_SimulationTest.txt | 8 +- 4 files changed, 104 insertions(+), 83 deletions(-) diff --git a/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo b/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo index 5e0e6b4980..1ae1ac3a1e 100644 --- a/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo +++ b/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo @@ -34,10 +34,10 @@ model MultiWell "Model of a single well for aquifer thermal energy storage" m_flow_nominal*Modelica.Constants.g_n/2/Modelica.Constants.pi/h/aquDat.K*log(rMax/rWB) "Pressure drop at nominal mass flow rate in the aquifer" annotation ( Dialog(group="Hydraulic circuit")); - final parameter Modelica.Units.SI.PressureDifference dpWell_nominal(displayUnit="Pa")= - resHot.dp_nominal+resCol.dp_nominal - "Pressure drop at nominal mass flow rate in the well" annotation ( - Dialog(group="Hydraulic circuit")); + final parameter Modelica.Units.SI.PressureDifference dpWell_nominal( + displayUnit="Pa") = 2*resWelCol.dp_nominal + "Pressure drop at nominal mass flow rate in the well" + annotation (Dialog(group="Hydraulic circuit")); parameter Modelica.Units.SI.PressureDifference dpExt_nominal(displayUnit="Pa") "Pressure drop at nominal mass flow rate in the above-surface system (used to size the head of the well pump)" annotation ( Dialog(group="Hydraulic circuit")); @@ -72,23 +72,22 @@ model MultiWell "Model of a single well for aquifer thermal energy storage" Movers.Preconfigured.SpeedControlled_y pumCol( redeclare final package Medium = Medium, final m_flow_nominal=m_flow_nominal/nPai, - final dp_nominal=powCol.dpMea_nominal + powHot.dpMea_nominal + resCol.dp_nominal + resHot.dp_nominal + - dpExt_nominal) - "Pump to extract from cold well" annotation (Placement(transformation( + final dp_nominal=2*(resAquCol.dpMea_nominal + resWelCol.dp_nominal) + + dpExt_nominal) "Pump to extract from cold well" annotation (Placement( + transformation( extent={{-10,10},{10,-10}}, rotation=90, origin={-80,0}))); Movers.Preconfigured.SpeedControlled_y pumHot( redeclare final package Medium = Medium, - final m_flow_nominal=m_flow_nominal/nPai, - final dp_nominal=powCol.dpMea_nominal + powHot.dpMea_nominal + resCol.dp_nominal + resHot.dp_nominal + - dpExt_nominal) - "Pump to extract from hot well" annotation (Placement(transformation( + final m_flow_nominal=pumCol.m_flow_nominal, + final dp_nominal=pumCol.dp_nominal) "Pump to extract from hot well" + annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=90, origin={80,0}))); - Airflow.Multizone.Point_m_flow powCol( + Airflow.Multizone.Point_m_flow resAquCol( redeclare final package Medium = Medium, m=1, final dpMea_nominal=dpAquifer_nominal/2/nPai, @@ -99,11 +98,12 @@ model MultiWell "Model of a single well for aquifer thermal energy storage" rotation=-90, origin={-80,-30}))); - FixedResistances.PressureDrop resCol( + FixedResistances.PressureDrop resWelCol( redeclare final package Medium = Medium, m_flow_nominal=m_flow_nominal/nPai, final from_dp=false, - dp_nominal=Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow( + dp_nominal= + Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow( m_flow=m_flow_nominal/nPai, rho_a=rhoWat, rho_b=rhoWat, @@ -111,37 +111,35 @@ model MultiWell "Model of a single well for aquifer thermal energy storage" mu_b=mu, length=length, diameter=rWB, - roughness=2.5e-5)) - "Pressure drop in the cold well" annotation ( + roughness=2.5e-5)) "Pressure drop in the cold well" annotation ( Placement(transformation( extent={{10,-10},{-10,10}}, rotation=-90, origin={-80,30}))); - Airflow.Multizone.Point_m_flow powHot( + + // The resistances on the hot side are set to be the negative of the cold + // side, as they have the same geometry and flow rate. + // This reduces the size of the nonlinear system of equations, + // and leads to fewer equations in the model. + Movers.BaseClasses.IdealSource resAquHot( redeclare final package Medium = Medium, - m=1, - final dpMea_nominal=dpAquifer_nominal/2/nPai, - final mMea_flow_nominal=m_flow_nominal/nPai) + final allowFlowReversal=true, + final control_m_flow=false, + final control_dp=true, + final m_flow_small=1E-4*abs(m_flow_nominal)) "Pressure drop in the warm side of the aquifer" annotation (Placement( transformation( extent={{10,10},{-10,-10}}, rotation=-90, origin={80,-30}))); - FixedResistances.PressureDrop resHot( + Movers.BaseClasses.IdealSource resWelHot( redeclare final package Medium = Medium, - m_flow_nominal=m_flow_nominal/nPai, - final from_dp=false, - dp_nominal=Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow( - m_flow=m_flow_nominal/nPai, - rho_a=rhoWat, - rho_b=rhoWat, - mu_a=mu, - mu_b=mu, - length=length, - diameter=rWB, - roughness=2.5e-5)) - "Pressure drop in the warm well" annotation ( - Placement(transformation( + final allowFlowReversal=true, + final control_m_flow=false, + final control_dp=true, + final m_flow_small=1E-4*abs(m_flow_nominal)) + "Pressure drop in the warm well" annotation (Placement( + transformation( extent={{10,10},{-10,-10}}, rotation=-90, origin={80,30}))); @@ -161,6 +159,16 @@ model MultiWell "Model of a single well for aquifer thermal energy storage" Modelica.Blocks.Math.Add addPum "Sum of pump electrical power" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); + Sensors.RelativePressure dpAquCol(redeclare package Medium = Medium) + "Pressure drop of cold aquifer" annotation (Placement(transformation( + extent={{10,-10},{-10,10}}, + rotation=90, + origin={-62,-32}))); + Sensors.RelativePressure dpWelCol(redeclare package Medium = Medium) + "Pressure drop of cold well" annotation (Placement(transformation( + extent={{10,-10},{-10,10}}, + rotation=90, + origin={-60,30}))); protected parameter Modelica.Units.SI.Radius r[nVol + 1](each fixed=false) "Radius to the boundary of the i-th domain"; @@ -198,7 +206,7 @@ protected final V=VWat, each nPorts=2) "Array of fluid volumes representing the fluid flow in the cold side of the aquifer" - annotation (Placement(transformation(extent={{-40,-30},{-60,-10}}))); + annotation (Placement(transformation(extent={{-24,-40},{-4,-20}}))); Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heaCapCol[nVol](C=C, each T(start=TCol_start, fixed=true)) @@ -215,7 +223,7 @@ protected V=VWat, each nPorts=2) "Array of fluid volumes representing the fluid flow in the warm side of the aquifer" - annotation (Placement(transformation(extent={{40,-30},{60,-10}}))); + annotation (Placement(transformation(extent={{24,-40},{4,-20}}))); Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heaCapHot[nVol](C=C, each T(start=THot_start, fixed=true)) "Array of thermal capacitor in the warm side of the aquifer" @@ -234,11 +242,11 @@ protected annotation (Placement(transformation(extent={{90,-90},{70,-70}}))); Modelica.Blocks.Nonlinear.Limiter limCol(final uMax=1, final uMin=0) "Limiter for pump signal" - annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); + annotation (Placement(transformation(extent={{-30,-10},{-50,10}}))); Modelica.Blocks.Math.Gain gaiCon(final k=-1) "Inversion of control signal" - annotation (Placement(transformation(extent={{-8,20},{12,40}}))); + annotation (Placement(transformation(extent={{-6,-10},{14,10}}))); Modelica.Blocks.Nonlinear.Limiter limHot(final uMax=1, final uMin=0) "Limiter for pump signal" - annotation (Placement(transformation(extent={{30,20},{50,40}}))); + annotation (Placement(transformation(extent={{30,-10},{50,10}}))); Modelica.Blocks.Math.Gain gaiPum(final k=nPai) "Gain used to scale the pump electrical power" annotation (Placement(transformation(extent={{20,60},{40,80}}))); @@ -296,51 +304,64 @@ equation connect(groTemCol.port, theResCol[nVol].port_b) annotation (Line(points={{-70,-80},{-60,-80}}, color={191,0,0})); - connect(volCol.heatPort, heaCapCol.port) annotation (Line(points={{-40,-20},{-28,-20},{-28,-80},{-12,-80}}, - color={191,0,0})); - connect(theResCol.port_a, volCol.heatPort) annotation (Line(points={{-40,-80},{-28,-80},{-28,-20},{-40,-20}}, + connect(volCol.heatPort, heaCapCol.port) annotation (Line(points={{-24,-30},{-28, + -30},{-28,-80},{-12,-80}},color={191,0,0})); + connect(theResCol.port_a, volCol.heatPort) annotation (Line(points={{-40,-80}, + {-28,-80},{-28,-30},{-24,-30}}, color={191,0,0})); connect(groTemHot.port, theResHot[nVol].port_b) annotation (Line(points={{70,-80},{60,-80}}, color={191,0,0})); - connect(volHot.heatPort, heaCapHot.port) annotation (Line(points={{40,-20},{30,-20},{30,-80},{12,-80}}, - color={191,0,0})); - connect(theResHot.port_a, volHot.heatPort) annotation (Line(points={{40,-80},{30,-80},{30,-20},{40,-20}}, + connect(volHot.heatPort, heaCapHot.port) annotation (Line(points={{24,-30},{30, + -30},{30,-80},{12,-80}},color={191,0,0})); + connect(theResHot.port_a, volHot.heatPort) annotation (Line(points={{40,-80},{ + 30,-80},{30,-30},{24,-30}}, color={191,0,0})); - connect(powCol.port_a, volCol[1].ports[1]) annotation (Line(points={{-80,-40}, - {-80,-54},{-49,-54},{-49,-30}}, - color={0,127,255})); - connect(powHot.port_a, volHot[1].ports[1]) annotation (Line(points={{80,-40},{ - 80,-54},{49,-54},{49,-30}}, - color={0,127,255})); - connect(volCol[nVol].ports[2], volHot[nVol].ports[2]) annotation (Line(points={{-51,-30}, - {-48,-30},{-48,-40},{51,-40},{51,-30}}, + connect(resAquCol.port_a, volCol[1].ports[1]) annotation (Line(points={{-80,-40}, + {-80,-54},{-15,-54},{-15,-40}}, color={0,127,255})); + connect(resAquHot.port_a, volHot[1].ports[1]) annotation (Line(points={{80,-40}, + {80,-54},{15,-54},{15,-40}}, color={0,127,255})); + connect(volCol[nVol].ports[2], volHot[nVol].ports[2]) annotation (Line(points={{-13,-40}, + {-12,-40},{-12,-54},{13,-54},{13,-40}}, color={0,127,255})); - connect(powCol.port_b,pumCol. port_a) - annotation (Line(points={{-80,-20},{-80,-10}}, - color={0,127,255})); - connect(pumCol.port_b, resCol.port_a) + connect(resAquCol.port_b, pumCol.port_a) + annotation (Line(points={{-80,-20},{-80,-10}}, color={0,127,255})); + connect(pumCol.port_b, resWelCol.port_a) annotation (Line(points={{-80,10},{-80,20}}, color={0,127,255})); - connect(resHot.port_a,pumHot. port_b) + connect(resWelHot.port_a, pumHot.port_b) annotation (Line(points={{80,20},{80,10}}, color={0,127,255})); - connect(powHot.port_b,pumHot. port_a) - annotation (Line(points={{80,-20},{80,-10}}, - color={0,127,255})); - connect(limCol.y, pumCol.y) annotation (Line(points={{-39,30},{-30,30},{-30,0},{-68,0}}, color={0,0,127})); - connect(gaiCon.y, limHot.u) annotation (Line(points={{13,30},{28,30}}, color={0,0,127})); - connect(limHot.y, pumHot.y) annotation (Line(points={{51,30},{60,30},{60,0},{68,0}}, color={0,0,127})); - connect(gaiCon.u, u) annotation (Line(points={{-10,30},{-20,30},{-20,50},{-98, - 50},{-98,0},{-120,0}}, color={0,0,127})); - connect(limCol.u, u) annotation (Line(points={{-62,30},{-68,30},{-68,50},{-98, - 50},{-98,0},{-120,0}}, color={0,0,127})); - connect(resCol.port_b, mulCol.port_a) annotation (Line(points={{-80,40},{-80,60}}, color={0,127,255})); + connect(resAquHot.port_b, pumHot.port_a) + annotation (Line(points={{80,-20},{80,-10}}, color={0,127,255})); + connect(limCol.y, pumCol.y) annotation (Line(points={{-51,0},{-68,0}}, color={0,0,127})); + connect(gaiCon.y, limHot.u) annotation (Line(points={{15,0},{28,0}}, color={0,0,127})); + connect(limHot.y, pumHot.y) annotation (Line(points={{51,0},{68,0}}, color={0,0,127})); + connect(gaiCon.u, u) annotation (Line(points={{-8,0},{-20,0},{-20,50},{-98,50}, + {-98,0},{-120,0}}, color={0,0,127})); + connect(limCol.u, u) annotation (Line(points={{-28,0},{-20,0},{-20,50},{-98,50}, + {-98,0},{-120,0}}, color={0,0,127})); + connect(resWelCol.port_b, mulCol.port_a) + annotation (Line(points={{-80,40},{-80,60}}, color={0,127,255})); connect(mulCol.port_b, port_Col) annotation (Line(points={{-80,80},{-80,90},{-60,90},{-60,100}}, color={0,127,255})); connect(mulHot.port_b, port_Hot) annotation (Line(points={{80,80},{80,88},{60,88},{60,100}}, color={0,127,255})); - connect(resHot.port_b, mulHot.port_a) annotation (Line(points={{80,40},{80,60}}, color={0,127,255})); + connect(resWelHot.port_b, mulHot.port_a) + annotation (Line(points={{80,40},{80,60}}, color={0,127,255})); connect(pumCol.P, addPum.u1) annotation (Line(points={{-71,11},{-71,54},{-60,54},{-60,76},{-42,76}}, color={0,0,127})); connect(addPum.y, gaiPum.u) annotation (Line(points={{-19,70},{18,70}}, color={0,0,127})); - connect(pumHot.P, addPum.u2) annotation (Line(points={{71,11},{71,54},{-50,54},{-50,64},{-42,64}}, color={0,0,127})); + connect(pumHot.P, addPum.u2) annotation (Line(points={{71,11},{71,20},{-40,20}, + {-40,54},{-50,54},{-50,64},{-42,64}}, color={0,0,127})); connect(gaiPum.y, PTot) annotation (Line(points={{41,70},{60,70},{60,50},{110,50}}, color={0,0,127})); + connect(dpAquCol.p_rel, resAquHot.dp_in) annotation (Line(points={{-53,-32},{-46, + -32},{-46,-16},{62,-16},{62,-24},{72,-24}}, color={0,0,127})); + connect(dpAquCol.port_b, resAquCol.port_a) annotation (Line(points={{-62,-42}, + {-62,-46},{-80,-46},{-80,-40}}, color={0,127,255})); + connect(dpAquCol.port_a, resAquCol.port_b) annotation (Line(points={{-62,-22}, + {-62,-14},{-80,-14},{-80,-20}}, color={0,127,255})); + connect(dpWelCol.port_a, resWelCol.port_b) annotation (Line(points={{-60,40},{ + -60,46},{-80,46},{-80,40}}, color={0,127,255})); + connect(dpWelCol.port_b, resWelCol.port_a) annotation (Line(points={{-60,20},{ + -60,16},{-80,16},{-80,20}}, color={0,127,255})); + connect(dpWelCol.p_rel, resWelHot.dp_in) annotation (Line(points={{-51,30},{60, + 30},{60,36},{72,36}}, color={0,0,127})); annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ Rectangle( extent={{-20,100},{20,-2}}, @@ -499,7 +520,7 @@ in the discretized domain. The location of the thermal capacitance is expressed ", revisions=" diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt index 21f9fd861a..82c2f157b6 100644 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt +++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt @@ -1,15 +1,15 @@ -last-generated=2023-08-18 +last-generated=2023-09-22 statistics-initialization= { - "nonlinear": "2", + "nonlinear": "1", "numerical Jacobians": "0" } statistics-simulation= { "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1", - "number of continuous time states": "169", + "number of continuous time states": "168", "numerical Jacobians": "0" } time=[0e+00, 7.776e+06] -aquWel.TAquHot[50]=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851502990722656e+02, 2.851534423828125e+02, 2.851678771972656e+02, 2.852070617675781e+02, 2.852838745117188e+02, 2.854053649902344e+02, 2.855707702636719e+02, 2.85773193359375e+02, 2.860020446777344e+02, 2.862460327148438e+02, 2.864948120117188e+02, 2.867401428222656e+02, 2.869757690429688e+02, 2.871974487304688e+02, 2.874027404785156e+02, 2.875905456542969e+02, 2.877608032226562e+02, 2.879140625e+02, 2.880512084960938e+02, 2.881732177734375e+02, 2.882815856933594e+02, 2.883774108886719e+02, 2.884623718261719e+02, 2.885373840332031e+02, 2.886037902832031e+02, 2.886623840332031e+02, 2.887142028808594e+02, 2.887601013183594e+02, 2.888005676269531e+02, 2.888365173339844e+02, 2.888684387207031e+02, 2.88896728515625e+02, 2.889219055175781e+02, 2.889443359375e+02, 2.889642944335938e+02, 2.889820861816406e+02, 2.889979248046875e+02, 2.890120849609375e+02, 2.890247192382812e+02, 2.890360107421875e+02, 2.89046142578125e+02, 2.890552673339844e+02, 2.890634765625e+02, 2.890708923339844e+02, 2.8907763671875e+02, 2.89083740234375e+02, 2.890892639160156e+02, 2.890942993164062e+02, 2.890989379882812e+02, 2.891031494140625e+02, 2.891069946289062e+02, 2.891105041503906e+02, 2.891136169433594e+02, 2.891165771484375e+02, 2.891192626953125e+02, 2.891217346191406e+02, 2.891239318847656e+02, 2.891258850097656e+02, 2.891277465820312e+02, 2.891294860839844e+02, 2.891310424804688e+02, 2.891324462890625e+02, 2.891337280273438e+02, 2.891349182128906e+02, 2.891360168457031e+02, 2.891370544433594e+02, 2.891379699707031e+02, 2.891388549804688e+02, 2.891396789550781e+02, 2.891404418945312e+02, 2.891411437988281e+02, 2.891417846679688e+02, 2.891424255371094e+02, 2.891429748535156e+02, 2.891435241699219e+02, 2.891440124511719e+02, 2.891444702148438e+02, 2.891449279785156e+02, 2.891453552246094e+02, 2.891457214355469e+02, 2.891460876464844e+02, 2.891464538574219e+02, 2.891467590332031e+02, 2.891470336914062e+02, 2.891473083496094e+02, 2.891475830078125e+02, 2.891478271484375e+02, 2.891480712890625e+02, 2.891482849121094e+02, 2.891484680175781e+02, 2.891486511230469e+02, 2.891488342285156e+02, 2.891489868164062e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494445800781e+02, 2.891495666503906e+02, 2.891496887207031e+02] +aquWel.TAquHot[50]=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851503601074219e+02, 2.851541442871094e+02, 2.851709594726562e+02, 2.852155151367188e+02, 2.853010864257812e+02, 2.854338989257812e+02, 2.856117858886719e+02, 2.858262023925781e+02, 2.860653381347656e+02, 2.863170166015625e+02, 2.865707397460938e+02, 2.868182678222656e+02, 2.870536499023438e+02, 2.872730712890625e+02, 2.874745483398438e+02, 2.876573791503906e+02, 2.878218688964844e+02, 2.879689025878906e+02, 2.880995788574219e+02, 2.88215087890625e+02, 2.883170166015625e+02, 2.8840673828125e+02, 2.884857788085938e+02, 2.885553283691406e+02, 2.886164855957031e+02, 2.886702575683594e+02, 2.887176208496094e+02, 2.887593078613281e+02, 2.887959899902344e+02, 2.888284912109375e+02, 2.888571166992188e+02, 2.888824462890625e+02, 2.889049377441406e+02, 2.889248352050781e+02, 2.889425048828125e+02, 2.889581604003906e+02, 2.889721069335938e+02, 2.889844970703125e+02, 2.889955444335938e+02, 2.8900537109375e+02, 2.890141906738281e+02, 2.890221252441406e+02, 2.890292358398438e+02, 2.8903564453125e+02, 2.890414733886719e+02, 2.890467529296875e+02, 2.89051513671875e+02, 2.890558471679688e+02, 2.89059814453125e+02, 2.890634155273438e+02, 2.890666809082031e+02, 2.890696105957031e+02, 2.890723266601562e+02, 2.890748291015625e+02, 2.890770874023438e+02, 2.890791320800781e+02, 2.890809020996094e+02, 2.890826416015625e+02, 2.890841979980469e+02, 2.890856018066406e+02, 2.890868835449219e+02, 2.890880432128906e+02, 2.890891418457031e+02, 2.890901184082031e+02, 2.890910339355469e+02, 2.890918884277344e+02, 2.890926818847656e+02, 2.890933837890625e+02, 2.890940551757812e+02, 2.890946960449219e+02, 2.890952758789062e+02, 2.890958251953125e+02, 2.890963439941406e+02, 2.890968017578125e+02, 2.890972290039062e+02, 2.890976257324219e+02, 2.890980224609375e+02, 2.89098388671875e+02, 2.890987243652344e+02, 2.890990600585938e+02, 2.89099365234375e+02, 2.89099609375e+02, 2.89099853515625e+02, 2.8910009765625e+02, 2.89100341796875e+02, 2.891005554199219e+02, 2.891007385253906e+02, 2.891009216308594e+02, 2.891011047363281e+02, 2.891012573242188e+02, 2.891013793945312e+02, 2.891015319824219e+02, 2.891016845703125e+02, 2.89101806640625e+02, 2.891018981933594e+02, 2.891020202636719e+02, 2.891021118164062e+02, 2.891022033691406e+02] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt index f6f5534d1e..222c96cf1d 100644 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt +++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt @@ -1,14 +1,14 @@ -last-generated=2023-08-18 +last-generated=2023-09-22 statistics-initialization= { - "nonlinear": "2, 2", + "nonlinear": "1, 1", "numerical Jacobians": "0" } statistics-simulation= { "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 1", - "number of continuous time states": "216", + "number of continuous time states": "214", "numerical Jacobians": "0" } time=[0e+00, 3.1536e+07] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt index 5f141aa8f3..32b7832e9f 100644 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt +++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt @@ -1,15 +1,15 @@ -last-generated=2023-08-18 +last-generated=2023-09-22 statistics-initialization= { - "nonlinear": "2", + "nonlinear": "1", "numerical Jacobians": "0" } statistics-simulation= { "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1", - "number of continuous time states": "472", + "number of continuous time states": "471", "numerical Jacobians": "0" } time=[0e+00, 3.1536e+07] -aquWel.TAquCol[150]=[3.071499938964844e+02, 3.300256652832031e+02, 3.467880859375e+02, 3.557322692871094e+02, 3.613472595214844e+02, 3.652436828613281e+02, 3.681313171386719e+02, 3.703708190917969e+02, 3.72166748046875e+02, 3.736461486816406e+02, 3.748895263671875e+02, 3.759508666992188e+02, 3.768695068359375e+02, 3.776741943359375e+02, 3.783861083984375e+02, 3.790213012695312e+02, 3.795921020507812e+02, 3.801081848144531e+02, 3.805773315429688e+02, 3.810062255859375e+02, 3.814002990722656e+02, 3.817638854980469e+02, 3.821007080078125e+02, 3.8241357421875e+02, 3.827052917480469e+02, 3.829777221679688e+02, 3.832330017089844e+02, 3.834726257324219e+02, 3.836982116699219e+02, 3.839109802246094e+02, 3.841120910644531e+02, 3.843026123046875e+02, 3.844833374023438e+02, 3.841596374511719e+02, 3.8021875e+02, 3.767701110839844e+02, 3.737872009277344e+02, 3.711509704589844e+02, 3.687839050292969e+02, 3.666337280273438e+02, 3.646632995605469e+02, 3.628455200195312e+02, 3.611594543457031e+02, 3.595884094238281e+02, 3.581187438964844e+02, 3.567393493652344e+02, 3.554410705566406e+02, 3.542160034179688e+02, 3.530574340820312e+02, 3.519594421386719e+02, 3.503777160644531e+02, 3.486578979492188e+02, 3.470497741699219e+02, 3.455440063476562e+02, 3.441316833496094e+02, 3.428047180175781e+02, 3.415558471679688e+02, 3.403786010742188e+02, 3.392671813964844e+02, 3.382164001464844e+02, 3.372216186523438e+02, 3.362786560058594e+02, 3.353836975097656e+02, 3.345333557128906e+02, 3.337244873046875e+02, 3.329543151855469e+02, 3.322201843261719e+02, 3.31519775390625e+02, 3.308509521484375e+02, 3.302117004394531e+02, 3.296002807617188e+02, 3.290149230957031e+02, 3.284541320800781e+02, 3.2791650390625e+02, 3.274006652832031e+02, 3.269054260253906e+02, 3.264296264648438e+02, 3.259722290039062e+02, 3.255322265625e+02, 3.251087341308594e+02, 3.247008361816406e+02, 3.243078002929688e+02, 3.239288330078125e+02, 3.236907348632812e+02, 3.234885559082031e+02, 3.232915954589844e+02, 3.230995483398438e+02, 3.229121704101562e+02, 3.227293090820312e+02, 3.225507202148438e+02, 3.223762817382812e+02, 3.22205810546875e+02, 3.220391845703125e+02, 3.218762817382812e+02, 3.217169494628906e+02, 3.215610656738281e+02, 3.214085083007812e+02, 3.212592163085938e+02, 3.21113037109375e+02, 3.209699096679688e+02, 3.208296813964844e+02] +aquWel.TAquCol[150]=[3.071499938964844e+02, 3.300186157226562e+02, 3.468785095214844e+02, 3.558555297851562e+02, 3.614811706542969e+02, 3.653800659179688e+02, 3.682676391601562e+02, 3.705054016113281e+02, 3.722997741699219e+02, 3.737757568359375e+02, 3.750149230957031e+02, 3.760731811523438e+02, 3.769894714355469e+02, 3.777916564941406e+02, 3.785013122558594e+02, 3.791343688964844e+02, 3.797026977539062e+02, 3.802161865234375e+02, 3.806825561523438e+02, 3.811087341308594e+02, 3.815003662109375e+02, 3.8186181640625e+02, 3.821966857910156e+02, 3.825077209472656e+02, 3.827976684570312e+02, 3.830683898925781e+02, 3.833220825195312e+02, 3.835601501464844e+02, 3.837842102050781e+02, 3.839955749511719e+02, 3.841953125e+02, 3.843844909667969e+02, 3.845640258789062e+02, 3.842393188476562e+02, 3.803149719238281e+02, 3.768764038085938e+02, 3.738981323242188e+02, 3.712638854980469e+02, 3.688968811035156e+02, 3.6674609375e+02, 3.647747802734375e+02, 3.629554748535156e+02, 3.612675170898438e+02, 3.596945190429688e+02, 3.582230224609375e+02, 3.568418273925781e+02, 3.555416564941406e+02, 3.543146362304688e+02, 3.531539306640625e+02, 3.520537719726562e+02, 3.504641723632812e+02, 3.48736083984375e+02, 3.471212768554688e+02, 3.4560986328125e+02, 3.44192626953125e+02, 3.42861328125e+02, 3.416085815429688e+02, 3.404278564453125e+02, 3.393132629394531e+02, 3.382596130371094e+02, 3.3726220703125e+02, 3.363168029785156e+02, 3.354196166992188e+02, 3.345671997070312e+02, 3.337564086914062e+02, 3.329844055175781e+02, 3.322486267089844e+02, 3.315466613769531e+02, 3.308764038085938e+02, 3.3023583984375e+02, 3.296231384277344e+02, 3.2903662109375e+02, 3.284747009277344e+02, 3.279359741210938e+02, 3.274191284179688e+02, 3.269228820800781e+02, 3.264461669921875e+02, 3.259878845214844e+02, 3.255470886230469e+02, 3.251228332519531e+02, 3.247142639160156e+02, 3.243205871582031e+02, 3.239410705566406e+02, 3.23703125e+02, 3.235012512207031e+02, 3.233044738769531e+02, 3.23112548828125e+02, 3.229252624511719e+02, 3.22742431640625e+02, 3.225638732910156e+02, 3.22389404296875e+02, 3.222189025878906e+02, 3.2205224609375e+02, 3.218892822265625e+02, 3.217298583984375e+02, 3.215739135742188e+02, 3.214212951660156e+02, 3.212719116210938e+02, 3.211256408691406e+02, 3.209823913574219e+02, 3.208421020507812e+02]