diff --git a/sumpy/expansion/__init__.py b/sumpy/expansion/__init__.py index 26c0d00a852c867fe89a23da876d5f87b98cee8b..99ed13b3dd7152257ba33226e4b03984a3c7139b 100644 --- a/sumpy/expansion/__init__.py +++ b/sumpy/expansion/__init__.py @@ -779,18 +779,9 @@ class DefaultExpansionFactory(ExpansionFactoryBase): def get_local_expansion_class(self, base_kernel): """Returns a subclass of :class:`ExpansionBase` suitable for *base_kernel*. """ - from sumpy.kernel import (HelmholtzKernel, YukawaKernel) - - from sumpy.expansion.local import (H2DLocalExpansion, Y2DLocalExpansion, + from sumpy.expansion.local import ( LinearPDEConformingVolumeTaylorLocalExpansion, VolumeTaylorLocalExpansion) - - if (isinstance(base_kernel.get_base_kernel(), HelmholtzKernel) - and base_kernel.dim == 2): - return H2DLocalExpansion - elif (isinstance(base_kernel.get_base_kernel(), YukawaKernel) - and base_kernel.dim == 2): - return Y2DLocalExpansion try: base_kernel.get_base_kernel().get_pde_as_diff_op() return LinearPDEConformingVolumeTaylorLocalExpansion @@ -800,19 +791,9 @@ class DefaultExpansionFactory(ExpansionFactoryBase): def get_multipole_expansion_class(self, base_kernel): """Returns a subclass of :class:`ExpansionBase` suitable for *base_kernel*. """ - from sumpy.kernel import (HelmholtzKernel, YukawaKernel) - - from sumpy.expansion.multipole import (H2DMultipoleExpansion, - Y2DMultipoleExpansion, + from sumpy.expansion.multipole import ( LinearPDEConformingVolumeTaylorMultipoleExpansion, VolumeTaylorMultipoleExpansion) - - if (isinstance(base_kernel.get_base_kernel(), HelmholtzKernel) - and base_kernel.dim == 2): - return H2DMultipoleExpansion - elif (isinstance(base_kernel.get_base_kernel(), YukawaKernel) - and base_kernel.dim == 2): - return Y2DMultipoleExpansion try: base_kernel.get_base_kernel().get_pde_as_diff_op() return LinearPDEConformingVolumeTaylorMultipoleExpansion diff --git a/sumpy/expansion/m2l.py b/sumpy/expansion/m2l.py index 16ab7c704f630b3d5cec1e54cebeff4353993522..3120595e16a45be23d3c4a77a83168d9156ecc03 100644 --- a/sumpy/expansion/m2l.py +++ b/sumpy/expansion/m2l.py @@ -105,12 +105,8 @@ class DefaultM2LTranslationClassFactory(M2LTranslationClassFactoryBase): def get_m2l_translation_class(self, base_kernel, local_expansion_class): from sumpy.expansion.local import (VolumeTaylorLocalExpansionBase, _FourierBesselLocalExpansion) - from sumpy.kernel import LaplaceKernel if issubclass(local_expansion_class, VolumeTaylorLocalExpansionBase): - if isinstance(base_kernel, LaplaceKernel): - return VolumeTaylorM2LWithFFT - else: - return VolumeTaylorM2LTranslation + return VolumeTaylorM2LWithFFT elif issubclass(local_expansion_class, _FourierBesselLocalExpansion): return FourierBesselM2LTranslation else: