TNO Intern

Commit 6d471743 authored by Hen Brett's avatar Hen Brett 🐔
Browse files

Testing some optimization methods from scipy for well distance

parent 91f3490f

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ dist 


tests/resources/test_output



pydoubletcalc_install
 
 No newline at end of file

pixi.lock

+1 −41
Original line number Diff line number Diff line
@@ -252,7 +252,6 @@ environments: 
      - pypi: https://files.pythonhosted.org/packages/8f/e9/6a7d025d8da8c4931522922cd706105aa32b3291d1add8c5427cdcd66e63/kiwisolver-1.4.8-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

      - pypi: https://files.pythonhosted.org/packages/f5/64/41c4367bcaecbc03ef0d2a3ecee58a7065d0a36ae1aa817fe573a2da66d4/matplotlib-3.10.3-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

      - pypi: https://files.pythonhosted.org/packages/d1/80/b9c19f1bb4ac6c5fa6f94a4f278bc68a778473d1814a86a375d7cffa193a/netCDF4-1.7.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

      - pypi: https://files.pythonhosted.org/packages/78/f9/690a8600b93c332de3ab4a344a4ac34f00c8f104917061f779db6a918ed6/pathlib-1.0.1-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/02/65/ad2bc85f7377f5cfba5d4466d5474423a3fb7f6a97fd807c06f92dd3e721/plotly-6.0.1-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/c9/58/c3bc54c0fad9a82899e9a2703e04ee6e8eaa76caa90c0689fd1b468a4427/pygridsio-1.0-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/ea/00/d815833441d8c52bf4a6930952e77d3de77d0bf67b3202ccc12dabdae279/pykrige-1.7.2.tar.gz
@@ -264,9 +263,7 @@ environments: 
      - pypi: https://files.pythonhosted.org/packages/2a/2f/63d2cacc0e525f8e3398bcf32bd3620385f22cd1600834ec49d7f3597a7b/rioxarray-0.19.0-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/21/f6/4bfb5695d8941e5c570a04d9fcd0d36bce7511b7d78e6e75c8f9791f82d0/scipy-1.16.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl

      - pypi: https://files.pythonhosted.org/packages/d1/a7/5c9cb413e4e2ce52c16be717e94abd40ce91b1f8974624d5d56154c5d40b/shapely-2.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

      - pypi: https://files.pythonhosted.org/packages/d0/30/dc54f88dd4a2b5dc8a0279bdd7270e735851848b762aeb1c1184ed1f6b14/tqdm-4.67.1-py3-none-any.whl

      - pypi: ./

      - pypi: C:/work/projects/pydoubletcalc

      win-64:

      - conda: https://conda.anaconda.org/conda-forge/win-64/_openmp_mutex-4.5-2_gnu.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/_python_abi3_support-1.0-hd8ed1ab_2.conda
@@ -489,7 +486,6 @@ environments: 
      - pypi: https://files.pythonhosted.org/packages/d0/dc/c1abe38c37c071d0fc71c9a474fd0b9ede05d42f5a458d584619cfd2371a/kiwisolver-1.4.8-cp313-cp313-win_amd64.whl

      - pypi: https://files.pythonhosted.org/packages/b1/0f/eed564407bd4d935ffabf561ed31099ed609e19287409a27b6d336848653/matplotlib-3.10.3-cp313-cp313-win_amd64.whl

      - pypi: https://files.pythonhosted.org/packages/66/b5/e04550fd53de57001dbd5a87242da7ff784c80790adc48897977b6ccf891/netCDF4-1.7.2-cp313-cp313-win_amd64.whl

      - pypi: https://files.pythonhosted.org/packages/78/f9/690a8600b93c332de3ab4a344a4ac34f00c8f104917061f779db6a918ed6/pathlib-1.0.1-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/02/65/ad2bc85f7377f5cfba5d4466d5474423a3fb7f6a97fd807c06f92dd3e721/plotly-6.0.1-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/c9/58/c3bc54c0fad9a82899e9a2703e04ee6e8eaa76caa90c0689fd1b468a4427/pygridsio-1.0-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/ea/00/d815833441d8c52bf4a6930952e77d3de77d0bf67b3202ccc12dabdae279/pykrige-1.7.2.tar.gz
@@ -501,9 +497,7 @@ environments: 
      - pypi: https://files.pythonhosted.org/packages/2a/2f/63d2cacc0e525f8e3398bcf32bd3620385f22cd1600834ec49d7f3597a7b/rioxarray-0.19.0-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/cd/01/1204382461fcbfeb05b6161b594f4007e78b6eba9b375382f79153172b4d/scipy-1.16.3-cp313-cp313-win_amd64.whl

      - pypi: https://files.pythonhosted.org/packages/e3/f0/9f8cdf2258d7aed742459cea51c70d184de92f5d2d6f5f7f1ded90a18c31/shapely-2.1.0-cp313-cp313-win_amd64.whl

      - pypi: https://files.pythonhosted.org/packages/d0/30/dc54f88dd4a2b5dc8a0279bdd7270e735851848b762aeb1c1184ed1f6b14/tqdm-4.67.1-py3-none-any.whl

      - pypi: ./

      - pypi: C:/work/projects/pydoubletcalc

packages:

- conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2

  sha256: fe51de6107f9edc7aa4f786a70f4a883943bc9d39b3bb7307c04c41410990726
@@ -4477,10 +4471,6 @@ packages: 
  - pkg:pypi/partd?source=hash-mapping

  size: 20884

  timestamp: 1715026639309

