TNO Intern

Commit 91be8f4c authored by Hen Brett's avatar Hen Brett 🐔
Browse files

Changing the import statements

parent 28651ee8

pixi.lock

+7 −7
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ environments: 
      - 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/13/eb/2552ecebc0b887f539111c2cd241f538b8ff5891b8903dfe672e997529be/pillow-11.2.1-cp313-cp313-manylinux_2_28_x86_64.whl

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

      - pypi: https://files.pythonhosted.org/packages/fc/ee/41a18c1b90d919a4fc7e2ae26875d77a0fb08224f19c92df1c3079762205/pygridsio-0.3.25-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/c2/70/6b5ba59d170fa4a873ae30de74c5d234a12654c282df64b0479413f08ccc/pygridsio-0.3.27-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/ea/00/d815833441d8c52bf4a6930952e77d3de77d0bf67b3202ccc12dabdae279/pykrige-1.7.2.tar.gz

      - pypi: https://files.pythonhosted.org/packages/9f/bb/e12bebcf2668bcb83736cc76177f36ee300ac8069880fca3a73f8753fc70/pyogrio-0.11.0-cp313-cp313-manylinux_2_28_x86_64.whl

      - pypi: https://files.pythonhosted.org/packages/05/e7/df2285f3d08fee213f2d041540fa4fc9ca6c2d44cf36d3a035bf2a8d2bcc/pyparsing-3.2.3-py3-none-any.whl
@@ -276,7 +276,7 @@ environments: 
      - pypi: https://files.pythonhosted.org/packages/66/b5/e04550fd53de57001dbd5a87242da7ff784c80790adc48897977b6ccf891/netCDF4-1.7.2-cp313-cp313-win_amd64.whl

      - pypi: https://files.pythonhosted.org/packages/6d/ec/1179083b8d6067a613e4d595359b5fdea65d0a3b7ad623fee906e1b3c4d2/pillow-11.2.1-cp313-cp313-win_amd64.whl

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

      - pypi: https://files.pythonhosted.org/packages/fc/ee/41a18c1b90d919a4fc7e2ae26875d77a0fb08224f19c92df1c3079762205/pygridsio-0.3.25-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/c2/70/6b5ba59d170fa4a873ae30de74c5d234a12654c282df64b0479413f08ccc/pygridsio-0.3.27-py3-none-any.whl

      - pypi: https://files.pythonhosted.org/packages/ea/00/d815833441d8c52bf4a6930952e77d3de77d0bf67b3202ccc12dabdae279/pykrige-1.7.2.tar.gz

      - pypi: https://files.pythonhosted.org/packages/46/8f/a9d134fbbf213db259b79f5bd5bbe7e3de1ff34fbe2a0b0be9d7d2919323/pyogrio-0.11.0-cp313-cp313-win_amd64.whl

      - pypi: https://files.pythonhosted.org/packages/05/e7/df2285f3d08fee213f2d041540fa4fc9ca6c2d44cf36d3a035bf2a8d2bcc/pyparsing-3.2.3-py3-none-any.whl
@@ -2151,10 +2151,10 @@ packages: 
  - pkg:pypi/pygments?source=hash-mapping

  size: 888600

  timestamp: 1736243563082

- pypi: https://files.pythonhosted.org/packages/fc/ee/41a18c1b90d919a4fc7e2ae26875d77a0fb08224f19c92df1c3079762205/pygridsio-0.3.25-py3-none-any.whl

- pypi: https://files.pythonhosted.org/packages/c2/70/6b5ba59d170fa4a873ae30de74c5d234a12654c282df64b0479413f08ccc/pygridsio-0.3.27-py3-none-any.whl

  name: pygridsio

  version: 0.3.25

  sha256: 21c660a4e2995bee2a24d1d30a53f90552648cbd36870499f562b877922c78c1

  version: 0.3.27

  sha256: b8b222455de2a2c447609eb4ac13a11777ce63ce70512feb56ebe5898be7a674

  requires_dist:

  - numpy

  - pandas
@@ -2294,13 +2294,13 @@ packages: 
- pypi: .

  name: pythermogis

  version: 0.1.28

  sha256: e995258f873c0fe9c990e90907d5ae854c66fc4ceb3af0e8974cc08397008e27

  sha256: c80a52cf0838dae4fcbe27a0313cd66844b3d91052f2d018e82eb874e57a396d

  requires_dist:

  - jpype1>=1.5.2,<2

  - xarray==2024.9.0.*

  - pandas>=2.2.3,<3

  - pytz>=2024.1,<2025

  - pygridsio>=0.3.11,<0.4

  - pygridsio>=0.3.27,<0.4

  - build>=1.2.2.post1,<2

  requires_python: '>=3.11'

  editable: true

pyproject.toml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ dependencies = [ 
    "xarray==2024.9.0.*",

    "pandas>=2.2.3,<3",

    "pytz>=2024.1,<2025",

    "pygridsio>=0.3.11,<0.4"

    "pygridsio>=0.3.27,<0.4"

, "build>=1.2.2.post1,<2"]

src/pythermogis/plotting/plot_doublet_performance_results.py

+0 −2
Original line number Diff line number Diff line 
import math



import numpy as np

import xarray as xr

from pygridsio import plot_grid

import matplotlib.pyplot as plt

src/pythermogis/thermogis_classes/doublet.py

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ import numpy as np 
import xarray as xr

from jpype import JClass



from physics.temperature_grid_calculation import calculate_temperature_from_gradient

from transmissivity.calculate_thick_perm_trans import generate_thickness_permeability_transmissivity_for_pvalues

from thermogis_classes.utc_properties import instantiate_utc_properties_builder

from pythermogis.physics.temperature_grid_calculation import calculate_temperature_from_gradient

from pythermogis.transmissivity.calculate_thick_perm_trans import generate_thickness_permeability_transmissivity_for_pvalues

from pythermogis.thermogis_classes.utc_properties import instantiate_utc_properties_builder





def calculate_doublet_performance(input_data: xr.Dataset,

src/pythermogis/thermogis_classes/jvm_start.py

+0 −1
Original line number Diff line number Diff line 
import os

from pathlib import Path



import jpype



def get_thermogis_jar_path() -> str: