TNO Intern

Commit 92883b68 authored by Hen Brett's avatar Hen Brett 🐔
Browse files

Merge branch '13-fix-pythermogis-import' into 'main' 

Resolve "Fix pythermogis import"

Closes #13

See merge request AGS/pythermogis!17
parents 06ede242 611959d4

.idea/pythermogis.iml

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
<module type="PYTHON_MODULE" version="4">

  <component name="NewModuleRootManager">

    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/tests/tests" isTestSource="true" />

      <excludeFolder url="file://$MODULE_DIR$/.venv" />
@@ -13,7 +12,8 @@ 
  <component name="PyNamespacePackagesService">

    <option name="namespacePackageFolders">

      <list>

        <option value="$MODULE_DIR$/src/pythermogis/resources" />

        <option value="$MODULE_DIR$/pythermogis/resources" />

        <option value="$MODULE_DIR$/pythermogis" />

      </list>

    </option>

  </component>

README.md

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ This will fetch the package from the specified GitLab package repository. 
Here’s a simple example demonstrating how to use `pyThermoGIS` for a single set of input values:



```python

from src.pythermogis import calculate_doublet_performance

from pythermogis.pythermogis import calculate_doublet_performance

import xarray as xr



# Initialize an input Dataset with the required input variables:
@@ -67,7 +67,7 @@ The API utilizes xarray's ability to efficiently calculate over multiple dimensi 
dimensions:



```python

from src.pythermogis import calculate_doublet_performance

from pythermogis.pythermogis import calculate_doublet_performance

import xarray as xr

import numpy as np
@@ -96,7 +96,7 @@ print(doublet_simulation_results) 
Consider utilizing the pypi package pygridsio to read in and write out 2D raster grids (with either .asc, .zmap, .nc, .tif file formats) to a xarray dataset, before applying the calculate_doublet_performance code:



```python

from src.pythermogis import calculate_doublet_performance

from pythermogis.pythermogis import calculate_doublet_performance

from pygridsio.pygridsio import read_grid



# Initialize an input Dataset with the required input variables:

pyproject.toml

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


[project]

name = "pythermogis"

version = "0.1.12"

version = "0.1.14"

description = "This is a Python API to the ThermoGIS Java code"

authors = [{ name = "Brett", email = "hen.brett@tno.nl" }]

readme = "README.md"
@@ -25,6 +25,7 @@ include = ["pythermogis*"] # Ensure all submodules are included 
[tool.setuptools.package-data]

"pythermogis" = ["resources/thermogis_jar/*"]  # Ensure all files inside 'lib/' are included





[tool.setuptools]

include-package-data = true

pythermogis/__init__.py

0 → 100644
+1 −0
Original line number Diff line number Diff line 
from .thermogis_classes.doublet import calculate_doublet_performance
 
 No newline at end of file