Skip to content

Commit

Permalink
[ci skip] release version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
MuellerSeb committed Feb 27, 2019
1 parent 3435ca3 commit 960cfa1
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ anaflow.get_lap_inv # Get the inverse laplace transformation of a function

## Requirements

- [NumPy >= 1.10.0](https://www.numpy.org)
- [SciPy >= 0.19.0](https://www.scipy.org)
- [NumPy >= 1.13.0](https://www.numpy.org)
- [SciPy >= 0.19.1](https://www.scipy.org)


## Contact
Expand Down
2 changes: 1 addition & 1 deletion anaflow/_version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Provide a central version"""
__version__ = "0.3.0.dev0"
__version__ = "0.3.0"
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#required for readthedocs.org
numpy>=1.10
scipy>=0.19.0
numpy>=1.13.0
scipy>=0.19.1
numpydoc
38 changes: 38 additions & 0 deletions examples/03_call_ext_theis3d.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
import numpy as np
from matplotlib import pyplot as plt
from anaflow import theis, ext_theis3D
from anaflow.tools.special import aniso


time = [10, 600, 36000] # 10s, 10min, 10h
rad = np.geomspace(0.05, 4) # radial distance from the pumping well in [0, 4]
var = 0.5 # variance of the transmissivity
corr = 10.0 # correlation length of the conductivity
e = 0.75 # anisotropy ratio of the conductivity
KG = 1e-4 # the geometric mean of the conductivity
Kefu = KG*np.exp(var*(0.5 - aniso(e))) # the effective conductivity for uniform flow
KH = KG*np.exp(-var/2.0) # the harmonic mean of the conductivity
S = 1e-4 # storage
Qw = -1e-4 # pumping rate
L = 1.0 # vertical extend of the aquifer

head_Kefu = theis(rad=rad, time=time, T=Kefu*L, S=S, Qw=Qw)
head_KH = theis(rad=rad, time=time, T=KH*L, S=S, Qw=Qw)
head_ef = ext_theis3D(rad=rad, time=time, KG=KG, sig2=var, corr=corr, e=e, S=S, Qw=Qw, L=1)

for i, step in enumerate(time):
if i == 0:
label_TG = "Theis($K_{efu}$)"
label_TH = "Theis($K_H$)"
label_ef = "extended Theis 3D"
else:
label_TG = label_TH = label_ef = None
plt.plot(rad, head_Kefu[i], label=label_TG, color="C"+str(i), linestyle="--")
plt.plot(rad, head_KH[i], label=label_TH, color="C"+str(i), linestyle=":")
plt.plot(rad, head_ef[i], label=label_ef, color="C"+str(i))

plt.xlabel("r in [m]")
plt.ylabel("h in [m]")
plt.legend()
plt.show()
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def find_version(*file_paths):
classifiers=[_f for _f in CLASSIFIERS.split('\n') if _f],
platforms=["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"],
include_package_data=True,
install_requires=['numpy >= 1.10.0',
'scipy >= 0.19.0'],
install_requires=['numpy >= 1.13.0',
'scipy >= 0.19.1'],
packages=find_packages(exclude=['tests*', 'docs*']),
)

0 comments on commit 960cfa1

Please sign in to comment.