From e2db767e76377e4064e2a11e4af52958280ce4fe Mon Sep 17 00:00:00 2001 From: Isuru Fernando <isuruf@gmail.com> Date: Tue, 11 May 2021 01:19:00 -0500 Subject: [PATCH] Add deprecation notice --- sumpy/expansion/__init__.py | 34 ++++++++++++++++++++++++++--- sumpy/expansion/local.py | 42 ++++++++++++++++++++++++++++++------ sumpy/expansion/multipole.py | 42 ++++++++++++++++++++++++++++++------ 3 files changed, 101 insertions(+), 17 deletions(-) diff --git a/sumpy/expansion/__init__.py b/sumpy/expansion/__init__.py index b82be282..8bfb85e9 100644 --- a/sumpy/expansion/__init__.py +++ b/sumpy/expansion/__init__.py @@ -639,9 +639,37 @@ class LinearPDEConformingVolumeTaylorExpansion(VolumeTaylorExpansionBase): self.expansion_terms_wrangler_key = (order, kernel.dim, kernel) -LaplaceConformingVolumeTaylorExpansion = LinearPDEConformingVolumeTaylorExpansion -HelmholtzConformingVolumeTaylorExpansion = LinearPDEConformingVolumeTaylorExpansion -BiharmonicConformingVolumeTaylorExpansion = LinearPDEConformingVolumeTaylorExpansion +class LaplaceConformingVolumeTaylorExpansion( + LinearPDEConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("LaplaceConformingVolumeTaylorExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) + + +class HelmholtzConformingVolumeTaylorExpansion( + LinearPDEConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("HelmholtzConformingVolumeTaylorExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) + + +class BiharmonicConformingVolumeTaylorExpansion( + LinearPDEConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("BiharmonicConformingVolumeTaylorExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) # }}} diff --git a/sumpy/expansion/local.py b/sumpy/expansion/local.py index 59c945ab..726a5fe7 100644 --- a/sumpy/expansion/local.py +++ b/sumpy/expansion/local.py @@ -24,7 +24,10 @@ import sumpy.symbolic as sym from sumpy.tools import add_to_sac from sumpy.expansion import ( - ExpansionBase, VolumeTaylorExpansion, LinearPDEConformingVolumeTaylorExpansion) + ExpansionBase, VolumeTaylorExpansion, LinearPDEConformingVolumeTaylorExpansion, + LaplaceConformingVolumeTaylorExpansion, + HelmholtzConformingVolumeTaylorExpansion, + BiharmonicConformingVolumeTaylorExpansion) from sumpy.tools import mi_increment_axis from pytools import single_valued @@ -413,12 +416,37 @@ class LinearPDEConformingVolumeTaylorLocalExpansion( self, kernel, order, use_rscale) -LaplaceConformingVolumeTaylorLocalExpansion = \ - LinearPDEConformingVolumeTaylorLocalExpansion -HelmholtzConformingVolumeTaylorLocalExpansion = \ - LinearPDEConformingVolumeTaylorLocalExpansion -BiharmonicConformingVolumeTaylorLocalExpansion = \ - LinearPDEConformingVolumeTaylorLocalExpansion +class LaplaceConformingVolumeTaylorLocalExpansion( + LaplaceConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("LaplaceConformingVolumeTaylorLocalExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorLocalExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) + + +class HelmholtzConformingVolumeTaylorLocalExpansion( + HelmholtzConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("HelmholtzConformingVolumeTaylorLocalExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorLocalExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) + + +class BiharmonicConformingVolumeTaylorLocalExpansion( + BiharmonicConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("BiharmonicConformingVolumeTaylorLocalExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorLocalExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) # }}} diff --git a/sumpy/expansion/multipole.py b/sumpy/expansion/multipole.py index 957aec90..54e8b6e3 100644 --- a/sumpy/expansion/multipole.py +++ b/sumpy/expansion/multipole.py @@ -23,7 +23,10 @@ THE SOFTWARE. import sumpy.symbolic as sym # noqa from sumpy.expansion import ( - ExpansionBase, VolumeTaylorExpansion, LinearPDEConformingVolumeTaylorExpansion) + ExpansionBase, VolumeTaylorExpansion, LinearPDEConformingVolumeTaylorExpansion, + LaplaceConformingVolumeTaylorExpansion, + HelmholtzConformingVolumeTaylorExpansion, + BiharmonicConformingVolumeTaylorExpansion) from pytools import factorial from sumpy.tools import mi_set_axis, add_to_sac @@ -354,12 +357,37 @@ class LinearPDEConformingVolumeTaylorMultipoleExpansion( self, kernel, order, use_rscale) -LaplaceConformingVolumeTaylorMultipoleExpansion = \ - LinearPDEConformingVolumeTaylorMultipoleExpansion -HelmholtzConformingVolumeTaylorMultipoleExpansion = \ - LinearPDEConformingVolumeTaylorMultipoleExpansion -BiharmonicConformingVolumeTaylorMultipoleExpansion = \ - LinearPDEConformingVolumeTaylorMultipoleExpansion +class LaplaceConformingVolumeTaylorMultipoleExpansion( + LaplaceConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("LaplaceConformingVolumeTaylorMultipoleExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorMultipoleExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) + + +class HelmholtzConformingVolumeTaylorMultipoleExpansion( + HelmholtzConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("HelmholtzConformingVolumeTaylorMultipoleExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorMultipoleExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) + + +class BiharmonicConformingVolumeTaylorMultipoleExpansion( + BiharmonicConformingVolumeTaylorExpansion): + + def __init__(self, *args, **kwargs): + from warnings import warn + warn("BiharmonicConformingVolumeTaylorMultipoleExpansion is deprecated. " + "Use LinearPDEConformingVolumeTaylorMultipoleExpansion instead.", + DeprecationWarning, stacklevel=2) + super().__init__(*args, **kwargs) # }}} -- GitLab