TNO Intern

Commit ebc52862 authored by Florian Knappers's avatar Florian Knappers
Browse files

Merge branch '62-update-pythermogis-after-removing-economical-data-in-java-code' into 'main' 

Resolve "Update pythermogis after removing economical data in java code"

Closes #62

See merge request AGS/pythermogis!77
parents fb71b2d4 9690808e

src/pythermogis/thermogis_classes/doublet.py

+4 −4
Original line number Diff line number Diff line
@@ -108,14 +108,14 @@ def calculate_performance_of_single_location(mask: float, depth: float, thicknes 
    else:

        utc_cut = utc_properties.utcCutoff()



    hprod = doublet.economicalData.getDiscountedHeatProducedP()

    npv = 1e-6 * (utc_cut - doublet.getUtcPeurctkWh()) * 3.6 * hprod * (1 - doublet.economicalData.getTaxRate())

    hprod = doublet.getDiscountedHeatProducedP()

    npv = 1e-6 * (utc_cut - doublet.getUtcPeurctkWh()) * 3.6 * hprod * (1 - utc_properties.taxRate())



    # get values from doublet

    output_values = {"power": doublet.doubletCalc1DData.getHpP(),

                     "heat_pump_power": doublet.doubletCalc1DData.getHpPHeatPump(),

                     "capex": doublet.economicalData.getSumcapex(),

                     "opex": doublet.economicalData.getOpexFirstProdYear(),

                     "capex": doublet.getSumcapex(),

                     "opex": doublet.getOpexFirstProdYear(),

                     "utc": doublet.getUtcPeurctkWh(),

                     "npv": npv,

                     "hprod": hprod,

tests/test_ThermoGISDoublet_Benchmark.py

+4 −4
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ class ThermoGISDoubletBenchmark(TestCase): 
        self.assertTrue(np.isclose(1159.1796, doublet.doubletCalc1DData.getWellDistance(), 0.001))

        self.assertTrue(np.isclose(13.623167037963867, doublet.doubletCalc1DData.getCop(), 0.001))

        self.assertTrue(np.isclose(5.229816400909403, doublet.getUtcPeurctkWh(), 0.001))

        self.assertTrue(np.isclose(16.439682499211536, doublet.economicalData.getSumcapex(), 0.001))

        self.assertTrue(np.isclose(16.439682499211536, doublet.getSumcapex(), 0.001))

        self.assertTrue(np.isclose(8.624696731567383, doublet.doubletCalc1DData.getHeatPowerPerDoublet(), 0.001))



    def test_calculateDoubletPerformance_chiller(self):
@@ -139,7 +139,7 @@ class ThermoGISDoubletBenchmark(TestCase): 
        self.assertTrue(np.isclose(1227.1484375, doublet.doubletCalc1DData.getWellDistance(), 0.001))

        self.assertTrue(np.isclose(1.8887300754346803, doublet.doubletCalc1DData.getCop(), 0.001))

        self.assertTrue(np.isclose(1.6594701766967774, doublet.doubletCalc1DData.getHeatPowerPerDoublet(), 0.001))

        self.assertTrue(np.isclose(12.748051248109613, doublet.economicalData.getSumcapex(), 0.001))

        self.assertTrue(np.isclose(12.748051248109613, doublet.getSumcapex(), 0.001))



    def test_calculateDoubletPerformance_directheatHP(self):

        """
@@ -188,7 +188,7 @@ class ThermoGISDoubletBenchmark(TestCase): 
        self.assertTrue(np.isclose(955.27, doublet.doubletCalc1DData.getWellDistance(), 0.001))

        self.assertTrue(np.isclose(3.51, doublet.doubletCalc1DData.getCop(), 0.001))

        self.assertTrue(np.isclose(10.9, doublet.getUtcPeurctkWh(), 0.001))

        self.assertTrue(np.isclose(17.56, doublet.economicalData.getSumcapex(), 0.001))

        self.assertTrue(np.isclose(17.56, doublet.getSumcapex(), 0.001))





    def test_calculateDoubletPerformance_ORC(self):
@@ -236,7 +236,7 @@ class ThermoGISDoubletBenchmark(TestCase): 
        self.assertTrue(np.isclose(0.05274631495788107, doublet.doubletCalc1DData.getHeatPowerPerDoublet(), 0.01))

        self.assertTrue(np.isclose(1306.4453125, doublet.doubletCalc1DData.getWellDistance(), 0.001))

        self.assertTrue(np.isclose(0.06459403120103477, doublet.doubletCalc1DData.getCop(), 0.001))

        self.assertTrue(np.isclose(12.44409167482118, doublet.economicalData.getSumcapex(), 0.001))

        self.assertTrue(np.isclose(12.44409167482118, doublet.getSumcapex(), 0.001))



    def setup_template_utc_properties_builder(self):

        return (instantiate_utc_properties_builder()