TNO Intern

Commit 7e369cbb authored by Hen Brett's avatar Hen Brett 🐔
Browse files

Merge remote-tracking branch 'origin/main' into 82-add-an-example-from-jan-diederik 

# Conflicts:
#	src/pythermogis/thermogis_classes/doublet.py
parents 2a742b3a cec4b020

docs/changelog.md

+10 −0
Original line number Diff line number Diff line
@@ -8,3 +8,13 @@ Additonally, setting of the THERMOGIS_JAR and JAVA_HOME environment variables ca 
This is particularly useful for users who do not have admin rights.



We also recognise that having to replace the Jar file everytime we update it is clunky and we will be working hard to remove this necessity in future updates.



## v1.2.1 (21-11-2025)

Fixing a bug caused by the update in the Jar file. calculateDoubletPerformance in the Java source code returns Null if one of the optimizers failed. 

Pythermogis was still expecting a DoubletOutput class with all values set to -9999 in case of optimizer failure. 



Another bug was fixed, this occured when sampling for transmissivity with high or low p-values which caused an indexing error. 



Additional Functionality:

    - two functions have been added to print out the environment variables THERMOGIS_JAR and JAVA_HOME. This enables users to debug if their are issues with their installation.

pixi.lock

+3 −2
Original line number Diff line number Diff line
@@ -4829,8 +4829,8 @@ packages: 
  timestamp: 1740946648058

- pypi: ./

  name: pythermogis

  version: 1.2.0

  sha256: 50c9d857c9314b246b28d7e610647475414c718d839408818aa4f441813b51a7

  version: 1.2.1

  sha256: adc786bc376cdca6369d5cb58bd4bc7597c9c00a620cbeef48d591239c4ad966

  requires_dist:

  - jpype1>=1.5.2,<2

  - xarray==2024.9.0.*
@@ -4839,6 +4839,7 @@ packages: 
  - build>=1.2.2.post1,<2

  - pygridsio>=1.0,<2.0

  - python-dotenv>=1.2.1,<2

  - dask>=2025.5.1,<2026

  requires_python: '>=3.11'

  editable: true

- conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.13.3-hf636f53_101_cp313.conda

pyproject.toml

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" 


[project]

name = "pythermogis"

version = "1.2.0"

version = "1.2.1"

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,8 @@ dependencies = [ 
    "pytz>=2024.1,<2025",

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

    "pygridsio>=1.0,<2.0",

    "python-dotenv>=1.2.1,<2"

    "python-dotenv>=1.2.1,<2",

    "dask>=2025.5.1,<2026"

]

src/pythermogis/thermogis_classes/doublet.py

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ def calculate_performance_of_single_location(mask: float, depth: float, thicknes 


    # If calculation was not successful, return mask value

    if results is None:

        return (np.nan,) * 14

        return (mask_value,) * 14



    if results.utc() == -9999.0:

        return (mask_value,) * 14

src/pythermogis/thermogis_classes/jvm_start.py

+14 −0
Original line number Diff line number Diff line
@@ -48,3 +48,17 @@ def close_jvm(): 
    """

    if jpype.isJVMStarted():

        jpype.shutdownJVM()



def print_java_path():

    """

    This method prints the path to the JVM being used

    :return:

    """

    print(os.getenv("JAVA_HOME"))



def print_thermogis_jar_path():

    """

    This method prints the path to the Thermogis Jar being used

    :return:

    """

    print(get_thermogis_jar_path())