TNO Intern

Commit 8c561328 authored by Florian Knappers's avatar Florian Knappers
Browse files

made rosl roslu file working on everyones machine. Outputs gridsio plots

parent a8da3d1d

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -13,3 +13,5 @@ tests/resources/test_output 
pydoubletcalc_install



workdir



**/output_plots/**
 
 No newline at end of file

pixi.lock

+1 −41
Original line number Diff line number Diff line
@@ -259,7 +259,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
@@ -271,9 +270,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:/Users/knappersfy/work/thermogis/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
@@ -503,7 +500,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
@@ -515,9 +511,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:/Users/knappersfy/work/thermogis/pydoubletcalc

packages:

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

  sha256: fe51de6107f9edc7aa4f786a70f4a883943bc9d39b3bb7307c04c41410990726
@@ -4586,10 +4580,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
@@ -4871,20 +4861,6 @@ packages: 
  - pkg:pypi/pycparser?source=hash-mapping

  size: 110100

  timestamp: 1733195786147

- pypi: C:/Users/knappersfy/work/thermogis/pydoubletcalc

  name: pydoubletcalc

  version: 0.0.3

  sha256: a391e31a4d31cad94ef6af7520fb9418f2c7f1741fa28384734097c9fda1b1fd

  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
@@ -5052,7 +5028,7 @@ packages: 
- pypi: ./

  name: pythermogis

  version: 1.2.0

  sha256: 5307b5b9e674861991952ee2bb4da21dfc517e11259fd4ed7735f28b5fb54408

  sha256: 96d4e249477e549b0fbfb95ade5544ae3707d2b53f9eca167d9b594b49bd09a6

  requires_dist:

  - jpype1>=1.5.2,<2

  - xarray==2025.12.0.*
@@ -5780,22 +5756,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:\Users\knappersfy\work\thermogis\pydoubletcalc', editable = true }



[tool.pixi.tasks]

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

src/pythermogis/workflow/utc/utc.py

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ def compute_results_for_aquifer( 
        x=aquifer_ds.x, y=aquifer_ds.y, method="linear"

    )

    temperature = temp_xy_aligned.interp(z=mid_depth, method="linear")

    temperature = temperature.drop_vars('z', errors='ignore')



    aquifer_ds["temperature"] = temperature

tests/utc/input/NetherlandsTemperatureModel_extended.nc

0 → 100644
+153 MiB

File added.

No diff preview for this file type.

View file