Skip to content

Commit

Permalink
Merge pull request #39 from ArtesiaWater/dev
Browse files Browse the repository at this point in the history 
Incremental update
  • Loading branch information
@dbrakenhoff
dbrakenhoff authored Aug 4, 2022
2 parents 14b30f4 + 3e24346 commit 5029b15
Show file tree
Hide file tree
Showing 12 changed files with 461 additions and 147 deletions.
21 changes: 21 additions & 0 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2018-2022 R.A. Collenteur, D.A Brakenhoff

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
54 changes: 30 additions & 24 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,44 @@
from setuptools import setup, find_packages

try:
import pypandoc
l_d = pypandoc.convert_file('README.rst', 'rst')
except ModuleNotFoundError:
l_d = ''

with open("README.rst", "r") as fh:
long_description = fh.read()

# Get the version.
version = {}
with open("waterbalans/version.py") as fp:
exec(fp.read(), version)

setup(
name='waterbalans',
version=version['__version__'],
description='Python Package voor het maken van Waterbalansen bij Waternet',
long_description=l_d,
url='http://waternet.nl',
author='David Brakenhoff',
author_email='d.brakenhoff@artesia-water.nl, ',
license='Unknown',
name="waterbalans",
version=version["__version__"],
description="Python Package voor het maken van Waternet Waterbalansen",
long_description=long_description,
url="https://github.com/ArtesiaWater/waterbalans",
author="Davíd Brakenhoff",
author_email="d.brakenhoff@artesia-water.nl",
project_urls={
"Source": "https://github.com/ArtesiaWater/waterbalans",
"Documentation": "https://waterbalans.readthedocs.io/en/latest/",
"Tracker": "https://github.com/ArtesiaWater/waterbalans/issues",
"Help": "https://github.com/ArtesiaWater/waterbalans/discussions",
},
license="MIT",
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Science/Research',
'Intended Audience :: Other Audience',
'Programming Language :: Python :: 3'
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
"Intended Audience :: Other Audience",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Topic :: Scientific/Engineering :: Hydrology",
],
platforms="Windows, Mac OS-X",
install_requires=[
"numpy>=1.19.2",
"matplotlib>=3.4.1",
"pandas>=1.3.0",
"scipy>=0.19",
],
platforms='Windows, Mac OS-X',
install_requires=['numpy>=1.19.2',
'matplotlib>=3.4.1',
'pandas>=1.3.0',
'scipy>=0.19',
'xmltodict',
'hkvfewspy==0.6.2'],
packages=find_packages(exclude=[]),
include_package_data=True,
)
98 changes: 77 additions & 21 deletions waterbalans/buckets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
for ipar in self.parameters.index.difference(params.index):
self.eag.logger.debug(
msg.format(
self.name, self.idn, self.parameters.loc[ipar, "Waarde"], ipar
self.name,
self.idn,
self.parameters.loc[ipar, "Waarde"],
ipar,
)
)

