diff --git a/sumpy/expansion/__init__.py b/sumpy/expansion/__init__.py index b82be282948613f0e5f94a26a7ad8c201d4e45f5..8bfb85e9670375a352a3ee48255b1ddc5a9e1f1b 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 59c945ab019cf856048269fb398e9ea9d8099991..726a5fe7ef4339c531e3cf84c63d25c47d16a7d5 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 957aec905530b270b631319eb2c0d923b9614b53..54e8b6e3c689a43497f5513fef9411b4ed252beb 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) # }}}