diff --git a/docs/changelog.md b/docs/changelog.md index 6bd4abb8f20b749ebdffb7ee00f50657b6ae66ed..f33de6dca516926768f006552f2ee53ef30cc07f 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,11 @@ # Change log +## v1.3.0 (30-1-2026) + +- After an issue was flagged with the heat pump module changes were implemented in the core java code, tested using the ThermoGIS Automated workflow and the GA4A projects. +The ThermoGIS Jar has been updated and the documentation on the heatpump greatly expanded. +- The tests on the GA4A scenario XML have been extended to test expected values. + ## v1.2.5 (26-1-2026) A java 17 virtual machine is now automatically installed the first time a pythermogis simulation is run. This uses the [install-jdk](https://pypi.org/project/install-jdk/) python project. diff --git a/docs/theory/energyconversion/directheatHP.md b/docs/theory/energyconversion/directheatHP.md index 1486508aff2b4bc84039e53954468f921d23eba9..0981f0eece1f7b027b7b419baf64a1064ebd3183 100644 --- a/docs/theory/energyconversion/directheatHP.md +++ b/docs/theory/energyconversion/directheatHP.md @@ -3,22 +3,99 @@ ## Direct heat with industrial Heat Pump Below is a schematic representation of the direct heat production with an industrial heat pump system, - which effectively allows to increase outlet temperature for a district heating network, - relative to the geothermal source production temperature + which effectively allows the system to increase outlet temperature for a district heating network, + relative to the geothermal source production temperature. +### Determining the Injection Temperature ![Figure description](../../images/cartoon_heatpump.png) *Figure 2: a schematic representation of the system. -On the left is the primary circuit of geothermal brine with temperature Tprod, -assumed equal to the aquifer temperature Taq. -The temperature is first lowered by amount ΔT1 in the heat exchanger. -Next, the temperature is lowered by amount ΔT2 in the heat pump to the injection temperature Tinj. -On the right hand side is the district heating network. -The cool water returning from the network at temperature Tdh_out is first heated in the heat exchanger -to Tdh_out + ΔT1, and then by the heatpump to the heat network inlet temperature Tdh_in. -It is assumed that condenser and evaporator temperatures of the heatpump are respectively 3°C lower and higher -than the source and outlet temperature of the heat pump* +On the left is the primary circuit of geothermal brine while on the right is the circuit of the district-heating system. + +The model has four elements: + +1. A Geothermal system, Tprod is the temperature of the water produced from the reservoir, while Tinj is the temperature of the water pumped back into the aquifer. +2. A District heating system, Tdh_out is the water that comes _from_ the district heating system, while Tdh_in is the water that goes _to_ the district heating system +3. A Heat Exchanger, which transfers heat from the production water of the Geothermal system to the district-heating system. +4. A Heat Pump, which consumes grid electricity to further heat up the district-heating water and cool the geothermal system water. + +When modelling the system: + +1. The production temperature, Tprod, is assumed equal to the temperature of the reservoir. +2. The district heating return temperature, Tdh_out, is known (set by the user, default: 35°C). +3. The district heating input temperature, Tdh_in, is known (set by the user, default: 70°C). +4. The total difference between the district heating input and district heating return temperature, ΔT. +5. The minimum absolute injection temperature and the maximum temperature difference between reservoir and injection temperature is also specified by the user, and is used as a condition on the final injection temperature. + +This leaves the Injection temperature Tinj, as the remaining unknown. + +This is calculated using the equation: + +Tinj = Tprod - ΔT1 - ΔT2 + +where: + +ΔT1 = Tprod - Tdh_out, must be between 0 -> ΔT (user specified) +ΔT2 = Tdh_in - (Tdh_out + ΔT1) + +The final Tinj is then corrected using an absolute and relative injection temperature boundary, ensuring the injection temperature is: + +- Always above the absolute minimum injection temperature +- The difference between Tprod - Tinj is never greater than the maximum allowed difference. + +### Example 1: Heat pump required + +Using the following input: + +- Tprod = 60°C +- Tdh_in = 70°C +- Tdh_out = 35°C +- ΔT = Tdh_in - Tdh_out = 35°C + +It is clear that the production temperature of the aquifer is not hot enough to fully supply the district-heating system without assistance from the heat pump, as the temperature from the aquifer is 10°C colder than the temperature required by the district heating systm. +This means that the extra heat will be provided by the heatpump. + +Transferred from geothermal heating system to district heating system: + +ΔT1 = Tprod - Tdh_out, 60°C - 35°C = 25°C. + +Heat additionally added by the heat pump to the district heating system: + +ΔT2 = Tdh_in - (Tdh_out + ΔT1) = 70°C - 60°C = 10°C + +Injection temperature is the production temperature minus the two deltas above: + +Tinj = Tprod - ΔT1 - ΔT2 = 60°C - 25°C - 10°C = 25°C + +### Example 2: Heat pump _not_ required + +What happens when the production temperature from the aquifer is hot enough that the heatpump is not required? + +- Tprod = 75°C +- Tdh_in = 70°C +- Tdh_out = 35°C +- ΔT = Tdh_in - Tdh_out = 35°C + +It is clear that the production temperature of the aquifer is not hot enough to fully supply the district-heating system without assistance from the heat pump, as the temperature from the aquifer is 10°C colder than the temperature required by the district heating systm. +This means that the extra heat will be provided by the heatpump. + +Transferred from geothermal heating system to district heating system: + +ΔT1 = Tprod - Tdh_out, 75°C - 35°C = 40°C. +40°C < 35°C therefore ΔT1 = 35°C + +This means that the heat exchanger is able to provide all the heat necessary to the district heating system. + +Heat additionally added by the heat pump to the district heating system: + +ΔT2 = Tdh_in - (Tdh_out + ΔT1) = 70°C - (35°C + 35°C) = 0°C + +Injection temperature is the production temperature minus the two deltas above: + +Tinj = Tprod - ΔT1 - ΔT2 = 75°C - 35°C - 0°C = 35°C + +### Calculating the Coefficient of Performance (COP) The COP of the heat pump is given by the following equation: @@ -32,13 +109,13 @@ corrected for the conversion efficiency and any parasitic power losses. For direct heat it does not include added heat in the heatpump from the compressor. The reason not to include this is to account for geothermal energy only. This setting can be changed by setting +### Default values -Proposed parameters are the following: +Proposed default parameters are the following: | parameter | symbol | value | unit | |------------------------------------------------------------------------|----------------|--------|----------| | use heat pump | HPuse | True | bool | -| HP application target temperature is Tdh_in | HPapp | True | bool | | target district heat outlet temperature | Tdh_in | 80 | °C | | minimum aquifer production temperature | Tminprod | 40 | °C | | maximum cooling temperature for reinjection relative to reservoir (ΔT) | ΔTmax | 40-200 | °C | diff --git a/pixi.lock b/pixi.lock index d771c6c405d80e84f00fc3cfb4a4cf19128046f1..0fc376bcb667b0f6a2cc4f5b90c95d6dbd4075ed 100644 --- a/pixi.lock +++ b/pixi.lock @@ -4933,8 +4933,8 @@ packages: timestamp: 1740946648058 - pypi: ./ name: pythermogis - version: 1.2.4 - sha256: 4406d3c4da3a9e6ee46a39b7ce7b61063e676db495638f1f9d992ac174589913 + version: 1.3.0 + sha256: 169b880567fe4471034ed3da760808a570dc917f794bfb0b978998f5bdf23785 requires_dist: - jpype1>=1.5.2,<2 - xarray==2024.9.0.* diff --git a/pyproject.toml b/pyproject.toml index 90e15525c5614fcb18552074fbe0b39794afd44d..ebff6b9e468093c35f60bbeeb03e50e96fe16dbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pythermogis" -version = "1.2.5" +version = "1.3.0" description = "This repository is used as a python API for the ThermoGIS Doublet simulations" authors = [ { name = "Hen Brett", email = "hen.brett@tno.nl" }, @@ -21,7 +21,6 @@ dependencies = [ "pytz>=2024.1,<2025", "build>=1.2.2.post1,<2", "pygridsio>=1.0,<2.0", - "python-dotenv>=1.2.1,<2", "dask>=2025.5.1,<2026", "install-jdk==1.1.0" ] diff --git a/src/pythermogis/thermogis_jar/thermogis-1.7.0-shaded.jar b/src/pythermogis/thermogis_jar/thermogis-1.7.0-shaded.jar index e9b30a8965c4e0eee1940138bed253869fc84cea..80f1bc2c08b657f71859e8f38e34033fc3c1fbac 100644 --- a/src/pythermogis/thermogis_jar/thermogis-1.7.0-shaded.jar +++ b/src/pythermogis/thermogis_jar/thermogis-1.7.0-shaded.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:207f0a0ecd48947dd4fdb2739edc17eaf60e1cd4351d06915adcc25d29b10e21 -size 173318007 +oid sha256:4367dce45eaf82bb2a1665d00b374a601dc37b4e540645532612c5f9eafbc167 +size 172249041 diff --git a/tests/java/test_ThermoGISDoublet_Benchmark.py b/tests/java/test_ThermoGISDoublet_Benchmark.py index 9dac69befb6774c144829fc719966d3b9b9c9b24..2af7317bd9b2d97f91dc3acfc72de586950e9546 100644 --- a/tests/java/test_ThermoGISDoublet_Benchmark.py +++ b/tests/java/test_ThermoGISDoublet_Benchmark.py @@ -211,18 +211,18 @@ class ThermoGISDoubletBenchmark(TestCase): # Act results = doublet.calculateDoubletPerformance(input) + print(results) # Assert self.assertTrue(np.isclose(17499.99940, transmissivity, 0.001)) self.assertTrue(np.isclose(163.99771118164062, results.flow(), 1)) self.assertTrue(np.isclose(60, results.pres(), 0.001)) - self.assertTrue(np.isclose(4.97566556930542, results.power(), 0.001)) - self.assertTrue(np.isclose(989.2578125, results.welld(), 0.001)) - self.assertTrue(np.isclose(4.383212200392486, results.cop(), 0.001)) - self.assertTrue(np.isclose(10.401010755009017, results.utc(), 0.001)) - self.assertTrue(np.isclose(16.50359210062243, results.capex(), 0.001)) - - @pytest.mark.skip("This test requires a fix in the java core. ignore until fix is pushed") - def test_calculateDoubletPerformance_directheatHP_App(self): + self.assertTrue(np.isclose(5.6734843, results.power(), 0.001)) + self.assertTrue(np.isclose(955.27344, results.welld(), 0.001)) + self.assertTrue(np.isclose(3.8904712, results.cop(), 0.001)) + self.assertTrue(np.isclose(10.368587, results.utc(), 0.001)) + self.assertTrue(np.isclose(17.378712, results.capex(), 0.001)) + + def test_calculateDoubletPerformance_directheatHP2(self): """ This is a copy of a test from the Java ThermoGisDoubletTest.java script; to validate that this python implementation of the ThermoGIS Doublet returns the same values. @@ -240,7 +240,6 @@ class ThermoGISDoubletBenchmark(TestCase): .setOpexPerPower(100) .setOpexBase(0) .setHpDirectHeatInputTemp(80) - #.setHpApplicationMode(True) .setUseHeatPump(True) .setDhReturnTemp(50) .setViscosityMode(ViscosityMode.KESTIN) @@ -252,30 +251,32 @@ class ThermoGISDoubletBenchmark(TestCase): temperature = 50 input = DoubletInput( - -999.0, # unknowninput + -999.0, # unknowninput thickness, transmissivity, - 0.0, # transmissivityWithNtg - 1.0, # ntg - 2000.0, # depth - 0.0,# porosity + 0.0, # transmissivityWithNtg + 1.0, # ntg + 2000.0, # depth + 0.0, # porosity temperature, - None, # ates input + None, # ates input ) doublet = ThermoGISDoublet(Mockito.mock(Logger), RNG(0), utc_properties) # Act results = doublet.calculateDoubletPerformance(input) + print(results) + # Assert self.assertTrue(np.isclose(17499.99940, transmissivity, 0.001)) self.assertTrue(np.isclose(163.99771118164062, results.flow(), 1)) self.assertTrue(np.isclose(60, results.pres(), 0.001)) - self.assertTrue(np.isclose(4.97566556930542, results.power(), 0.001)) - self.assertTrue(np.isclose(989.2578125, results.welld(), 0.001)) - self.assertTrue(np.isclose(4.383212200392486, results.cop(), 0.001)) - self.assertTrue(np.isclose(10.401010755009017, results.utc(), 0.001)) - self.assertTrue(np.isclose(16.50359210062243, results.capex(), 0.001)) + self.assertTrue(np.isclose(5.6734843, results.power(), 0.001)) + self.assertTrue(np.isclose(955.27344, results.welld(), 0.001)) + self.assertTrue(np.isclose(2.6190805, results.cop(), 0.001)) + self.assertTrue(np.isclose(13.150635, results.utc(), 0.001)) + self.assertTrue(np.isclose(19.1619, results.capex(), 0.001)) def test_calculateDoubletPerformance_ORC(self): """ diff --git a/tests/java/test_utc_properties.py b/tests/java/test_utc_properties.py index 3a227ebef9371376ef4d2edef84bf1509feb2dd2..ea8ba5943a13c51703f492372b26a5e1c5fc5e8d 100644 --- a/tests/java/test_utc_properties.py +++ b/tests/java/test_utc_properties.py @@ -4,6 +4,7 @@ from pythermogis import * class UTCBuilder(TestCase): scenarios_file_path = Path(__file__).parent.parent / "resources" / "test_input" / "scenarios" + benchmark_path = Path(__file__).parent.parent / "resources" / "test_benchmark_output" / "ga4a" def test_tg_scenario_xmls_parse_and_run(self): # These are the current 2.4 scenario settings, for BaseCase, HP, Stim and HP&Stim @@ -16,20 +17,32 @@ class UTCBuilder(TestCase): def test_ga4a_scenario_xmls_parse_and_run(self): # The ga4a scenarios no longer work as they are missing necessary input parameters; they were generated by an older version of TG, I corrected them using the gui, producing a new set of configs. scenarios = ["ga4a_ORC_new_config.xml", "ga4a_directheat_new_config.xml", "ga4a_directheatHP_new_config.xml", "ga4a_chiller_new_config.xml"] - utc_properties = [instantiate_utc_properties_from_xml(self.scenarios_file_path / scenario) for scenario in scenarios] - # If test reaches here, then parsing of xml's worked, check that the scenarios actually run on a set of test data: - [self.run_scenario(utc_property) for utc_property in utc_properties] - def run_scenario(self, utc_properties): - input_data = xr.Dataset({ - "thickness_mean": ((), 300), - "thickness_sd": ((), 50), - "ntg": ((), 0.5), - "porosity": ((), 0.5), - "depth": ((), 5000), - "ln_permeability_mean": ((), 5), - "ln_permeability_sd": ((), 0.5), - }) - - calculate_doublet_performance_stochastic(input_data, utc_properties=utc_properties) + # If test reaches here, then parsing of xml's worked, check that the scenarios actually run on a set of test data: + for scenario in scenarios: + utc_properties = instantiate_utc_properties_from_xml(self.scenarios_file_path / scenario) + benchmark_path = (self.benchmark_path / scenario).with_suffix(".nc") + self.run_scenario(utc_properties, benchmark_path) + + def run_scenario(self, utc_properties, benchmark_path: Path = None): + input_data = xr.Dataset( + { + "thickness_mean": ((), 300), + "thickness_sd": ((), 50), + "ntg": ((), 0.5), + "porosity": ((), 0.5), + "depth": ((), 5000), + "ln_permeability_mean": ((), 5), + "ln_permeability_sd": ((), 0.5), + } + ) + + results = calculate_doublet_performance_stochastic( + input_data, + utc_properties=utc_properties, + rng_seed=0 + ) + + if benchmark_path is not None: + xr.testing.assert_equal(results, xr.load_dataset(benchmark_path)) diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P10_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..c3c472d0fabed4fb4e5d21988ee6a122e822e700 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P50_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..c3c472d0fabed4fb4e5d21988ee6a122e822e700 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P90_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..c3c472d0fabed4fb4e5d21988ee6a122e822e700 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__50yearcooling_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P10_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..f53a0cc1ab40d5227bf9f2721a6c62ad037607b8 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P50_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..fbd35ae5883056acc9ef16d23b1a341d7f939c66 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P90_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..06f7057bef12d352e458238cd97336e439b5c4a7 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__breakthrough_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P10_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..7dca61e107a14f6e069faa3e2de33ef4f231321a Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P50_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..2bd49a68a5a0c20e73a1a9ac1daeab143812e809 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P90_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..85614c7a1c3501fa6440937119d38fb38cc81863 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__capex_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P10_HP.nc index 5c6c239cd8dd344d6faa343515ed63155b3fe142..c0a2495f72e09aa34443187c42ef367c343db95b 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P50_HP.nc index 2bd7d40ca16aaa36941e898076daf7e19bace2f9..d19701951d59df649d7d7643bbc5802a39396630 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P90_HP.nc index 56e00b505e822671e1c4537f85e7d5ba9ecf5258..27073470a48a3701f27c0ad3f4de673b8cbd117b 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__cop_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P10_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..9e5b66f90e21afb3cf874b895b8fc2037e749522 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P50_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..42875864d8a8e2e0d2dcf046bf9807180ef4785c Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P90_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..9e33eb6c084733391760355b3d9adf861457639d Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__fixedopex_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P10_HP.nc index 8f01840b02a733b28ee48ca31d6a486edfc6cd29..65ff038ffc5b96e7bacaee67289ae1728359a45b 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P50_HP.nc index b78a473d829190cf13479123baaf2725a85b3c20..0a8190e9c7658f6679d08b1ceadce292c4c1d8c1 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P90_HP.nc index 097d6ab845217d4325d94e0bec6e187973ffa45f..53080ea31da50e012d9047443a5704ab311c51d8 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__flowr_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P10_HP.nc index 3f71b18331be2fe58f9168a0cdaabda4f3e2dc2e..94dfef412f7c70f0b22c607fc422c08f6ad7c178 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P50_HP.nc index 79229d57ae6394b6f8778ee1cb118eb1324bf2c9..3db2df8cc25ad5428b396e0691d9bf9ab13628fd 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P90_HP.nc index 81a998bf6e7313cc56e5e2f7d15278b56a2d860e..ab2ee52d50d642d33fc0ded323fc179b3c7ee1e3 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_sampled_lod_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_sampled_lod_HP.nc index 79229d57ae6394b6f8778ee1cb118eb1324bf2c9..3db2df8cc25ad5428b396e0691d9bf9ab13628fd 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__h_sampled_lod_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__h_sampled_lod_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__hc_accum_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__hc_accum_HP.nc index 8a2d73ce2f2acfdc7418cb110f87c5840caba836..9bc7183963dcdec646d4de45173081cd1f0a76f0 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__hc_accum_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__hc_accum_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P10_HP.nc index 91201b282981cdd80e54d0d4c97912956090cd0a..203a04e066277db9fa39971348c6cd108978e2a1 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P50_HP.nc index e2a6b541dad0a92ed0b01787143edbf6e46b60de..cb3845532b5d4ae7a41e28d2093d212227302e1e 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P90_HP.nc index 911c766791426f49a123d90723572f234bbcdd06..11ad5e13c5da54c381b7abcd4a0b5f350809365d 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__hprod_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P10_HP.nc index a621fa4edd36551c793fe5611863dcb92e24606e..09685784b13c9710b0bf2577cc8b29e0239f9879 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P50_HP.nc index 0dace5a85b9c35c491983f8cea39490e46bd38b3..375a5552d83af04a9ad0953bfc4d2c584a72c63e 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P90_HP.nc index b8f6d2fbbb45b2e5d8a63856bae54fdf3c887bec..70f879f87a68a363fabd7c00015bda0ddc177732 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__k_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P10_HP.nc index 7f7c291c2766877437e11ea2c3c00d54a0065a16..4083aa09d2dec963a88ecef2f0b75f1acda10201 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P50_HP.nc index 06af8d11d817f59b0e497f50da0b81b57fee7889..8ed82d32cb9a088c9708c4ebf2aad1b8ed854cd8 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P90_HP.nc index 7ee9c0e0a414ad5736fd5490e443617b0fbc1eae..e7f5fabca42ec0caa9fb5809787c7eb577969956 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__kh_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P10_HP.nc index ee37e5c3f9e080fea204f0c6ec100e984ce2a314..53958df4b11afbd7558f92455ca41a20bde86888 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P50_HP.nc index 7816c36420f0dc61c11b0100e2548169ad522c4c..1ab5070c0586364bca92e3a10034f0725d3a3ea0 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P90_HP.nc index 7c0997b9767683e38af87cdb0b4d11b46c0a4075..3c2ef876f6a12a78fd6d538106966c05d0fca9d2 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__npv_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__ntg_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__ntg_HP.nc index f384fd1396561732fd02c763b87bc463d563e2d1..9d611285ec487b6b173eb2201e72c091589c1900 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__ntg_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__ntg_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P10_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..63e30f1c6719fdec8baec128479277ff3ae3beee Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P50_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..b36720fa13f7401800c8b562ea82c311edb92ec3 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P90_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..926c3868fa3af90960a09710b4ef7c5bb270239a Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__opex_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__porosity_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__porosity_HP.nc index d1c7673d9ae84217bf9b2a332bb87be1ee26d13a..c76ce7dc2db077af7640ce3a062eac6abba74a4a 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__porosity_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__porosity_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P10_HP.nc index 15495019ef9a9b14fc9c24735d1d51740cdc7530..b7624ae049113d2daf41b441bae5a1608db8e12a 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P50_HP.nc index c51fa5cea46da5f2b173da072ca0b3bed8ccd4f7..82d1dd7f4fb88e8df3c54db0433fd494bb9a1ee4 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P90_HP.nc index d4a2aa16a6329afb05ec8d1c255c04364bc1ef6f..10792f93c9f7e5644268a8b7c156d4db6f70fe14 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P10_HP.nc index b3440e6568164a4ec3ffe84eb46f063f4e0caf2d..f2f33e9af244c7fc093fcacd59b2819fc975e727 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P50_HP.nc index b3440e6568164a4ec3ffe84eb46f063f4e0caf2d..23fc31e393722a9fab41ea0f8099a91e5bfc7e83 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P90_HP.nc index b3440e6568164a4ec3ffe84eb46f063f4e0caf2d..19728940d54a2aa500877d171dd2371b35bf2e84 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__power_heatpump_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P10_HP.nc index 4ae8124dffb75b28bc651f6791c688cab7271fe3..01c066a64ad3b53e7752d9aa09f05b13f8190acd 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P50_HP.nc index 725a0bc9ca15badc13fa238cedd0bbb865673c0e..b7fd85d791d9991a76517d503107beb6e9387778 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P90_HP.nc index 2c8a9e54bafd8cc5600707d76eb54fc78ac84e6f..fe1f2f2568fc30af79d6da33c39c41f7aa4f4a0a 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__pres_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__temperature_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__temperature_HP.nc index 3b7b58bacae4501a3388448336c0fe61e0456518..dfd9343a219f00c755aaccdbd387220542de7553 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__temperature_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__temperature_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__top_depth_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__top_depth_HP.nc index 69f8e2c5301131a0a02b994879ea6d584e412d3b..0955299f609a409d71fded2dca0a4ed7bd885ef5 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__top_depth_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__top_depth_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P10_HP.nc index 86688f67c442db929478882258299edebbdcb501..ffe0d659e129a0931a2b4cd65b606f501c1290ef 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P50_HP.nc index d928bb11e7701ce8c8a1f73d2eaf449148f52ee6..5e5a6ad3059849035f5bead6b5f20387a32437ad 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P90_HP.nc index d8e160ecf5af6aeb089d0ef566202ab4fe92599b..c82c1d492cacd2f7dad10ba143861f23670d93f0 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__utc_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P10_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..a658a6cfd6f44e76c98f33893b6bbcec78c0a155 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P50_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..e02de9b9cc1812722aafa7e228b478e071894a74 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P90_HP.nc new file mode 100644 index 0000000000000000000000000000000000000000..783a0c2e2922e030b6c6f94f98b760aef035abd5 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP/simplified__varopex_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P10_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P10_HP.nc index d380235ee50ef59ba4f884920dd42c1660cdb927..de1150010b73958be14be32d069dff1c85ea1581 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P10_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P10_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P50_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P50_HP.nc index 0839e5fbc93372b64e41ea89e4ce1210087a5f1f..caddb8052e040190368eb0d791d4a6bb766a0fc7 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P50_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P50_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P90_HP.nc b/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P90_HP.nc index d864b8961c615e3336ff51c5b92c753367a94f04..9dc6ae19c35848535bc0f3ee95518937fdc4ee09 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P90_HP.nc and b/tests/resources/test_benchmark_output/doublet/HP/simplified__welld_P90_HP.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P10_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..c3c472d0fabed4fb4e5d21988ee6a122e822e700 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P50_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..c3c472d0fabed4fb4e5d21988ee6a122e822e700 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P90_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..c3c472d0fabed4fb4e5d21988ee6a122e822e700 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__50yearcooling_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P10_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..f53a0cc1ab40d5227bf9f2721a6c62ad037607b8 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P50_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..fbd35ae5883056acc9ef16d23b1a341d7f939c66 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P90_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..06f7057bef12d352e458238cd97336e439b5c4a7 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__breakthrough_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P10_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..7dca61e107a14f6e069faa3e2de33ef4f231321a Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P50_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..2bd49a68a5a0c20e73a1a9ac1daeab143812e809 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P90_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..85614c7a1c3501fa6440937119d38fb38cc81863 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__capex_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P10_HP_STIM.nc index 693fcd25384825c21baad23fb3c009d8b0bdebe5..c0a2495f72e09aa34443187c42ef367c343db95b 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P50_HP_STIM.nc index 8c46f796bae8d37f21b582000d3792e005ef84ae..d19701951d59df649d7d7643bbc5802a39396630 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P90_HP_STIM.nc index 4e56b617d005fcc6ee00ad73bfaf4d550f8ef610..27073470a48a3701f27c0ad3f4de673b8cbd117b 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__cop_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P10_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..9e5b66f90e21afb3cf874b895b8fc2037e749522 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P50_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..42875864d8a8e2e0d2dcf046bf9807180ef4785c Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P90_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..9e33eb6c084733391760355b3d9adf861457639d Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__fixedopex_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P10_HP_STIM.nc index 8f01840b02a733b28ee48ca31d6a486edfc6cd29..65ff038ffc5b96e7bacaee67289ae1728359a45b 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P50_HP_STIM.nc index b78a473d829190cf13479123baaf2725a85b3c20..0a8190e9c7658f6679d08b1ceadce292c4c1d8c1 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P90_HP_STIM.nc index 097d6ab845217d4325d94e0bec6e187973ffa45f..53080ea31da50e012d9047443a5704ab311c51d8 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__flowr_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P10_HP_STIM.nc index 3f71b18331be2fe58f9168a0cdaabda4f3e2dc2e..94dfef412f7c70f0b22c607fc422c08f6ad7c178 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P50_HP_STIM.nc index 79229d57ae6394b6f8778ee1cb118eb1324bf2c9..3db2df8cc25ad5428b396e0691d9bf9ab13628fd 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P90_HP_STIM.nc index 81a998bf6e7313cc56e5e2f7d15278b56a2d860e..ab2ee52d50d642d33fc0ded323fc179b3c7ee1e3 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_sampled_lod_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_sampled_lod_HP_STIM.nc index 79229d57ae6394b6f8778ee1cb118eb1324bf2c9..3db2df8cc25ad5428b396e0691d9bf9ab13628fd 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_sampled_lod_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__h_sampled_lod_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hc_accum_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hc_accum_HP_STIM.nc index 8a2d73ce2f2acfdc7418cb110f87c5840caba836..9bc7183963dcdec646d4de45173081cd1f0a76f0 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hc_accum_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hc_accum_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P10_HP_STIM.nc index 91201b282981cdd80e54d0d4c97912956090cd0a..203a04e066277db9fa39971348c6cd108978e2a1 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P50_HP_STIM.nc index e2a6b541dad0a92ed0b01787143edbf6e46b60de..cb3845532b5d4ae7a41e28d2093d212227302e1e 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P90_HP_STIM.nc index 911c766791426f49a123d90723572f234bbcdd06..11ad5e13c5da54c381b7abcd4a0b5f350809365d 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__hprod_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P10_HP_STIM.nc index a621fa4edd36551c793fe5611863dcb92e24606e..09685784b13c9710b0bf2577cc8b29e0239f9879 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P50_HP_STIM.nc index 0dace5a85b9c35c491983f8cea39490e46bd38b3..375a5552d83af04a9ad0953bfc4d2c584a72c63e 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P90_HP_STIM.nc index b8f6d2fbbb45b2e5d8a63856bae54fdf3c887bec..70f879f87a68a363fabd7c00015bda0ddc177732 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__k_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P10_HP_STIM.nc index 7f7c291c2766877437e11ea2c3c00d54a0065a16..4083aa09d2dec963a88ecef2f0b75f1acda10201 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P50_HP_STIM.nc index 06af8d11d817f59b0e497f50da0b81b57fee7889..8ed82d32cb9a088c9708c4ebf2aad1b8ed854cd8 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P90_HP_STIM.nc index 7ee9c0e0a414ad5736fd5490e443617b0fbc1eae..e7f5fabca42ec0caa9fb5809787c7eb577969956 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__kh_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P10_HP_STIM.nc index ee37e5c3f9e080fea204f0c6ec100e984ce2a314..53958df4b11afbd7558f92455ca41a20bde86888 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P50_HP_STIM.nc index 7816c36420f0dc61c11b0100e2548169ad522c4c..1ab5070c0586364bca92e3a10034f0725d3a3ea0 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P90_HP_STIM.nc index 7c0997b9767683e38af87cdb0b4d11b46c0a4075..3c2ef876f6a12a78fd6d538106966c05d0fca9d2 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__npv_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__ntg_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__ntg_HP_STIM.nc index f384fd1396561732fd02c763b87bc463d563e2d1..9d611285ec487b6b173eb2201e72c091589c1900 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__ntg_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__ntg_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P10_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..63e30f1c6719fdec8baec128479277ff3ae3beee Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P50_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..b36720fa13f7401800c8b562ea82c311edb92ec3 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P90_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..926c3868fa3af90960a09710b4ef7c5bb270239a Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__opex_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__porosity_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__porosity_HP_STIM.nc index d1c7673d9ae84217bf9b2a332bb87be1ee26d13a..c76ce7dc2db077af7640ce3a062eac6abba74a4a 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__porosity_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__porosity_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P10_HP_STIM.nc index 15495019ef9a9b14fc9c24735d1d51740cdc7530..b7624ae049113d2daf41b441bae5a1608db8e12a 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P50_HP_STIM.nc index c51fa5cea46da5f2b173da072ca0b3bed8ccd4f7..82d1dd7f4fb88e8df3c54db0433fd494bb9a1ee4 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P90_HP_STIM.nc index d4a2aa16a6329afb05ec8d1c255c04364bc1ef6f..10792f93c9f7e5644268a8b7c156d4db6f70fe14 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P10_HP_STIM.nc index b3440e6568164a4ec3ffe84eb46f063f4e0caf2d..f2f33e9af244c7fc093fcacd59b2819fc975e727 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P50_HP_STIM.nc index b3440e6568164a4ec3ffe84eb46f063f4e0caf2d..23fc31e393722a9fab41ea0f8099a91e5bfc7e83 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P90_HP_STIM.nc index b3440e6568164a4ec3ffe84eb46f063f4e0caf2d..19728940d54a2aa500877d171dd2371b35bf2e84 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__power_heatpump_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P10_HP_STIM.nc index 4ae8124dffb75b28bc651f6791c688cab7271fe3..01c066a64ad3b53e7752d9aa09f05b13f8190acd 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P50_HP_STIM.nc index 725a0bc9ca15badc13fa238cedd0bbb865673c0e..b7fd85d791d9991a76517d503107beb6e9387778 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P90_HP_STIM.nc index 2c8a9e54bafd8cc5600707d76eb54fc78ac84e6f..fe1f2f2568fc30af79d6da33c39c41f7aa4f4a0a 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__pres_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__temperature_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__temperature_HP_STIM.nc index 3b7b58bacae4501a3388448336c0fe61e0456518..dfd9343a219f00c755aaccdbd387220542de7553 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__temperature_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__temperature_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__top_depth_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__top_depth_HP_STIM.nc index 69f8e2c5301131a0a02b994879ea6d584e412d3b..0955299f609a409d71fded2dca0a4ed7bd885ef5 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__top_depth_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__top_depth_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P10_HP_STIM.nc index 86688f67c442db929478882258299edebbdcb501..ffe0d659e129a0931a2b4cd65b606f501c1290ef 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P50_HP_STIM.nc index d928bb11e7701ce8c8a1f73d2eaf449148f52ee6..5e5a6ad3059849035f5bead6b5f20387a32437ad 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P90_HP_STIM.nc index d8e160ecf5af6aeb089d0ef566202ab4fe92599b..c82c1d492cacd2f7dad10ba143861f23670d93f0 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__utc_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P10_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..a658a6cfd6f44e76c98f33893b6bbcec78c0a155 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P50_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..e02de9b9cc1812722aafa7e228b478e071894a74 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P90_HP_STIM.nc new file mode 100644 index 0000000000000000000000000000000000000000..783a0c2e2922e030b6c6f94f98b760aef035abd5 Binary files /dev/null and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__varopex_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P10_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P10_HP_STIM.nc index d380235ee50ef59ba4f884920dd42c1660cdb927..de1150010b73958be14be32d069dff1c85ea1581 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P10_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P10_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P50_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P50_HP_STIM.nc index 0839e5fbc93372b64e41ea89e4ce1210087a5f1f..caddb8052e040190368eb0d791d4a6bb766a0fc7 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P50_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P50_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P90_HP_STIM.nc b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P90_HP_STIM.nc index d864b8961c615e3336ff51c5b92c753367a94f04..9dc6ae19c35848535bc0f3ee95518937fdc4ee09 100644 Binary files a/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P90_HP_STIM.nc and b/tests/resources/test_benchmark_output/doublet/HP_STIM/simplified__welld_P90_HP_STIM.nc differ diff --git a/tests/resources/test_benchmark_output/ga4a/ga4a_ORC_new_config.nc b/tests/resources/test_benchmark_output/ga4a/ga4a_ORC_new_config.nc new file mode 100644 index 0000000000000000000000000000000000000000..565e5f79a6f0f12a230edd9284dcfe7023c03a0a Binary files /dev/null and b/tests/resources/test_benchmark_output/ga4a/ga4a_ORC_new_config.nc differ diff --git a/tests/resources/test_benchmark_output/ga4a/ga4a_chiller_new_config.nc b/tests/resources/test_benchmark_output/ga4a/ga4a_chiller_new_config.nc new file mode 100644 index 0000000000000000000000000000000000000000..e8c82e1058d4129b1a7d3b7a531db5d0de0fd3e1 Binary files /dev/null and b/tests/resources/test_benchmark_output/ga4a/ga4a_chiller_new_config.nc differ diff --git a/tests/resources/test_benchmark_output/ga4a/ga4a_directheatHP_new_config.nc b/tests/resources/test_benchmark_output/ga4a/ga4a_directheatHP_new_config.nc new file mode 100644 index 0000000000000000000000000000000000000000..9e499279dfbedbf5f2c9be942d16475f11ddc216 Binary files /dev/null and b/tests/resources/test_benchmark_output/ga4a/ga4a_directheatHP_new_config.nc differ diff --git a/tests/resources/test_benchmark_output/ga4a/ga4a_directheat_new_config.nc b/tests/resources/test_benchmark_output/ga4a/ga4a_directheat_new_config.nc new file mode 100644 index 0000000000000000000000000000000000000000..d52d77d742d90d443e9c009c757aac5ef4068330 Binary files /dev/null and b/tests/resources/test_benchmark_output/ga4a/ga4a_directheat_new_config.nc differ diff --git a/tests/simulation/test_pythermogis_doublet_benchmark.py b/tests/simulation/test_pythermogis_doublet_benchmark.py index cc274af2e9f263c9031411b1de5b07b0e3427b15..74ecf7085a70c89695e0c4aac9b28a4bec612b22 100644 --- a/tests/simulation/test_pythermogis_doublet_benchmark.py +++ b/tests/simulation/test_pythermogis_doublet_benchmark.py @@ -1,5 +1,7 @@ from unittest import TestCase +import pytest + from pythermogis import * @@ -174,7 +176,8 @@ class ThermoGISDoubletBenchmark(TestCase): def test_calculateDoubletPerformance_directHeat_and_heatpump(self): """ - This is a copy of a test from the Java ThermoGisDoubletTest.java script; to validate that this python implementation of the ThermoGIS Doublet + This is a copy of a test from the Java ThermoGisDoubletTest.java script; + to validate that this python implementation of the ThermoGIS Doublet. returns the same values. """ # Arrange @@ -196,32 +199,33 @@ class ThermoGISDoubletBenchmark(TestCase): "ntg": ((), 1.0), "porosity": ((), 0.0), "depth": ((), 2000), - "temperature": ((), 50), + "temperature": ((), 60), "ln_permeability_mean": ((), np.log(175)), "ln_permeability_sd": ((), 0.0), } ) + # Act results = calculate_doublet_performance_stochastic( - input_data, utc_properties=utc_properties, rng_seed=0 + input_data, + utc_properties=utc_properties, + rng_seed=0 ) power_hpelec = results.heat_pump_power / (results.cophp - 1) power_ratio = results.power / (results.power + power_hpelec) - - # Assert - self.assertTrue(np.isclose(5.856159806251526, results.power + power_hpelec, 0.1)) - self.assertTrue(np.isclose(8.83718197747828, results.utc * power_ratio, 0.1)) - self.assertTrue(np.isclose(17499.99940, 17500, 0.001)) - self.assertTrue(np.isclose(163.99771118164062, results.flow_rate, 0.001)) + self.assertTrue(np.isclose(9.24121513, results.power + power_hpelec, 0.1)) + self.assertTrue(np.isclose(7.06127862, results.utc * power_ratio, 0.1)) + self.assertTrue(np.isclose(162.15298462, results.flow_rate, 0.001)) self.assertTrue(np.isclose(60, results.pres, 0.001)) - self.assertTrue(np.isclose(4.97566556930542, results.power, 0.001)) - self.assertTrue(np.isclose(989.2578125, results.welld, 0.001)) - self.assertTrue(np.isclose(4.383212200392486, results.cop, 0.001)) - self.assertTrue(np.isclose(3.798196792602539, results.cophp, 0.001)) - self.assertTrue(np.isclose(10.401010755009017, results.utc, 0.001)) - self.assertTrue(np.isclose(16.50359210062243, results.capex, 0.001)) + self.assertTrue(np.isclose(7.76031208, results.power, 0.001)) + self.assertTrue(np.isclose(977.9296875, results.welld, 0.001)) + self.assertTrue(np.isclose(4.78490305, results.cop, 0.001)) + self.assertTrue(np.isclose(3.40475416, results.cophp, 0.001)) + self.assertTrue(np.isclose(8.40878487, results.utc, 0.001)) + self.assertTrue(np.isclose(18.24893951, results.capex, 0.001)) + def setup_template_utc_properties_builder(self): viscosity_mode = get_viscosity_mode("kestin") diff --git a/tests/simulation/test_thermogis_scenarios.py b/tests/simulation/test_thermogis_scenarios.py index ae63b42e4d85677612f7fd37cca36daf1d246e98..9fb2b6efb9a5f3b51f5ad41e334e3ca364572378 100644 --- a/tests/simulation/test_thermogis_scenarios.py +++ b/tests/simulation/test_thermogis_scenarios.py @@ -1,5 +1,4 @@ -import shutil -from os import path +import pytest from unittest import TestCase from pygridsio import read_grid