merged master into branch

a940abf2 · Reimar H Leike · 2135844d · 1c04fe20 · a940abf2
Commit a940abf2 authored Jun 14, 2018 by Reimar H Leike
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

nifty4/operators/__init__.py nifty4/operators/__init__.py +3 -1

No files found.
--- a/nifty4/operators/__init__.py
+++ b/nifty4/operators/__init__.py
@@ -12,9 +12,11 @@ from .power_distributor import PowerDistributor
 from .inversion_enabler import InversionEnabler
 from .sandwich_operator import SandwichOperator
 from .sampling_enabler import SamplingEnabler
+from .dof_distributor import DOFDistributor

 __all__ = ["LinearOperator", "EndomorphicOperator", "ScalingOperator",
           "DiagonalOperator", "HarmonicTransformOperator", "FFTOperator",
           "FFTSmoothingOperator", "GeometryRemover",
           "LaplaceOperator", "SmoothnessOperator", "PowerDistributor",
-           "InversionEnabler", "SandwichOperator", "SamplingEnabler"]
+           "InversionEnabler", "SandwichOperator", "SamplingEnabler",
+           "DOFDistributor"]