Expand All @@ -153,7 +156,9 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
if not {"Neerslag", "Verdamping", "Qkwel"}.issubset(series.columns):
msg = "Warning: {} not in series. Assumed equal to 0!"
self.eag.logger.warning(
msg.format({"Neerslag", "Verdamping", "Qkwel"} - set(series.columns))
msg.format(
{"Neerslag", "Verdamping", "Qkwel"} - set(series.columns)
)
)
series = series.reindex(
columns=["Neerslag", "Verdamping", "Qkwel"], fill_value=0.0
Expand Down Expand Up @@ -187,11 +192,15 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
q_s = []
q_oa = []

for _, pes in series.loc[:, ["Neerslag", "Verdamping", "Qkwel"]].iterrows():
for _, pes in series.loc[
:, ["Neerslag", "Verdamping", "Qkwel"]
].iterrows():
p, e, s = pes

# Bereken de waterbalans in laag 1
q_no.append(calc_q_no(p, e, h_1[-1], hEq, EFacMin_1, EFacMax_1, dt))
q_no.append(
calc_q_no(p, e, h_1[-1], hEq, EFacMin_1, EFacMax_1, dt)
)
h, q = calc_h_q_oa(h_1[-1], 0.0, q_no[-1], 0.0, hMax_1, dt)

# Interception reservoir storage cannot be negative
Expand All @@ -204,9 +213,13 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
h, _ = calc_h_q_oa(h_2[-1], s, 0.0, q_ui[-1], hMax_2, dt)
h_2.append(h)

self.fluxes = self.fluxes.assign(q_no=q_no, q_ui=q_ui, q_s=q_s, q_oa=q_oa)
self.fluxes = self.fluxes.assign(
q_no=q_no, q_ui=q_ui, q_s=q_s, q_oa=q_oa
)

self.storage = self.storage.assign(Upper_Storage=h_1[1:], Lower_Storage=h_2[1:])
self.storage = self.storage.assign(
Upper_Storage=h_1[1:], Lower_Storage=h_2[1:]
)

@staticmethod
@njit
Expand Down Expand Up @@ -296,7 +309,10 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
for ipar in self.parameters.index.difference(params.index):
self.eag.logger.debug(
msg.format(
self.name, self.idn, self.parameters.loc[ipar, "Waarde"], ipar
self.name,
self.idn,
self.parameters.loc[ipar, "Waarde"],
ipar,
)
)

Expand Down Expand Up @@ -355,17 +371,23 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
q_s = []
q_oa = []

for _, pes in series.loc[:, ["Neerslag", "Verdamping", "Qkwel"]].iterrows():
for _, pes in series.loc[
:, ["Neerslag", "Verdamping", "Qkwel"]
].iterrows():
p, e, s = pes
q_no.append(calc_q_no(p, e, h_1[-1], hEq, EFacMin_1, EFacMax_1, dt))
q_no.append(
calc_q_no(p, e, h_1[-1], hEq, EFacMin_1, EFacMax_1, dt)
)
qui = calc_q_ui(h_1[-1], RFacIn_1, RFacOut_1, hEq, dt)
q_ui.append(qui)
q_s.append(s)
h, q = calc_h_q_oa(h_1[-1], s, q_no[-1], q_ui[-1], hMax_1, dt)
h_1.append(h)
q_oa.append(q)

self.fluxes = self.fluxes.assign(q_no=q_no, q_ui=q_ui, q_s=q_s, q_oa=q_oa)
self.fluxes = self.fluxes.assign(
q_no=q_no, q_ui=q_ui, q_s=q_s, q_oa=q_oa
)
self.storage = self.storage.assign(Storage=h_1[1:])

@staticmethod
Expand Down Expand Up @@ -394,7 +416,9 @@ def calc_waterbalance(

for i in range(prec.size):

q_no[i] = calc_q_no(prec[i], evap[i], h_1[i], hEq, EFacMin_1, EFacMax_1, dt)
q_no[i] = calc_q_no(
prec[i], evap[i], h_1[i], hEq, EFacMin_1, EFacMax_1, dt
)
q_ui[i] = calc_q_ui(h_1[i], RFacIn_1, RFacOut_1, hEq, dt)
q_s[i] = seep[i]
h, q = calc_h_q_oa(h_1[i], q_s[i], q_no[i], q_ui[i], hMax_1, dt)
Expand All @@ -410,7 +434,20 @@ def __init__(self, idn, eag, series, area=0.0):
self.name = "Drain"

self.parameters = pd.DataFrame(
data=[0.7, 0.3, 0.35, 0.3, 0.75, 1.0, 0.5, 0.0, 0.001, 0.001, 0.3, 0.3],
data=[
0.7,
0.3,
0.35,
0.3,
0.75,
1.0,
0.5,
0.0,
0.001,
0.001,
0.3,
0.3,
],
index=[
"hMax_1",
"hMax_2",
Expand Down Expand Up @@ -473,7 +510,9 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):

# test if columns are present!
if not {"Neerslag", "Verdamping", "Qkwel"}.issubset(series.columns):
msg = "Warning Bucket {0}-{1}: {2} not in series. Assumed equal to 0!"
msg = (
"Warning Bucket {0}-{1}: {2} not in series. Assumed equal to 0!"
)
self.eag.logger.warning(
msg.format(
self.name,
Expand Down Expand Up @@ -518,7 +557,9 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
q_oa = []
q_dr = []

for _, pes in series.loc[:, ["Neerslag", "Verdamping", "Qkwel"]].iterrows():
for _, pes in series.loc[
:, ["Neerslag", "Verdamping", "Qkwel"]
].iterrows():
p, e, s = pes
no = calc_q_no(p, e, h_1[-1], hEq, EFacMin_1, EFacMax_1, dt)
q_no.append(no)
Expand All @@ -536,7 +577,9 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
q_no=q_no, q_ui=q_ui, q_s=q_s, q_oa=q_oa, q_dr=q_dr
)

self.storage = self.storage.assign(Upper_Storage=h_1[1:], Lower_Storage=h_2[1:])
self.storage = self.storage.assign(
Upper_Storage=h_1[1:], Lower_Storage=h_2[1:]
)

@staticmethod
@njit
Expand Down Expand Up @@ -572,7 +615,9 @@ def calc_waterbalance(

for i in range(prec.size):

q_no[i] = calc_q_no(prec[i], evap[i], h_1[i], hEq, EFacMin_1, EFacMax_1, dt)
q_no[i] = calc_q_no(
prec[i], evap[i], h_1[i], hEq, EFacMin_1, EFacMax_1, dt
)
q_boven = calc_q_ui(h_1[i], RFacIn_1, RFacOut_1, hEq, dt)
q_ui[i] = calc_q_ui(h_2[i], RFacIn_2, RFacOut_2, hEq, dt)
q_s[i] = seep[i]
Expand Down Expand Up @@ -616,7 +661,10 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
for ipar in self.parameters.index.difference(params.index):
self.eag.logger.debug(
msg.format(
self.name, self.idn, self.parameters.loc[ipar, "Waarde"], ipar
self.name,
self.idn,
self.parameters.loc[ipar, "Waarde"],
ipar,
)
)
self.parameters.update(params)
Expand All @@ -633,7 +681,9 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
ts_cso = self.eag.series.loc[
pd.to_datetime(tmin) : pd.to_datetime(tmax), "q_cso"
]
self.eag.logger.info("Picked up CSO timeseries from EAG object.")
self.eag.logger.info(
"Picked up CSO timeseries from EAG object."
)
else:
fcso = self.path_to_cso_series
if fcso is None:
Expand All @@ -649,7 +699,9 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
"External CSO timeseries file must have extension .pklz or .csv!"
)
ts_cso = ts_cso.loc[pd.to_datetime(tmin) : pd.to_datetime(tmax)]
self.eag.logger.info("Picked up CSO timeseries from external file.")
self.eag.logger.info(
"Picked up CSO timeseries from external file."
)
except (FileNotFoundError, KeyError):
try:
from pastas.read import KnmiStation
Expand All @@ -671,11 +723,15 @@ def simulate(self, params=None, tmin=None, tmax=None, dt=1.0):
prec = KnmiStation.download(
stns=[knmistn], interval="hour", start=tmin, end=tmax, vars="RH"
)
self.eag.logger.info("KNMI Download succeeded, calculating series...")
self.eag.logger.info(
"KNMI Download succeeded, calculating series..."
)
ts_cso = calculate_cso(prec.data.RH, Bmax, POCmax, alphasmooth=0.1)
self.eag.logger.info("CSO series calculated.")

series = pd.Series(index=ts_cso.index, data=-1.0 * ts_cso.values.squeeze())
series = pd.Series(
index=ts_cso.index, data=-1.0 * ts_cso.values.squeeze()
)
series.name = "q_cso"

self.fluxes = self.fluxes.assign(q_cso=series)
Expand Down
14 changes: 12 additions & 2 deletions waterbalans/create.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ def create_eag(
-----
"""
eag = Eag(
idn=idn, name=name, gaf=gaf, series=series, logfile=logfile, log_level=log_level
idn=idn,
name=name,
gaf=gaf,
series=series,
logfile=logfile,
log_level=log_level,
)
eag.logger.info("Creating EAG object for '{}'".format(name))

Expand All @@ -62,7 +67,12 @@ def create_eag(


def create_gaf(
idn, name, gafbuckets=None, eags=None, series=None, use_waterlevel_series=False
idn,
name,
gafbuckets=None,
eags=None,
series=None,
use_waterlevel_series=False,
):
"""Create instance of a GAF.
Expand Down
Loading

0 comments on commit 5029b15

Please sign in to comment.