diff --git a/GHEtool/Validation/comparison_with_other_sizing_tools/test1a/test1a_ste.py b/GHEtool/Validation/comparison_with_other_sizing_tools/test1a/test1a_ste.py index 86009a34..7d616d35 100644 --- a/GHEtool/Validation/comparison_with_other_sizing_tools/test1a/test1a_ste.py +++ b/GHEtool/Validation/comparison_with_other_sizing_tools/test1a/test1a_ste.py @@ -40,10 +40,10 @@ def test_1a_6h_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=10) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test1a.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) + delta_t = max(load.max_peak_extraction, load.max_peak_injection) * 1000 / (fluid_data.Cp * fluid_data.mfr) # set temperature bounds borefield.set_max_avg_fluid_temperature(35 + delta_t / 2) @@ -246,11 +246,11 @@ def test_1a_1h_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=10) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test1a.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load borefield.load.peak_duration = 1 - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) + delta_t = max(load.max_peak_injection, load.max_peak_extraction) * 1000 / (fluid_data.Cp * fluid_data.mfr) # set temperature bounds borefield.set_max_avg_fluid_temperature(35 + delta_t / 2) @@ -294,7 +294,7 @@ def test_1a_1h_ste(): borefield.load = load - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) + delta_t = max(load.max_peak_injection, load.max_peak_extraction) * 1000 / (fluid_data.Cp * fluid_data.mfr) # set temperature bounds borefield.set_max_avg_fluid_temperature(35 + delta_t / 2) diff --git a/GHEtool/Validation/comparison_with_other_sizing_tools/test1b/test1b_ste.py b/GHEtool/Validation/comparison_with_other_sizing_tools/test1b/test1b_ste.py index 16f3c944..391e8cfc 100644 --- a/GHEtool/Validation/comparison_with_other_sizing_tools/test1b/test1b_ste.py +++ b/GHEtool/Validation/comparison_with_other_sizing_tools/test1b/test1b_ste.py @@ -41,11 +41,11 @@ def test_1b_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=10) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test1b.csv'), header=True, separator=";", - decimal_seperator=",", col_heating=1, - col_cooling=0) + decimal_seperator=",", col_extraction=1, + col_injection=0) borefield.load = load - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) + delta_t = max(load.max_peak_extraction, load.max_peak_injection) * 1000 / (fluid_data.Cp * fluid_data.mfr) # set temperature bounds borefield.set_max_avg_fluid_temperature(35 + delta_t / 2) diff --git a/GHEtool/Validation/comparison_with_other_sizing_tools/test2/test2_ste.py b/GHEtool/Validation/comparison_with_other_sizing_tools/test2/test2_ste.py index 4c612538..5c2d5162 100644 --- a/GHEtool/Validation/comparison_with_other_sizing_tools/test2/test2_ste.py +++ b/GHEtool/Validation/comparison_with_other_sizing_tools/test2/test2_ste.py @@ -41,10 +41,10 @@ def test_2_6h_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=10) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test2.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 120 + delta_t = max(load.max_peak_extraction, load.max_peak_injection) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 120 # set temperature bounds borefield.set_max_avg_fluid_temperature(35 + delta_t / 2) diff --git a/GHEtool/Validation/comparison_with_other_sizing_tools/test3/test3_ste.py b/GHEtool/Validation/comparison_with_other_sizing_tools/test3/test3_ste.py index 2ee42189..fea3a65e 100644 --- a/GHEtool/Validation/comparison_with_other_sizing_tools/test3/test3_ste.py +++ b/GHEtool/Validation/comparison_with_other_sizing_tools/test3/test3_ste.py @@ -41,10 +41,10 @@ def test_3_6h_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=10) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test3.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 49 + delta_t = max(load.max_peak_injection, load.max_peak_extraction) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 49 # set temperature bounds borefield.set_max_avg_fluid_temperature(35 + delta_t / 2) @@ -139,7 +139,7 @@ def test_3_6h_ste(): load = HourlyGeothermalLoad(simulation_period=s) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test3.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb diff --git a/GHEtool/Validation/comparison_with_other_sizing_tools/test4/sensitivity_analysis_ste.py b/GHEtool/Validation/comparison_with_other_sizing_tools/test4/sensitivity_analysis_ste.py index eb37cbe8..b9189e15 100644 --- a/GHEtool/Validation/comparison_with_other_sizing_tools/test4/sensitivity_analysis_ste.py +++ b/GHEtool/Validation/comparison_with_other_sizing_tools/test4/sensitivity_analysis_ste.py @@ -28,7 +28,7 @@ def test_4_sensitivity_ste(): ## Peak magnitude 1 --PM_1 # -125.7581 kW - # change peak mangnitude for all (3) months with higher cooling peaks + # change peak mangnitude for all (3) months with higher injection peaks # initiate ground, fluid and pipe data ground_data = GroundFluxTemperature(k_s=1.9, T_g=15, volumetric_heat_capacity=2052000, flux=0) @@ -47,21 +47,21 @@ def test_4_sensitivity_ste(): borefield.set_Rb(Rb_static) # load the monthly profile - baseload_heating = np.array([7.938 * 744, 3.784 * 720, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5.853 * 744]) - baseload_cooling = np.array( + baseload_extraction = np.array([7.938 * 744, 3.784 * 720, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5.853 * 744]) + baseload_injection = np.array( [0, 0, 8.085 * 744, 21.107 * 720, 35.048 * 744, 43.666 * 720, 46.983 * 744, 44.389 * 744, 34.678 * 720, 18.686 * 744, 2.983 * 720, 0]) - peak_heating = np.array([64.946, 60.735, 43.518, 37.849, 0, 0, 0, 0, 0, 5.737, 42.315, 57.209]) - peak_cooling = np.array( + peak_extraction = np.array([64.946, 60.735, 43.518, 37.849, 0, 0, 0, 0, 0, 5.737, 42.315, 57.209]) + peak_injection = np.array( [35.77, 53.548, 83.086, 93.549, 120.782, 125.7581, 125.7581, 125.7581, 111.780, 97.338, 52.843, 34.284]) - load = MonthlyGeothermalLoadAbsolute(baseload_heating=baseload_heating, baseload_cooling=baseload_cooling, - peak_heating=peak_heating, peak_cooling=peak_cooling, + load = MonthlyGeothermalLoadAbsolute(baseload_extraction=baseload_extraction, baseload_injection=baseload_injection, + peak_extraction=peak_extraction, peak_injection=peak_injection, simulation_period=20) borefield.load = load # convert inlet fluid temperature to heap pump constraints to constraints on average fluid temperature - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 25 + delta_t = max(load.max_peak_extraction, load.max_peak_injection) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 25 # set temperature bounds borefield.set_max_avg_fluid_temperature(38 + delta_t / 2) @@ -101,21 +101,21 @@ def test_4_sensitivity_ste(): # load the hourly profile # - baseload_heating = np.array([7.938 * 744, 3.784 * 720, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5.853 * 744]) - baseload_cooling = np.array( + baseload_extraction = np.array([7.938 * 744, 3.784 * 720, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5.853 * 744]) + baseload_injection = np.array( [0, 0, 8.085 * 744, 21.107 * 720, 35.048 * 744, 43.666 * 720, 46.983 * 744, 44.389 * 744, 34.678 * 720, 18.686 * 744, 2.983 * 720, 0]) - peak_heating = np.array([64.946, 60.735, 43.518, 37.849, 0, 0, 0, 0, 0, 5.737, 42.315, 57.209]) - peak_cooling = np.array( + peak_extraction = np.array([64.946, 60.735, 43.518, 37.849, 0, 0, 0, 0, 0, 5.737, 42.315, 57.209]) + peak_injection = np.array( [35.77, 53.548, 83.086, 93.549, 120.782, 130.893, 153.7044, 131.761, 111.780, 97.338, 52.843, 34.284]) - load = MonthlyGeothermalLoadAbsolute(baseload_heating=baseload_heating, baseload_cooling=baseload_cooling, - peak_heating=peak_heating, peak_cooling=peak_cooling, + load = MonthlyGeothermalLoadAbsolute(baseload_extraction=baseload_extraction, baseload_injection=baseload_injection, + peak_extraction=peak_extraction, peak_injection=peak_injection, simulation_period=20) borefield.load = load # convert inlet fluid temperature to heap pump constraints to constraints on average fluid temperature - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 25 + delta_t = max(load.max_peak_extraction, load.max_peak_injection) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 25 # set temperature bounds borefield.set_max_avg_fluid_temperature(38 + delta_t / 2) @@ -158,7 +158,7 @@ def test_4_sensitivity_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb @@ -252,7 +252,7 @@ def test_4_sensitivity_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb @@ -347,7 +347,7 @@ def test_4_sensitivity_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb @@ -534,7 +534,7 @@ def test_4_sensitivity_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb @@ -629,7 +629,7 @@ def test_4_sensitivity_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb @@ -724,7 +724,7 @@ def test_4_sensitivity_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb @@ -819,7 +819,7 @@ def test_4_sensitivity_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # Sizing with constant Rb diff --git a/GHEtool/Validation/comparison_with_other_sizing_tools/test4/test4_ste.py b/GHEtool/Validation/comparison_with_other_sizing_tools/test4/test4_ste.py index 4d3fd9fd..f5f5124e 100644 --- a/GHEtool/Validation/comparison_with_other_sizing_tools/test4/test4_ste.py +++ b/GHEtool/Validation/comparison_with_other_sizing_tools/test4/test4_ste.py @@ -43,11 +43,11 @@ def test_4_ste(): # load the hourly profile load = HourlyGeothermalLoad(simulation_period=20) load.load_hourly_profile(os.path.join(os.path.dirname(__file__), 'test4.csv'), header=True, separator=",", - col_heating=1, col_cooling=0) + col_extraction=1, col_injection=0) borefield.load = load # convert inlet fluid temperature to heap pump constraints to constraints on average fluid temperature - delta_t = max(load.max_peak_cooling, load.max_peak_cooling) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 25 + delta_t = max(load.max_peak_extraction, load.max_peak_injection) * 1000 / (fluid_data.Cp * fluid_data.mfr) / 25 # set temperature bounds borefield.set_max_avg_fluid_temperature(38 + delta_t / 2) diff --git a/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/Plots.py b/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/Plots.py index 22d30872..97f06b4c 100644 --- a/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/Plots.py +++ b/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/Plots.py @@ -26,7 +26,7 @@ pd.read_csv("exports/L4_temperature_profile.csv", comment='#', sep=",", header=None)[0]] max_temps = [np.max(i) - 273.15 for i in modelica] -min_temps = [np.min(i) - 273.15for i in modelica] +min_temps = [np.min(i) - 273.15 for i in modelica] rel_diff_max = [(17-i)/17*100 for i in max_temps] rel_diff_min = [(i-3)/3*100 for i in min_temps] diff --git a/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/swimming_pool.py b/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/swimming_pool.py index 436e1fa8..647f6045 100644 --- a/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/swimming_pool.py +++ b/GHEtool/Validation/short_term_effects_validation/Three_buildings/Swimming pool/swimming_pool.py @@ -33,7 +33,7 @@ def Swimming_pool(): # put same pipe and grout vol. heat cap in modelica # size this model with modelica (based on average fluid temp) - num_pipes = [2] + num_pipes = [1] gradients = [0, 1, 2] plot_load = False