diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/3bhes_1U_pcs_0_ts_10_t_7200.000000.vtu b/Tests/Data/Parabolic/T/3D_3BHEs_array/3bhes_1U_pcs_0_ts_10_t_7200.000000.vtu
index 335b7bd4818351396053a7adf34f82fb43b2b86c..508daeff216908292a73efae3f152381cdb2f631 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/3bhes_1U_pcs_0_ts_10_t_7200.000000.vtu
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/3bhes_1U_pcs_0_ts_10_t_7200.000000.vtu
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4bd2a3d9539ae71dc3c3008e6f29d9158b91b7e9793dab544a8ffda4bb27100b
-size 220372
+oid sha256:3272571b9b8c2f3fe37641627df9fa7bc0cfd2ca5e16e7d703a74b610561f489
+size 220360
diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/bcs_tespy.py b/Tests/Data/Parabolic/T/3D_3BHEs_array/bcs_tespy.py
index 1c353af5f765e844e7a94e9172e7f1021fcced24..1986269451d775403266c191042bc832667f4bb0 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/bcs_tespy.py
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/bcs_tespy.py
@@ -1,5 +1,5 @@
###
-# Copyright(c) 2012 - 2019, OpenGeoSys Community(http://www.opengeosys.org)
+# Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.org)
# Distributed under a Modified BSD License.
# See accompanying file LICENSE.txt or
# http://www.opengeosys.org/project/license
@@ -25,11 +25,11 @@ switch_dyn_demand = 'on'
switch_dyn_frate = 'off'
-# timecurve setting
-def timerange(t):
+# network status setting
+def network_status(t):
+ nw_status = 'on'
# month for closed network
timerange_nw_off_month = [-9999] # No month for closed network
- nw_status = 'on'
# t-1 to avoid the calculation problem at special time point,
# e.g. t = 2592000.
t_trans = int((t - 1) / 86400 / 30) + 1
@@ -38,12 +38,15 @@ def timerange(t):
t_trans_month = t_trans - 12 * (int(t_trans / 12))
if t_trans_month in timerange_nw_off_month:
nw_status = 'off'
- return t_trans, t_trans_month, nw_status
+ return nw_status
-# consumer thermal load
-# month demand
+# dynamic consumer thermal load
def consumer_demand(t): # dynamic thermal demand from consumer
+ # time conversion
+ t_trans = int((t - 1) / 86400 / 30) + 1
+ if t_trans > 12:
+ t_trans = t_trans - 12 * (int(t_trans / 12))
# thermal demand in each month (assumed specific heat extraction rate*
# length of BHE* number of BHE)
month_demand = [
@@ -51,15 +54,18 @@ def consumer_demand(t): # dynamic thermal demand from consumer
-25 * 50 * 3, -25 * 50 * 3, -25 * 50 * 3, -25 * 50 * 3, -25 * 50 * 3,
-25 * 50 * 3, -25 * 50 * 3
]
- return month_demand[t - 1]
+ return month_demand[t_trans - 1]
# dynamic hydraulic flow rate
-# month demand
def dyn_frate(t): # dynamic flowrate in BHE
+ # time conversion
+ t_trans = int((t - 1) / 86400 / 30) + 1
+ if t_trans > 12:
+ t_trans = t_trans - 12 * (int(t_trans / 12))
# flow rate in kg / s time curve in month
month_frate = [-9999]
- return month_frate[t - 1]
+ return month_frate[t_trans - 1]
# End User setting+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -76,22 +82,18 @@ def create_dataframe():
# TESPy hydraulic calculation process
-def get_hydraulics(t_trans):
+def get_hydraulics(t):
# if network exist dynamic flowrate
if switch_dyn_frate == 'on':
- cur_frate = dyn_frate(t_trans)
+ cur_frate = dyn_frate(t)
localVars['inlet_name'].set_attr(m=cur_frate)
# solve imported network
nw.solve(mode='design')
- # get flowrate #kg / s
+ # get flowrate #m ^ 3 / s
for i in range(n_BHE):
for c in nw.conns.index:
if c.t.label == data_index[i]: # t:inlet comp, s:outlet comp
- df.loc[df.index[i], 'flowrate'] = c.get_attr('m').val_SI
- # convert flowrate to velocity : #m ^ 3 / s
- for i in range(n_BHE):
- df.loc[df.index[i],
- 'f_velocity'] = df.loc[df.index[i], 'flowrate'] / refrig_density
+ df.loc[df.index[i], 'flowrate'] = c.get_attr('m').val_SI / refrig_density
return df
@@ -129,12 +131,12 @@ class BC(OpenGeoSys.BHENetwork):
data_col_2 = df['Tout_val'].tolist() # 'Tout_val'
data_col_3 = df['Tout_node_id'].astype(int).tolist() # 'Tout_node_id'
get_hydraulics(0)
- data_col_4 = df['f_velocity'].tolist() # 'BHE flow rate'
+ data_col_4 = df['flowrate'].tolist() # 'BHE flow rate'
return (t, data_col_1, data_col_2, data_col_3, data_col_4)
def tespyThermalSolver(self, t, Tin_val, Tout_val):
- # current time, network status:
- t_trans, t_trans_month, nw_status = timerange(t)
+ # network status:
+ nw_status = network_status(t)
# if network closed:
# print('nw_status = ', nw_status)
if nw_status == 'off':
@@ -144,7 +146,7 @@ class BC(OpenGeoSys.BHENetwork):
for i in range(n_BHE):
df.loc[df.index[i], 'Tout_val'] = Tout_val[i]
# TESPy solver
- cur_cal_Tin_val = get_thermal(t_trans_month)
+ cur_cal_Tin_val = get_thermal(t)
# check norm if network achieves the converge
if_success = False
pre_cal_Tin_val = Tin_val
@@ -157,20 +159,20 @@ class BC(OpenGeoSys.BHENetwork):
def tespyHydroSolver(self, t):
if_dyn_frate = False
- data_f_velocity = df['f_velocity'].tolist()
+ data_flowrate = df['flowrate'].tolist()
if switch_dyn_frate == 'on':
if_dyn_frate = True
- # current time, network status:
- t_trans, t_trans_month, nw_status = timerange(t)
+ # network status:
+ nw_status = network_status(t)
if nw_status == 'off':
for i in range(n_BHE):
- df.loc[df.index[i], 'f_velocity'] = 0
- data_f_velocity = df['f_velocity'].tolist()
+ df.loc[df.index[i], 'flowrate'] = 0
+ data_flowrate = df['flowrate'].tolist()
else:
- dataframe = get_hydraulics(t_trans)
- data_f_velocity = dataframe['f_velocity'].tolist()
+ dataframe = get_hydraulics(t)
+ data_flowrate = dataframe['flowrate'].tolist()
# return to OGS
- return (if_dyn_frate, data_f_velocity)
+ return (if_dyn_frate, data_flowrate)
# main
diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/3bhes.py b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/3bhes.py
index 11cb6ae52142719479c56b52ce2a6eeaa8a094de..1593f651b95d6779035c05ce13bc96c52e014ca7 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/3bhes.py
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/3bhes.py
@@ -104,9 +104,9 @@ fc_pu.set_attr(p=inflow_head, m=0.6, fluid={'water': 1})
pu.set_attr(eta_s=0.90)
# bhes
-bhe1.set_attr(D=0.02733, L=100, ks=0.00001)
-bhe2.set_attr(D=0.02733, L=100, ks=0.00001)
-bhe3.set_attr(D=0.02733, L=100, ks=0.00001)
+bhe1.set_attr(D=0.013665, L=100, ks=0.00001)
+bhe2.set_attr(D=0.013665, L=100, ks=0.00001)
+bhe3.set_attr(D=0.013665, L=100, ks=0.00001)
# consumer
cons.set_attr(D=0.2, L=20, ks=0.00001)
diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/bus.csv b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/bus.csv
index 971f617570cddc6d3cb29cbe9e86324620a5f159..c063591a26767253964ff169c3899ece79f3d164 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/bus.csv
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/bus.csv
@@ -1,2 +1,2 @@
label;P;P_set
-consumer heat demand;-3000.0000000000005;True
+consumer heat demand;-3000.0;True
diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/char.csv b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/char.csv
index f2aa4423131c6e79b2e931609682c5d973c9c698..ae1346618cdeddae42d5b3d35e9ae98eac5a38ce 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/char.csv
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/char.csv
@@ -1,8 +1,8 @@
id;x;y
-0x000001D4D54B5438;[0.071, 0.282, 0.635, 0.776, 0.917, 1.0, 1.128, 1.27, 1.41, 1.763, 2.115, 2.5];[0.25, 0.547, 0.9, 0.965, 0.995, 1.0, 0.99, 0.959, 0.911, 0.737, 0.519, 0.25]
-0x000001D4D54B54A8;[0.0, 1.952885971862e-05, 0.00390577194372, 0.005858657915586, 0.007811543887448, 0.00976442985931, 0.011717315831173, 0.013670201803035, 0.015623087774897, 0.017575973746759, 0.019528859718621, 0.021481745690483, 0.023434631662345, 0.025387517634207, 0.027340403606069, 0.029293289577931, 0.031246175549793, 0.033199061521655, 0.035151947493517, 0.037104833465379, 0.039057719437241, 0.041010605409104, 0.042963491380966, 0.044916377352828, 0.04686926332469, 0.048822149296552, 0.050775035268414, 0.052727921240276, 0.054680807212138, 0.056633693184];[47782.539000000004, 47725.723, 47555.274, 47271.192, 46873.478, 46362.130000000005, 45737.151, 44998.538, 44146.293, 43180.416, 42209.049999999996, 40907.761999999995, 39600.986, 38180.578, 36646.537000000004, 34998.863000000005, 33237.557, 31362.618, 29374.046, 27271.841000000004, 25056.003999999997, 22726.535, 20283.432, 17726.697, 15056.329, 12272.329, 9374.696, 6363.43, 3238.531, 0.0]
-0x000001D4D54B57B8;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
-0x000001D4D54B56A0;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
-0x000001D4D54B5668;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
-0x000001D4D54B5898;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
-0x000001D4D547E358;[0, 1, 2, 3];[1, 1, 1, 1]
+0x000001A1354B2208;[0.071, 0.282, 0.635, 0.776, 0.917, 1.0, 1.128, 1.27, 1.41, 1.763, 2.115, 2.5];[0.25, 0.547, 0.9, 0.965, 0.995, 1.0, 0.99, 0.959, 0.911, 0.737, 0.519, 0.25]
+0x000001A1354B22B0;[0.0, 1.952885971862e-05, 0.00390577194372, 0.005858657915586, 0.007811543887448, 0.00976442985931, 0.011717315831173, 0.013670201803035, 0.015623087774897, 0.017575973746759, 0.019528859718621, 0.021481745690483, 0.023434631662345, 0.025387517634207, 0.027340403606069, 0.029293289577931, 0.031246175549793, 0.033199061521655, 0.035151947493517, 0.037104833465379, 0.039057719437241, 0.041010605409104, 0.042963491380966, 0.044916377352828, 0.04686926332469, 0.048822149296552, 0.050775035268414, 0.052727921240276, 0.054680807212138, 0.056633693184];[47782.539000000004, 47725.723, 47555.274, 47271.192, 46873.478, 46362.130000000005, 45737.151, 44998.538, 44146.293, 43180.416, 42209.049999999996, 40907.761999999995, 39600.986, 38180.578, 36646.537000000004, 34998.863000000005, 33237.557, 31362.618, 29374.046, 27271.841000000004, 25056.003999999997, 22726.535, 20283.432, 17726.697, 15056.329, 12272.329, 9374.696, 6363.43, 3238.531, 0.0]
+0x000001A1354B25C0;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
+0x000001A1354B24A8;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
+0x000001A1354B2470;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
+0x000001A1354B26A0;[0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.5, 2.0];[0.03, 0.158, 0.344, 0.469, 0.535, 0.59, 0.638, 0.68, 0.718, 0.752, 0.783, 0.812, 0.839, 0.864, 0.887, 0.909, 0.929, 0.948, 0.966, 0.984, 1.0, 1.128, 1.216]
+0x000001A1253689E8;[0, 1, 2, 3];[1, 1, 1, 1]
diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/heat_exchanger_simple.csv b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/heat_exchanger_simple.csv
index 9cdb9d8e63da37f6a9577f6c648aa48b522bf809..6b38ba069188a58592d2c5bf70abec581e7286b1 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/heat_exchanger_simple.csv
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/heat_exchanger_simple.csv
@@ -1,5 +1,5 @@
label;cp;busses;bus_param;bus_P_ref;bus_char;design;offdesign;interface;design_path;Q;Q_set;Q_var;pr;pr_set;pr_var;zeta;zeta_set;zeta_var;D;D_set;D_var;L;L_set;L_var;ks;ks_set;ks_var;kA;kA_set;kA_var;Tamb;Tamb_set;Tamb_var;kA_char;kA_char_set;kA_char_method;kA_char_param;SQ1;SQ1_set;SQ2;SQ2_set;Sirr;Sirr_set;hydro_group;kA_group
-BHE1;heat_exchanger_simple;[];[];[];[];[];[];False;nan;999.9999999999999;False;False;0.9736837578540255;False;False;200221979.33309928;False;False;0.02733;True;False;100;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001D4D54B57B8;False;HE_HOT;m;3.3095575754670445;False;nan;False;nan;False;default;default
-BHE2;heat_exchanger_simple;[];[];[];[];[];[];False;nan;999.9999999999998;False;False;0.9736837578540255;False;False;200221979.33309937;False;False;0.02733;True;False;100;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001D4D54B56A0;False;HE_HOT;m;3.309557575467044;False;nan;False;nan;False;default;default
-BHE3;heat_exchanger_simple;[];[];[];[];[];[];False;nan;999.9999999999999;False;False;0.9736837578540255;False;False;200221979.33309928;False;False;0.02733;True;False;100;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001D4D54B5668;False;HE_HOT;m;3.3095575754670445;False;nan;False;nan;False;default;default
-consumer;heat_exchanger_simple;['consumer heat demand'];['P'];[-3000.0000000000005];['0x000001D4D547E358'];[];[];False;nan;-3000.0000000000005;False;False;0.9999971030369322;False;False;2384.545016264847;False;False;0.2;True;False;20;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001D4D54B5898;False;HE_HOT;m;-9.915667457524025;False;nan;False;nan;False;default;default
+BHE1;heat_exchanger_simple;[];[];[];[];[];[];False;nan;1000.0000000000027;False;False;0.29176968715071355;False;False;5388257076.59244;False;False;0.013665;True;False;100;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001A1354B25C0;False;HE_HOT;m;3.4218877968492043;False;nan;False;nan;False;default;default
+BHE2;heat_exchanger_simple;[];[];[];[];[];[];False;nan;1000.0000000000027;False;False;0.29176968715071355;False;False;5388257076.59244;False;False;0.013665;True;False;100;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001A1354B24A8;False;HE_HOT;m;3.4218877968492043;False;nan;False;nan;False;default;default
+BHE3;heat_exchanger_simple;[];[];[];[];[];[];False;nan;1000.0000000000027;False;False;0.29176968715071355;False;False;5388257076.59244;False;False;0.013665;True;False;100;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001A1354B2470;False;HE_HOT;m;3.4218877968492043;False;nan;False;nan;False;default;default
+consumer;heat_exchanger_simple;['consumer heat demand'];['P'];[-3000.0];['0x000001A1253689E8'];[];[];False;nan;-3000.0;False;False;0.9999903316095526;False;False;2384.5482283411293;False;False;0.2;True;False;20;True;False;1e-05;True;False;1;False;False;1;False;False;0x000001A1354B26A0;False;HE_HOT;m;-9.91566529165866;False;nan;False;nan;False;default;default
diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/pump.csv b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/pump.csv
index 05198eaf46f5b1bbe1c804d40a33e570c8c9779a..76cd46445d60225f3fb74375322b001d1a6312f1 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/pump.csv
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/comps/pump.csv
@@ -1,2 +1,2 @@
label;cp;busses;bus_param;bus_P_ref;bus_char;design;offdesign;interface;design_path;P;P_set;P_var;eta_s;eta_s_set;eta_s_var;pr;pr_set;pr_var;eta_s_char;eta_s_char_set;eta_s_char_method;eta_s_char_param;flow_char;flow_char_set;flow_char_method;flow_char_param;Sirr;Sirr_set
-pump;pump;[];[];[];[];[];[];False;nan;31.925887420863727;False;False;0.9000000008463441;True;False;1.2385007970539827;False;False;0x000001D4D54B5438;False;GENERIC;nan;0x000001D4D54B54A8;True;default;nan;0.010573179069774596;False
+pump;pump;[];[];[];[];[];[];False;nan;31.925543334343818;False;False;0.8999999980902834;True;False;1.2385007984783911;False;False;0x000001A1354B2208;False;GENERIC;nan;0x000001A1354B22B0;True;default;nan;0.010574356028200782;False
diff --git a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/conn.csv b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/conn.csv
index 09bbabb137adcf908421809aa895e689805c9de0..2369a824d91084814324a7bcf21ce5d0dc7bfda3 100644
--- a/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/conn.csv
+++ b/Tests/Data/Parabolic/T/3D_3BHEs_array/pre/tespy_nw/conn.csv
@@ -1,11 +1,11 @@
id;s;s_id;t;t_id;design;offdesign;design_path;m;m_unit;m_unit_set;m0;m_set;m_ref;m_ref_f;m_ref_d;m_ref_set;p;p_unit;p_unit_set;p0;p_set;p_ref;p_ref_f;p_ref_d;p_ref_set;h;h_unit;h_unit_set;h0;h_set;h_ref;h_ref_f;h_ref_d;h_ref_set;T;T_unit;T_unit_set;T0;T_set;T_ref;T_ref_f;T_ref_d;T_ref_set;x;x_unit;x_unit_set;x0;x_set;x_ref;x_ref_f;x_ref_d;x_ref_set;v;v_unit;v_unit_set;v0;v_set;v_ref;v_ref_f;v_ref_d;v_ref_set;Td_bp;Td_bp_unit;Td_bp_unit_set;Td_bp0;Td_bp_set;Td_bp_ref;Td_bp_ref_f;Td_bp_ref_d;Td_bp_ref_set;state;state_set;water;water0;water_set;balance
-0x000001D4D546ACC0;from consumer inflow;out1;pump;in1;[];[];nan;0.6;kg / s;False;0.6;True;nan;nan;nan;False;2.0;bar;False;2.0;True;nan;nan;nan;False;120.89684447187135;kJ / kg;False;120.89684447187135;False;nan;nan;nan;False;301.94998968965183;K;False;301.94998968965183;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006023795760273974;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;True;False
-0x000001D4D546AE10;pump;out1;splitter;in1;[];[];nan;0.6;kg / s;False;0.6;False;nan;nan;nan;False;2.4770015941079655;bar;False;2.4770015941079655;False;nan;nan;nan;False;120.95005428423946;kJ / kg;False;120.95005428423946;False;0x000001D4D5470F98;1.0;0.0;True;301.95227563825125;K;False;301.95227563825125;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006023670907654493;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D546AA58;splitter;out1;BHE1;in1;[];[];nan;0.19999999999999998;kg / s;False;0.19999999999999998;False;nan;nan;nan;False;2.4770015941079655;bar;False;2.4770015941079655;False;nan;nan;nan;False;120.95005428423946;kJ / kg;False;120.95005428423946;False;nan;nan;nan;False;301.95227563825125;K;False;301.95227563825125;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.00020078903025514975;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D5470278;splitter;out2;BHE2;in1;[];[];nan;0.19999999999999996;kg / s;False;0.19999999999999996;False;nan;nan;nan;False;2.4770015941079655;bar;False;2.4770015941079655;False;nan;nan;nan;False;120.95005428423946;kJ / kg;False;120.95005428423946;False;nan;nan;nan;False;301.95227563825125;K;False;301.95227563825125;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.00020078903025514972;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D54704A8;splitter;out3;BHE3;in1;[];[];nan;0.19999999999999998;kg / s;False;0.19999999999999998;False;nan;nan;nan;False;2.4770015941079655;bar;False;2.4770015941079655;False;nan;nan;nan;False;120.95005428423946;kJ / kg;False;120.95005428423946;False;nan;nan;nan;False;301.95227563825125;K;False;301.95227563825125;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.00020078903025514975;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D54706D8;BHE1;out1;merge;in1;[];[];nan;0.2;kg / s;False;0.2;False;nan;nan;nan;False;2.4118162203614557;bar;False;2.4118162203614557;False;nan;nan;nan;False;125.95005428423946;kJ / kg;False;125.95005428423946;False;nan;nan;nan;False;303.14999999999895;K;False;303.14999999999895;True;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0002008613366014869;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D5470908;BHE2;out1;merge;in2;[];[];nan;0.19999999999999998;kg / s;False;0.19999999999999998;False;nan;nan;nan;False;2.4118162203614557;bar;False;2.4118162203614557;False;nan;nan;nan;False;125.95005428423946;kJ / kg;False;125.95005428423946;False;nan;nan;nan;False;303.14999999999895;K;False;303.14999999999895;True;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.00020086133660148688;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D5470B38;BHE3;out1;merge;in3;[];[];nan;0.2;kg / s;False;0.2;False;nan;nan;nan;False;2.4118162203614557;bar;False;2.4118162203614557;False;nan;nan;nan;False;125.95005428423946;kJ / kg;False;125.95005428423946;False;nan;nan;nan;False;303.14999999999895;K;False;303.14999999999895;True;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0002008613366014869;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D5470D68;merge;out1;consumer;in1;[];[];nan;0.6000000000000001;kg / s;False;0.6000000000000001;False;nan;nan;nan;False;2.4118162203614557;bar;False;2.4118162203614557;False;nan;nan;nan;False;125.95005428423946;kJ / kg;False;125.95005428423946;False;nan;nan;nan;False;303.14999999999895;K;False;303.14999999999895;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006025840098044607;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
-0x000001D4D5470F98;consumer;out1;from consumer outflow;in1;[];[];nan;0.6000000000000001;kg / s;False;0.6000000000000001;False;nan;nan;nan;False;2.411809233418939;bar;False;2.411809233418939;False;nan;nan;nan;False;120.95005428423946;kJ / kg;False;120.95005428423946;False;nan;nan;nan;False;301.95370308274016;K;False;301.95370308274016;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006023691039076023;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A135469B38;from consumer inflow;out1;pump;in1;[];[];nan;0.6;kg / s;False;0.6;True;nan;nan;nan;False;2.0;bar;False;2.0;True;nan;nan;nan;False;120.74280518953262;kJ / kg;False;120.74280518953262;False;nan;nan;nan;False;301.9131365639223;K;False;301.9131365639223;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006023730807148608;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;True;False
+0x000001A135469C88;pump;out1;splitter;in1;[];[];nan;0.6;kg / s;False;0.6;False;nan;nan;nan;False;2.4770015969567822;bar;False;2.4770015969567822;False;nan;nan;nan;False;120.79601442842319;kJ / kg;False;120.79601442842319;False;0x000001A135471E48;1.0;0.0;True;301.91542121128157;K;False;301.91542121128157;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006023605939764957;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A135469EB8;splitter;out1;BHE1;in1;[];[];nan;0.19999999999999996;kg / s;False;0.19999999999999996;False;nan;nan;nan;False;2.4770015969567822;bar;False;2.4770015969567822;False;nan;nan;nan;False;120.79601442842319;kJ / kg;False;120.79601442842319;False;nan;nan;nan;False;301.91542121128157;K;False;301.91542121128157;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0002007868646588319;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A135469BA8;splitter;out2;BHE2;in1;[];[];nan;0.19999999999999996;kg / s;False;0.19999999999999996;False;nan;nan;nan;False;2.4770015969567822;bar;False;2.4770015969567822;False;nan;nan;nan;False;120.79601442842319;kJ / kg;False;120.79601442842319;False;nan;nan;nan;False;301.91542121128157;K;False;301.91542121128157;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0002007868646588319;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A135471358;splitter;out3;BHE3;in1;[];[];nan;0.19999999999999996;kg / s;False;0.19999999999999996;False;nan;nan;nan;False;2.4770015969567822;bar;False;2.4770015969567822;False;nan;nan;nan;False;120.79601442842319;kJ / kg;False;120.79601442842319;False;nan;nan;nan;False;301.91542121128157;K;False;301.91542121128157;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0002007868646588319;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A135471588;BHE1;out1;merge;in1;[];[];nan;0.19999999999999998;kg / s;False;0.19999999999999998;False;nan;nan;nan;False;0.7227139810158983;bar;False;0.7227139810158983;False;nan;nan;nan;False;125.7960144284232;kJ / kg;False;125.7960144284232;False;nan;nan;nan;False;303.14999999999884;K;False;303.14999999999884;True;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.00020087652409915793;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A1354717B8;BHE2;out1;merge;in2;[];[];nan;0.19999999999999998;kg / s;False;0.19999999999999998;False;nan;nan;nan;False;0.7227139810158983;bar;False;0.7227139810158983;False;nan;nan;nan;False;125.7960144284232;kJ / kg;False;125.7960144284232;False;nan;nan;nan;False;303.14999999999884;K;False;303.14999999999884;True;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.00020087652409915793;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A1354719E8;BHE3;out1;merge;in3;[];[];nan;0.19999999999999998;kg / s;False;0.19999999999999998;False;nan;nan;nan;False;0.7227139810158983;bar;False;0.7227139810158983;False;nan;nan;nan;False;125.7960144284232;kJ / kg;False;125.7960144284232;False;nan;nan;nan;False;303.14999999999884;K;False;303.14999999999884;True;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.00020087652409915793;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A135471C18;merge;out1;consumer;in1;[];[];nan;0.6;kg / s;False;0.6;False;nan;nan;nan;False;0.7227139810158983;bar;False;0.7227139810158983;False;nan;nan;nan;False;125.79601442842319;kJ / kg;False;125.79601442842319;False;nan;nan;nan;False;303.14999999999884;K;False;303.14999999999884;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006026295722974739;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
+0x000001A135471E48;consumer;out1;from consumer outflow;in1;[];[];nan;0.6;kg / s;False;0.6;False;nan;nan;nan;False;0.7227069935349482;bar;False;0.7227069935349482;False;nan;nan;nan;False;120.79601442842319;kJ / kg;False;120.79601442842319;False;nan;nan;nan;False;301.9538353827364;K;False;301.9538353827364;False;nan;nan;nan;False;-1.0;nan;False;nan;False;nan;nan;nan;False;0.0006024147752874762;m3 / s;False;nan;False;nan;nan;nan;False;nan;K;False;nan;False;nan;nan;nan;False;nan;False;1;1;False;False
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png
index 8be0cf582510564e2b1d355aa876aeff0e95cf3d..a43b37529d6b2077abcb95aa6883faa51d5655bd 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:eb24f9aeb9b8ca5bd81e98858f71dcaccb840a6fdfcfd5cb29e30417c709fe57
-size 122428
+oid sha256:a09cc5fd1c23b775465de2b02f24db804afa9fa6432de95326ea58a4b27acb10
+size 122074
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png
index 6e8d0f63feafd4e23cf6feb21327ac8b9d6fbff0..e8aade71c22ae0374d2805a41c941d497f2daeb9 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ffd1b749b7a278c7256d0dabbc78c22b319900aa5ec826f83132948ac8a6c277
-size 133871
+oid sha256:9c571839a884c6f4bc678851d34490fca0c3158322224f8fa01f80b591b540c6
+size 135988
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png
index bb4d789f4b607cd6f78c69f8b5dc7fa566028e0c..13530579bc3b5d4a0fed287a265d54f9dedfe5d5 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0cf3c84e0c13b6a5de0586c069e608f6abc9d716b064225a09280054ee8ab279
-size 102386
+oid sha256:c809fd29be8a8feef0dcac54ca150dd08eb50404c8148d6f654818e9966d51db
+size 102339