- pypi: https://files.pythonhosted.org/packages/78/f9/690a8600b93c332de3ab4a344a4ac34f00c8f104917061f779db6a918ed6/pathlib-1.0.1-py3-none-any.whl

  name: pathlib

  version: 1.0.1

  sha256: f35f95ab8b0f59e6d354090350b44a80a80635d22efdedfa84c7ad1cf0a74147

- conda: https://conda.anaconda.org/conda-forge/noarch/pathspec-0.12.1-pyhd8ed1ab_1.conda

  sha256: 9f64009cdf5b8e529995f18e03665b03f5d07c0b17445b8badef45bde76249ee

  md5: 617f15191456cc6a13db418a275435e5
@@ -4762,20 +4752,6 @@ packages: 
  - pkg:pypi/pycparser?source=hash-mapping

  size: 110100

  timestamp: 1733195786147

- pypi: C:/work/projects/pydoubletcalc

  name: pydoubletcalc

  version: 0.0.1

  sha256: 1b87a6c98d8a21914c58ea91edf0a8a2d4b833b55a4fd1f82147e06b3eb9d6c3

  requires_dist:

  - pandas

  - matplotlib

  - pathlib

  - xarray

  - tqdm>=4.67.1

  - scipy>=1.16.2

  - numba>=0.62.1

  requires_python: '>=3.13,<3.14'

  editable: true

- conda: https://conda.anaconda.org/conda-forge/noarch/pygments-2.19.1-pyhd8ed1ab_0.conda

  sha256: 28a3e3161390a9d23bc02b4419448f8d27679d9e2c250e29849e37749c8de86b

  md5: 232fb4577b6687b2d503ef8e254270c9
@@ -4943,7 +4919,7 @@ packages: 
- pypi: ./

  name: pythermogis

  version: 1.2.0

  sha256: 854f508e9aa3672887f5ab062a2aeb06ef019944c70aa0c96a345e478f35e6d9

  sha256: f484b4cf939f0f4b0cccabf53e301e4ab4b85f1f4d96b533dbee0e63dfeb1415

  requires_dist:

  - jpype1>=1.5.2,<2

  - xarray==2024.9.0.*
@@ -5640,22 +5616,6 @@ packages: 
  - pkg:pypi/tornado?source=hash-mapping

  size: 878044

  timestamp: 1748003914685

- pypi: https://files.pythonhosted.org/packages/d0/30/dc54f88dd4a2b5dc8a0279bdd7270e735851848b762aeb1c1184ed1f6b14/tqdm-4.67.1-py3-none-any.whl

  name: tqdm

  version: 4.67.1

  sha256: 26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2

  requires_dist:

  - colorama ; sys_platform == 'win32'

  - pytest>=6 ; extra == 'dev'

  - pytest-cov ; extra == 'dev'

  - pytest-timeout ; extra == 'dev'

  - pytest-asyncio>=0.24 ; extra == 'dev'

  - nbval ; extra == 'dev'

  - requests ; extra == 'discord'

  - slack-sdk ; extra == 'slack'

  - requests ; extra == 'telegram'

  - ipywidgets>=6 ; extra == 'notebook'

  requires_python: '>=3.7'

- conda: https://conda.anaconda.org/conda-forge/noarch/twine-6.1.0-pyh29332c3_0.conda

  sha256: c5b373f6512b96324c9607d7d91a76bb53c1056cb1012b4f9c86900c6b7f8898

  md5: d319066fad04e07a0223bf9936090161

pyproject.toml

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ platforms = ["win-64", "linux-64"] 


[tool.pixi.pypi-dependencies]

pythermogis = { path = ".", editable = true }

pydoubletcalc = { path = 'C:\work\projects\pydoubletcalc', editable = true }



[tool.pixi.tasks]

test = "PYTHONPATH=src/pythermogis pytest -s tests/"

src/pythermogis/workflow/utc/doublet.py

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ from pythermogis.workflow.utc.doublet_utils import calculate_injection_temp_with 
    calc_lifetime

from pythermogis.workflow.utc.pressure import calculate_max_pressure, optimize_pressure

from pythermogis.workflow.utc.cooling_temp import calculate_cooling_temperature

from pythermogis.workflow.utc.well_distance import optimize_well_distance

from pythermogis.workflow.utc.well_distance import optimize_well_distance, \

    optimize_well_distance2

from utils.timer import print_time



EUR_PER_CT_PER_KWH = 0.36

src/pythermogis/workflow/utc/doubletcalc.py

+6 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ def doubletcalc( 
        thermal_conductivity=3,

        thermal_diffusivity=1.2e-6,

    )



    injector = Well(

        aquifer=aquifer,

        well_type="injector",
@@ -67,6 +68,7 @@ def doubletcalc( 
        viscosity_mode=props.viscosity_mode,

        heat_exchanger_exit_temperature=injection_temp,

    )



    producer = Well(

        aquifer=aquifer,

        well_type="producer",
@@ -100,10 +102,13 @@ def doubletcalc( 
        viscosity_mode=props.viscosity_mode,

        heat_exchanger_exit_temperature=injection_temp,

    )

    doublet.simulate()



    # don't calculate lifetime as it is unneded for Doublet1DResults

    doublet.calculate_mass_rate()

    if not doublet.simulation_success:

        return None

    doublet.calculate_geothermal_power()

    doublet.calculate_power()



    return Doublet1DResults(

        geothermal_powers=doublet.geothermal_power,