v1.9.0

CHANGELOG.rst

@@ -2,16 +2,18 @@ Changelog
 #########
 
 
-*latest* : Laplace
-------------------
+v1.9.0 : Laplace
+----------------
+
+**2019-10-04**
 
 - Laplace-domain calculation: By providing a negative ``freq``-value, the
   calculation is carried out in the real Laplace domain ``s = freq`` instead of
   the complex frequency domain ``s = 2i*pi*freq``.
-- More flexible filters and filter design:
+- Improvements to filter design and handling:
 
-  - ``DigitalFilter`` now takes an argument (list of strings) to have other
-    coefficients than ``j0``, ``j1``, ``sin``, and ``cos``.
+  - ``DigitalFilter`` now takes an argument (list of strings) for additional
+    coefficients to the default ``j0``, ``j1``, ``sin``, and ``cos``.
   - ``fdesign`` can now be used with any name as attribute you want to describe
     the transform pair (until now it had to be either ``j0``, ``j1``, ``j2``,
     ``sin``, or ``cos``).

README.rst

@@ -5,25 +5,6 @@
 
 ----
 
-.. image:: https://readthedocs.org/projects/empymod/badge/?version=latest
-   :target: http://empymod.readthedocs.io/en/latest
-   :alt: Documentation Status
-.. image:: https://travis-ci.org/empymod/empymod.svg?branch=master
-   :target: https://travis-ci.org/empymod/empymod
-   :alt: Travis-CI
-.. image:: https://coveralls.io/repos/github/empymod/empymod/badge.svg?branch=master
-   :target: https://coveralls.io/github/empymod/empymod?branch=master
-   :alt: Coveralls
-.. image:: https://img.shields.io/codacy/grade/b28ed3989ed248fe95e34288e43667b9/master.svg
-   :target: https://www.codacy.com/app/prisae/empymod
-   :alt: Codacy
-.. image:: https://img.shields.io/badge/benchmark-asv-blue.svg?style=flat
-   :target: https://empymod.github.io/empymod-asv
-   :alt: Airspeed Velocity
-.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.593094.svg
-   :target: https://doi.org/10.5281/zenodo.593094
-   :alt: Zenodo DOI
-
 .. sphinx-inclusion-marker
 
 The electromagnetic modeller **empymod** can model electric or magnetic
@@ -92,7 +73,7 @@ Features
     - Reflected wave
     - Airwave (semi-analytical in the case of step responses)
 
-- Add-ons (``empymod.scripts``):
+- Add-ons (``empymod.scripts``) and hidden features:
 
   The add-ons for empymod provide some very specific, additional
   functionalities:
@@ -103,6 +84,12 @@ Features
   - ``fdesign``: Design digital linear filters for the Hankel and Fourier
     transforms.
 
+  Incomplete list of hidden features (see manual):
+
+  - Models with frequency-dependent resistivity (e.g., Cole-Cole IP).
+  - Space-Laplace domain calculation for the numerical and analytical
+    solutions.
+
 
 Installation
 ============

empymod/__init__.py

@@ -48,4 +48,4 @@
            'DigitalFilter']
 
 # Version
-__version__ = '1.8.4dev0'
+__version__ = '1.9.0'

empymod/filters.py

@@ -83,8 +83,8 @@ class DigitalFilter:
             ``filter_coeff = ['j0', 'j1', 'sin', 'cos']``
 
         This accounts for the standard Hankel and Fourier DLF in CSEM
-        modelling. However, other coefficient names can be provided via this
-        parameter (in list format).
+        modelling. However, additional coefficient names can be provided via
+        this parameter (in list format).
 
     """
 
@@ -96,10 +96,10 @@ def __init__(self, name, savename=None, filter_coeff=None):
         else:
             self.savename = savename
 
-        if filter_coeff is None:
-            self.filter_coeff = ['j0', 'j1', 'sin', 'cos']
-        else:
-            self.filter_coeff = filter_coeff
+        # Define coefficient names.
+        self.filter_coeff = ['j0', 'j1', 'sin', 'cos']
+        if filter_coeff is not None:  # Additional, user provided.
+            self.filter_coeff.extend(filter_coeff)
 
     def tofile(self, path='filters'):
         r"""Save filter values to ascii-files.

setup.py

@@ -7,13 +7,13 @@
 
 setup(
     name='empymod',
-    version='1.8.4.dev0',
+    version='1.9.0',
     description=description,
     long_description=readme,
     author='Dieter Werthmüller',
     author_email='[email protected]',
     url='https://empymod.github.io',
-    download_url='https://github.com/empymod/empymod/tarball/v1.8.3',
+    download_url='https://github.com/empymod/empymod/tarball/v1.9.0',
     license='Apache License V2.0',
     packages=['empymod', 'empymod.scripts'],
     classifiers=[

tests/test_filters.py

@@ -17,7 +17,7 @@ def test_digitalfilter():                                   # 1.a DigitalFilter
     assert out1.name == out2.name
     assert out1.filter_coeff == ['j0', 'j1', 'sin', 'cos']
     assert out2.savename == 'savenametest'
-    assert out3.filter_coeff == ['abc', ]
+    assert out3.filter_coeff == ['j0', 'j1', 'sin', 'cos', 'abc']
 
 
 @pytest.mark.skipif(sys.version_info < (3, 6),