ngsolve 6.2.2502__cp312-cp312-macosx_10_15_universal2.whl → 6.2.2504__cp312-cp312-macosx_10_15_universal2.whl

netgen/include/sparsematrix_impl.hpp

@@ -51,28 +51,94 @@ namespace ngla
                  FlatArray<TM> val, size_t h, size_t w)
   {
     static Timer t("SparseMatrix::CreateFromCOO"); RegionTimer r(t);
-    Array<int> cnt(h);
+    static Timer t1("SparseMatrix::CreateFromCOO 1");
+    static Timer t2("SparseMatrix::CreateFromCOO 2");
+    static Timer t3("SparseMatrix::CreateFromCOO 3");
 
     /*
-    cnt = 0;
-    for (auto i : indi) cnt[i]++;
-    */
+    {
+    Array<int> cnt(h);
 
+    t1.Start();
     DynamicTable<int> tab(h);
     for (size_t i = 0; i < indi.Size(); i++)
       tab.AddUnique(indi[i], indj[i]);
+    t1.Stop();
     for (size_t i = 0; i < h; i++)
       cnt[i] = tab.EntrySize(i);
     
     auto matrix = make_shared<SparseMatrix<TM>> (cnt, w);
+    t2.Start();
     for (auto k : ngstd::Range(indi))
       matrix->CreatePosition(indi[k], indj[k]);
+    t2.Stop();
     matrix->SetZero();
 
+    t3.Start();
     for (auto k : ngstd::Range(indi))
       (*matrix)(indi[k], indj[k]) += val[k];
+    t3.Stop();
+    // return matrix;
+    }
+    */
+    
+    Array<int> cnt(h);
+    cnt = 0;
+    for (auto i : indi)
+      cnt[i]++;
+    
+    Table<int> tab(cnt);
+    cnt = 0;
+    
+    for (auto [i,j] : Zip(indi, indj))
+      tab[i][cnt[i]++] = j;
+
+    cnt = 0;
+    // for (int i = 0; i < tab.Size(); i++)
+    ParallelFor (tab.Size(), [&] (size_t i)
+      {
+        QuickSort (tab[i]);
+
+        int prev = -1;
+        for (auto j : tab[i])
+          {
+            if (j != prev) cnt[i]++;
+            prev = j;
+          }
+      });
+    
+    auto matrix = make_shared<SparseMatrix<TM>> (cnt, w);
+    t2.Start();
+    // for (auto k : ngstd::Range(indi))
+    // matrix->CreatePosition(indi[k], indj[k]);
 
-    return matrix;
+    cnt = 0;
+    for (int i = 0; i < tab.Size(); i++)
+      {
+        int prev = -1;
+        for (auto j : tab[i])
+          {
+            auto cols = matrix->GetRowIndices(i);
+            if (j != prev)
+              cols[cnt[i]++] = j;
+            prev = j;
+          }
+      }
+    
+    t2.Stop();
+    matrix->SetZero();
+
+    t3.Start();
+    /*
+    for (auto k : ngstd::Range(indi))
+      (*matrix)(indi[k], indj[k]) += val[k];
+    */
+    ParallelFor (indi.Size(), [&](size_t k)
+    {
+      AtomicAdd ( (*matrix)(indi[k], indj[k]),  val[k]);
+    });
+    t3.Stop();
+    return matrix;    
   }
   
 

netgen/include/symbolicintegrator.hpp

@@ -604,6 +604,7 @@ public:
 
   class SymbolicFacetLinearFormIntegrator : public FacetLinearFormIntegrator
   {
+  protected:
     shared_ptr<CoefficientFunction> cf;
     Array<ProxyFunction*> proxies;
     Array<CoefficientFunction*> cache_cfs;

netgen/include/tangentialfacetfespace.hpp

@@ -16,34 +16,22 @@ namespace ngcomp
   class NGS_DLL_HEADER TangentialFacetFESpace : public FESpace
   {
   protected:
-    /// Level
-    // int level;
-    /// Number of Facets
-    // int nfacets;
-    /// 
-    // int ncfacets;
-    ///
-    // int nel;
-
     Array<int> first_facet_dof;
     Array<int> first_inner_dof;  // for highest_order_dc
-    // int ndof_lo;
 
     int rel_order;
 
     Array<IVec<2> > order_facet;
     Array<bool> fine_facet;
 
-    // int ndof;
-    // Array<int> ndlevel;
     bool var_order;
     bool print;
 
     bool highest_order_dc;
     bool hide_highest_order_dc;
+    bool all_dofs_together;
     
   public:
-    ///
     TangentialFacetFESpace (shared_ptr<MeshAccess> ama, const Flags & flags, 
                             bool parseflags = false );
 
@@ -61,20 +49,11 @@ namespace ngcomp
     virtual void SetOrder (NodeId ni, int order) override;
     virtual int GetOrder (NodeId ni) const override;
 
-    
-    // virtual size_t GetNDof() const throw() override { return ndof; }
-    // virtual size_t GetNDofLevel ( int i ) const override { return ndlevel[i]; }
-
     virtual FlatArray<VorB> GetDualShapeNodes (VorB vb) const override;
 
-    // virtual int GetNDofLowOrder () const
-    // { return ndof_lo; }
 
     virtual FiniteElement & GetFE(ElementId ei, Allocator & lh) const override;
     
-    // virtual const FiniteElement & GetFE ( int elnr, LocalHeap & lh ) const;
-    // virtual const FiniteElement & GetSFE ( int selnr, LocalHeap & lh ) const;
-
     virtual void GetFacetDofNrs (int felnr, Array<DofId> & dnums) const;
 
     virtual int GetNFacetDofs (int felnr) const;
@@ -90,6 +69,12 @@ namespace ngcomp
     virtual IVec<2> GetFacetOrder(int fnr) const;
 
     virtual int GetFirstFacetDof(int fanr) const;
+    const auto & GetFirstFacetDof() const { return first_facet_dof; }
+
+    IntRange GetFacetDofs (int nr) const
+    { 
+      return IntRange (first_facet_dof[nr], first_facet_dof[nr+1]); 
+    }
 
     virtual bool UsesHighestOrderDiscontinuous() const {return highest_order_dc;};
 

ngsolve/__init__.py

@@ -75,6 +75,7 @@ from .utils import x, y, z, dx, ds, grad, Grad, curl, div, Deviator, PyId, PyTra
 from . import solvers
 from . import preconditioners
 from . import timestepping
+from .solve_implementation import Solve
 
 try:
     from netgen.occ import unit_square, unit_cube

ngsolve/__init__.pyi

@@ -147,6 +147,7 @@ from ngsolve.la import QMRSolver
 from ngsolve.ngstd import IntRange
 from ngsolve.solve import Draw
 from ngsolve.solve import SetVisualization
+from ngsolve.solve_implementation.Application import Solve
 from ngsolve.timing import Timing
 from ngsolve.utils import Deviator
 from ngsolve.utils import Grad
@@ -185,11 +186,12 @@ from . import ngstd
 from . import nonlinearsolvers
 from . import preconditioners
 from . import solve
+from . import solve_implementation
 from . import solvers
 from . import timestepping
 from . import timing
 from . import utils
-__all__ = ['APhiHCurlAMG', 'ArnoldiSolver', 'BBBND', 'BBND', 'BFI', 'BND', 'BSpline', 'BaseMatrix', 'BaseVector', 'BilinearForm', 'BitArray', 'BlockBFI', 'BlockLFI', 'BlockMatrix', 'BlockVector', 'BoundaryFromVolumeCF', 'CELL', 'CF', 'CGSolver', 'COUPLING_TYPE', 'CacheCF', 'CoefficientFunction', 'Cof', 'CompoundBFI', 'CompoundLFI', 'Compress', 'CompressCompound', 'Conj', 'ConstEBEMatrix', 'ContactBoundary', 'ConvertOperator', 'CreateVVector', 'Cross', 'Det', 'Deviator', 'DiagonalMatrix', 'Discontinuous', 'Draw', 'EDGE', 'ELEMENT', 'ET', 'ElementId', 'Embedding', 'FACE', 'FACET', 'FESpace', 'FacetFESpace', 'FacetSurface', 'GMRESSolver', 'Grad', 'GridFunction', 'H1', 'H1LumpingFESpace', 'HCurl', 'HCurlAMG', 'HCurlCurl', 'HCurlDiv', 'HDiv', 'HDivDiv', 'HDivDivSurface', 'HDivSurface', 'HEX', 'Hidden', 'Id', 'IdentityMatrix', 'IfPos', 'InnerProduct', 'IntRange', 'Integrate', 'IntegrationRule', 'Interpolate', 'Inv', 'L2', 'LFI', 'LinearForm', 'Matrix', 'MatrixValued', 'Mesh', 'MultiGridPreconditioner', 'MultiVector', 'NodalFESpace', 'NodeId', 'Norm', 'NormalFacetFESpace', 'NormalFacetSurface', 'Normalize', 'NumberSpace', 'ORDER_POLICY', 'OuterProduct', 'PARALLEL_STATUS', 'POINT', 'PRISM', 'PYRAMID', 'PajeTrace', 'ParallelMatrix', 'Parameter', 'ParameterC', 'PatchwiseSolve', 'Periodic', 'PermutationMatrix', 'PlaceholderCF', 'PlateauFESpace', 'Preconditioner', 'PrivateSpace', 'ProductSpace', 'Projector', 'PyCof', 'PyCross', 'PyDet', 'PyId', 'PyInv', 'PySkew', 'PySym', 'PyTrace', 'QMRSolver', 'QUAD', 'Redraw', 'Region', 'SEGM', 'SetHeapSize', 'SetNumThreads', 'SetTestoutFile', 'SetVisualization', 'Skew', 'SurfaceL2', 'Sym', 'SymbolicBFI', 'SymbolicEnergy', 'SymbolicLFI', 'TET', 'TRIG', 'TangentialFacetFESpace', 'TangentialSurfaceL2', 'TaskManager', 'TimeFunction', 'Timer', 'Timers', 'Timing', 'Trace', 'VERTEX', 'VOL', 'VTKOutput', 'Variation', 'Vector', 'VectorFacetFESpace', 'VectorFacetSurface', 'VectorH1', 'VectorL2', 'VectorNodalFESpace', 'VectorSurfaceL2', 'VectorValued', 'VoxelCoefficient', 'ZeroCF', 'acos', 'asin', 'atan', 'atan2', 'atexit', 'bla', 'builtin_sum', 'bvp', 'ceil', 'comp', 'config', 'cos', 'cosh', 'curl', 'directsolvers', 'div', 'ds', 'dx', 'eigenvalues', 'erf', 'exp', 'fem', 'floor', 'grad', 'krylovspace', 'la', 'log', 'netgen', 'ngsglobals', 'ngslib', 'ngstd', 'nonlinearsolvers', 'os', 'pi', 'pml', 'pow', 'preconditioners', 'printonce', 'sin', 'sinh', 'solve', 'solvers', 'specialcf', 'sqrt', 'sum', 'sys', 'tan', 'timestepping', 'timing', 'unit_cube', 'unit_square', 'utils', 'x', 'y', 'z']
+__all__ = ['APhiHCurlAMG', 'ArnoldiSolver', 'BBBND', 'BBND', 'BFI', 'BND', 'BSpline', 'BaseMatrix', 'BaseVector', 'BilinearForm', 'BitArray', 'BlockBFI', 'BlockLFI', 'BlockMatrix', 'BlockVector', 'BoundaryFromVolumeCF', 'CELL', 'CF', 'CGSolver', 'COUPLING_TYPE', 'CacheCF', 'CoefficientFunction', 'Cof', 'CompoundBFI', 'CompoundLFI', 'Compress', 'CompressCompound', 'Conj', 'ConstEBEMatrix', 'ContactBoundary', 'ConvertOperator', 'CreateVVector', 'Cross', 'Det', 'Deviator', 'DiagonalMatrix', 'Discontinuous', 'Draw', 'EDGE', 'ELEMENT', 'ET', 'ElementId', 'Embedding', 'FACE', 'FACET', 'FESpace', 'FacetFESpace', 'FacetSurface', 'GMRESSolver', 'Grad', 'GridFunction', 'H1', 'H1LumpingFESpace', 'HCurl', 'HCurlAMG', 'HCurlCurl', 'HCurlDiv', 'HDiv', 'HDivDiv', 'HDivDivSurface', 'HDivSurface', 'HEX', 'Hidden', 'Id', 'IdentityMatrix', 'IfPos', 'InnerProduct', 'IntRange', 'Integrate', 'IntegrationRule', 'Interpolate', 'Inv', 'L2', 'LFI', 'LinearForm', 'Matrix', 'MatrixValued', 'Mesh', 'MultiGridPreconditioner', 'MultiVector', 'NodalFESpace', 'NodeId', 'Norm', 'NormalFacetFESpace', 'NormalFacetSurface', 'Normalize', 'NumberSpace', 'ORDER_POLICY', 'OuterProduct', 'PARALLEL_STATUS', 'POINT', 'PRISM', 'PYRAMID', 'PajeTrace', 'ParallelMatrix', 'Parameter', 'ParameterC', 'PatchwiseSolve', 'Periodic', 'PermutationMatrix', 'PlaceholderCF', 'PlateauFESpace', 'Preconditioner', 'PrivateSpace', 'ProductSpace', 'Projector', 'PyCof', 'PyCross', 'PyDet', 'PyId', 'PyInv', 'PySkew', 'PySym', 'PyTrace', 'QMRSolver', 'QUAD', 'Redraw', 'Region', 'SEGM', 'SetHeapSize', 'SetNumThreads', 'SetTestoutFile', 'SetVisualization', 'Skew', 'Solve', 'SurfaceL2', 'Sym', 'SymbolicBFI', 'SymbolicEnergy', 'SymbolicLFI', 'TET', 'TRIG', 'TangentialFacetFESpace', 'TangentialSurfaceL2', 'TaskManager', 'TimeFunction', 'Timer', 'Timers', 'Timing', 'Trace', 'VERTEX', 'VOL', 'VTKOutput', 'Variation', 'Vector', 'VectorFacetFESpace', 'VectorFacetSurface', 'VectorH1', 'VectorL2', 'VectorNodalFESpace', 'VectorSurfaceL2', 'VectorValued', 'VoxelCoefficient', 'ZeroCF', 'acos', 'asin', 'atan', 'atan2', 'atexit', 'bla', 'builtin_sum', 'bvp', 'ceil', 'comp', 'config', 'cos', 'cosh', 'curl', 'directsolvers', 'div', 'ds', 'dx', 'eigenvalues', 'erf', 'exp', 'fem', 'floor', 'grad', 'krylovspace', 'la', 'log', 'netgen', 'ngsglobals', 'ngslib', 'ngstd', 'nonlinearsolvers', 'os', 'pi', 'pml', 'pow', 'preconditioners', 'printonce', 'sin', 'sinh', 'solve', 'solve_implementation', 'solvers', 'specialcf', 'sqrt', 'sum', 'sys', 'tan', 'timestepping', 'timing', 'unit_cube', 'unit_square', 'utils', 'x', 'y', 'z']
 def _add_flags_doc(module):
     ...
 def _jupyter_nbextension_paths():
@@ -217,7 +219,7 @@ TET: fem.ET  # value = <ET.TET: 20>
 TRIG: fem.ET  # value = <ET.TRIG: 10>
 VERTEX: fem.NODE_TYPE  # value = <NODE_TYPE.VERTEX: 0>
 VOL: comp.VorB  # value = <VorB.VOL: 0>
-__version__: str = '6.2.2502'
+__version__: str = '6.2.2504'
 ds: comp.DifferentialSymbol  # value = <ngsolve.comp.DifferentialSymbol object>
 dx: comp.DifferentialSymbol  # value = <ngsolve.comp.DifferentialSymbol object>
 ngsglobals: comp.GlobalVariables  # value = <ngsolve.comp.GlobalVariables object>

ngsolve/bla.pyi

@@ -916,8 +916,12 @@ class Vec2D:
         """
         Return value at given position
         """
+    @typing.overload
     def __init__(self, arg0: float, arg1: float) -> None:
         ...
+    @typing.overload
+    def __init__(self, t: tuple) -> None:
+        ...
     def __mul__(self, value: float) -> Vec2D:
         ...
     def __neg__(self) -> Vec2D:
@@ -971,8 +975,12 @@ class Vec3D:
         """
         Return value at given position
         """
+    @typing.overload
     def __init__(self, arg0: float, arg1: float, arg2: float) -> None:
         ...
+    @typing.overload
+    def __init__(self, t: tuple) -> None:
+        ...
     def __mul__(self, value: float) -> Vec3D:
         ...
     def __neg__(self) -> Vec3D:

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2502")
+set(PACKAGE_VERSION "6.2.2504")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..
@@ -23,15 +23,15 @@ set(NGSOLVE_PYBIND_INCLUDE_DIR "")
 set(NGSOLVE_PYTHON_INCLUDE_DIRS "/Library/Frameworks/Python.framework/Versions/3.12/include/python3.12")
 set(NGSOLVE_PYTHON_LIBRARIES "/Library/Frameworks/Python.framework/Versions/3.12/lib/libpython3.12.dylib")
 set(NGSOLVE_PYTHON_PACKAGES_INSTALL_DIR  "")
-set(NGSOLVE_TCL_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/src/project_tcl/generic")
+set(NGSOLVE_TCL_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/src/project_tcl/generic")
 set(NGSOLVE_TCL_LIBRARY "/Library/Frameworks/Python.framework/Versions/3.12/lib/libtclstub8.6.a")
 set(NGSOLVE_TK_DND_LIBRARY "")
-set(NGSOLVE_TK_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/src/project_tk/generic")
+set(NGSOLVE_TK_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/src/project_tk/generic")
 set(NGSOLVE_TK_LIBRARY "/Library/Frameworks/Python.framework/Versions/3.12/lib/libtkstub8.6.a")
 set(NGSOLVE_X11_X11_LIB "")
 set(NGSOLVE_X11_Xmu_LIB "")
-set(NGSOLVE_ZLIB_INCLUDE_DIRS "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/zlib/include")
-set(NGSOLVE_ZLIB_LIBRARIES "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/zlib/lib/libz.a")
+set(NGSOLVE_ZLIB_INCLUDE_DIRS "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/zlib/include")
+set(NGSOLVE_ZLIB_LIBRARIES "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.12/cmake-build/dependencies/zlib/lib/libz.a")
 
 set(NGSOLVE_INTEL_MIC       OFF)
 set(NGSOLVE_USE_CCACHE ON)

ngsolve/cmake/ngsolve-targets-release.cmake

@@ -45,6 +45,16 @@ set_target_properties(ngfem PROPERTIES
 list(APPEND _cmake_import_check_targets ngfem )
 list(APPEND _cmake_import_check_files_for_ngfem "${_IMPORT_PREFIX}/netgen/libngfem.dylib" )
 
+# Import target "ngsbem" for configuration "Release"
+set_property(TARGET ngsbem APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(ngsbem PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/netgen/libngsbem.dylib"
+  IMPORTED_SONAME_RELEASE "@rpath/libngsbem.dylib"
+  )
+
+list(APPEND _cmake_import_check_targets ngsbem )
+list(APPEND _cmake_import_check_files_for_ngsbem "${_IMPORT_PREFIX}/netgen/libngsbem.dylib" )
+
 # Import target "ngcomp" for configuration "Release"
 set_property(TARGET ngcomp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 set_target_properties(ngcomp PROPERTIES

ngsolve/cmake/ngsolve-targets.cmake

@@ -19,7 +19,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_cmake_targets_defined "")
 set(_cmake_targets_not_defined "")
 set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack netgen_python ngstd ngbla ngla ngfem ngcomp ngsolve)
+foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack netgen_python ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve)
   list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
   if(TARGET "${_cmake_expected_target}")
     list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -105,6 +105,13 @@ set_target_properties(ngfem PROPERTIES
   INTERFACE_LINK_LIBRARIES "ngbla;ngstd"
 )
 
+# Create imported target ngsbem
+add_library(ngsbem SHARED IMPORTED)
+
+set_target_properties(ngsbem PROPERTIES
+  INTERFACE_LINK_LIBRARIES "ngcomp;ngfem;ngla;ngbla;ngstd"
+)
+
 # Create imported target ngcomp
 add_library(ngcomp SHARED IMPORTED)
 
@@ -116,7 +123,7 @@ set_target_properties(ngcomp PROPERTIES
 add_library(ngsolve SHARED IMPORTED)
 
 set_target_properties(ngsolve PROPERTIES
-  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngbla;ngla;ngstd"
+  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngsbem;ngbla;ngla;ngstd"
 )
 
 # Load information for each installed configuration.

ngsolve/comp/__init__.pyi

@@ -7,6 +7,7 @@ import ngsolve.bla
 import ngsolve.fem
 import ngsolve.la
 import ngsolve.ngstd
+import ngsolve.solve_implementation
 import numpy
 import pyngcore.pyngcore
 import typing
@@ -230,6 +231,10 @@ class BilinearForm(NGS_Object):
         ...
     def UnsetPreconditioner(self, arg0: ...) -> None:
         ...
+    @typing.overload
+    def __call__(self, gfu: GridFunction) -> typing.Any:
+        ...
+    @typing.overload
     def __call__(self, gfu: GridFunction, gfv: GridFunction) -> float:
         ...
     @typing.overload
@@ -250,6 +255,8 @@ class BilinearForm(NGS_Object):
     @typing.overload
     def __init__(self, arg0: SumOfIntegrals, **kwargs) -> None:
         ...
+    def __mul__(self, gfu: GridFunction) -> ngsolve.solve_implementation.LinearApplication:
+        ...
     def __str__(self) -> str:
         ...
     @property
@@ -938,7 +945,7 @@ class FESpace(NGS_Object):
         region : ngsolve.comp.Region
           input region
         """
-    def SetHarmonicProlongation(self, arg0: ...) -> None:
+    def SetHarmonicProlongation(self, bf: ..., inverse: str = 'sparsecholesky') -> None:
         """
         use harmonic prolongation w.r.t. bilinear-form
         """
@@ -3107,6 +3114,10 @@ class MultiGridPreconditioner(Preconditioner):
         'block': Block smoother
     coarsetype: string = direct
       How to solve coarse problem.
+    cycle: int = 1
+      multigrid cycle (0 only smoothing, 1..V-cycle, 2..W-cycle.
+    smoothingsteps: int = 1
+      number of (pre and post-)smoothing steps
     coarsesmoothingsteps: int = 1
       If coarsetype is smoothing, then how many smoothingsteps will be done.
     updatealways: bool = False

ngsolve/config/__init__.pyi

@@ -24,13 +24,13 @@ NGSOLVE_INSTALL_DIR_INCLUDE: str = 'netgen/include'
 NGSOLVE_INSTALL_DIR_LIB: str = 'netgen'
 NGSOLVE_INSTALL_DIR_PYTHON: str = '.'
 NGSOLVE_INSTALL_DIR_RES: str = 'share'
-NGSOLVE_VERSION: str = '6.2.2502'
-NGSOLVE_VERSION_GIT: str = 'v6.2.2502-0-g984bf8ae2'
-NGSOLVE_VERSION_HASH: str = 'g984bf8ae2'
+NGSOLVE_VERSION: str = '6.2.2504'
+NGSOLVE_VERSION_GIT: str = 'v6.2.2504-0-g7dd7ba8dd'
+NGSOLVE_VERSION_HASH: str = 'g7dd7ba8dd'
 NGSOLVE_VERSION_MAJOR: str = '6'
 NGSOLVE_VERSION_MINOR: str = '2'
-NGSOLVE_VERSION_PATCH: str = '2502'
-NGSOLVE_VERSION_PYTHON: str = '6.2.2502'
+NGSOLVE_VERSION_PATCH: str = '2504'
+NGSOLVE_VERSION_PYTHON: str = '6.2.2504'
 NGSOLVE_VERSION_TWEAK: str = '0'
 USE_CCACHE: bool = True
 USE_HYPRE: bool = False
@@ -40,4 +40,4 @@ USE_MUMPS: bool = False
 USE_PARDISO: bool = False
 USE_UMFPACK: bool = True
 is_python_package: bool = True
-version: str = 'v6.2.2502-0-g984bf8ae2'
+version: str = 'v6.2.2504-0-g7dd7ba8dd'

ngsolve/config/config.py

@@ -29,15 +29,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE  = "netgen/include"
 NGSOLVE_INSTALL_DIR_CMAKE    = "ngsolve/cmake"
 NGSOLVE_INSTALL_DIR_RES      = "share"
 
-NGSOLVE_VERSION = "6.2.2502"
-NGSOLVE_VERSION_GIT = "v6.2.2502-0-g984bf8ae2"
-NGSOLVE_VERSION_PYTHON = "6.2.2502"
+NGSOLVE_VERSION = "6.2.2504"
+NGSOLVE_VERSION_GIT = "v6.2.2504-0-g7dd7ba8dd"
+NGSOLVE_VERSION_PYTHON = "6.2.2504"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
 NGSOLVE_VERSION_TWEAK = "0"
-NGSOLVE_VERSION_PATCH = "2502"
-NGSOLVE_VERSION_HASH = "g984bf8ae2"
+NGSOLVE_VERSION_PATCH = "2504"
+NGSOLVE_VERSION_HASH = "g7dd7ba8dd"
 
 CMAKE_CXX_COMPILER           = "/Library/Developer/CommandLineTools/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/config/config.pyi

@@ -26,13 +26,13 @@ NGSOLVE_INSTALL_DIR_INCLUDE: str = 'netgen/include'
 NGSOLVE_INSTALL_DIR_LIB: str = 'netgen'
 NGSOLVE_INSTALL_DIR_PYTHON: str = '.'
 NGSOLVE_INSTALL_DIR_RES: str = 'share'
-NGSOLVE_VERSION: str = '6.2.2502'
-NGSOLVE_VERSION_GIT: str = 'v6.2.2502-0-g984bf8ae2'
-NGSOLVE_VERSION_HASH: str = 'g984bf8ae2'
+NGSOLVE_VERSION: str = '6.2.2504'
+NGSOLVE_VERSION_GIT: str = 'v6.2.2504-0-g7dd7ba8dd'
+NGSOLVE_VERSION_HASH: str = 'g7dd7ba8dd'
 NGSOLVE_VERSION_MAJOR: str = '6'
 NGSOLVE_VERSION_MINOR: str = '2'
-NGSOLVE_VERSION_PATCH: str = '2502'
-NGSOLVE_VERSION_PYTHON: str = '6.2.2502'
+NGSOLVE_VERSION_PATCH: str = '2504'
+NGSOLVE_VERSION_PYTHON: str = '6.2.2504'
 NGSOLVE_VERSION_TWEAK: str = '0'
 USE_CCACHE: bool = True
 USE_HYPRE: bool = False
@@ -42,4 +42,4 @@ USE_MUMPS: bool = False
 USE_PARDISO: bool = False
 USE_UMFPACK: bool = True
 is_python_package: bool = True
-version: str = 'v6.2.2502-0-g984bf8ae2'
+version: str = 'v6.2.2504-0-g7dd7ba8dd'

ngsolve/fem.pyi

@@ -8,7 +8,7 @@ import numpy
 import os
 import pyngcore.pyngcore
 import typing
-__all__ = ['BFI', 'BSpline', 'BSpline2D', 'BaseMappedIntegrationPoint', 'BiotSavartCF', 'BiotSavartRegularMLCF', 'BiotSavartSingularMLCF', 'BlockBFI', 'BlockLFI', 'CELL', 'CacheCF', 'CoefficientFunction', 'Cof', 'CompilePythonModule', 'CompoundBFI', 'CompoundLFI', 'Conj', 'CoordCF', 'CoordinateTrafo', 'Cross', 'Det', 'DifferentialOperator', 'EDGE', 'ELEMENT', 'ET', 'Einsum', 'ElementTopology', 'ElementTransformation', 'FACE', 'FACET', 'FiniteElement', 'GenerateL2ElementCode', 'H1FE', 'HCurlFE', 'HDivDivFE', 'HDivFE', 'HEX', 'Id', 'IfPos', 'IntegrationPoint', 'IntegrationRule', 'Inv', 'L2FE', 'LFI', 'LeviCivitaSymbol', 'LoggingCF', 'MeshPoint', 'MinimizationCF', 'MixedFE', 'NODE_TYPE', 'NewtonCF', 'POINT', 'PRISM', 'PYRAMID', 'Parameter', 'ParameterC', 'PlaceholderCF', 'PointEvaluationFunctional', 'QUAD', 'RegularMLMP', 'RegularMLMultiPoleCF', 'RegularMultiPoleCF', 'SEGM', 'ScalarFE', 'SetPMLParameters', 'SingularMLMP', 'SingularMLMP3', 'SingularMLMultiPoleCF', 'SingularMultiPoleCF', 'Skew', 'SpecialCFCreator', 'SphericalHarmonicsCF', 'Sphericalharmonics', 'Sym', 'TET', 'TRIG', 'Trace', 'VERTEX', 'VoxelCoefficient', 'Zero', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'erf', 'exp', 'floor', 'log', 'pow', 'sin', 'sinh', 'specialcf', 'sqrt', 'tan']
+__all__ = ['BFI', 'BSpline', 'BSpline2D', 'BaseMappedIntegrationPoint', 'BlockBFI', 'BlockLFI', 'CELL', 'CacheCF', 'CoefficientFunction', 'Cof', 'CompilePythonModule', 'CompoundBFI', 'CompoundLFI', 'Conj', 'CoordCF', 'CoordinateTrafo', 'Cross', 'Det', 'DifferentialOperator', 'EDGE', 'ELEMENT', 'ET', 'Einsum', 'ElementTopology', 'ElementTransformation', 'FACE', 'FACET', 'FiniteElement', 'GenerateL2ElementCode', 'H1FE', 'HCurlFE', 'HDivDivFE', 'HDivFE', 'HEX', 'Id', 'IfPos', 'IntegrationPoint', 'IntegrationRule', 'Inv', 'L2FE', 'LFI', 'LeviCivitaSymbol', 'LoggingCF', 'MeshPoint', 'MinimizationCF', 'MixedFE', 'NODE_TYPE', 'NewtonCF', 'POINT', 'PRISM', 'PYRAMID', 'Parameter', 'ParameterC', 'PlaceholderCF', 'PointEvaluationFunctional', 'QUAD', 'SEGM', 'ScalarFE', 'SetPMLParameters', 'Skew', 'SpecialCFCreator', 'Sym', 'TET', 'TRIG', 'Trace', 'VERTEX', 'VoxelCoefficient', 'Zero', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'erf', 'exp', 'floor', 'log', 'pow', 'sin', 'sinh', 'specialcf', 'sqrt', 'tan']
 class BFI:
     """
     
@@ -242,23 +242,6 @@ class BaseMappedIntegrationPoint:
         """
         Transformation of the mapped integration point
         """
-class BiotSavartCF(CoefficientFunction):
-    def AddCurrent(self, sp: ngsolve.bla.Vec3D, ep: ngsolve.bla.Vec3D, j: complex, num: int = 100) -> None:
-        ...
-    def __init__(self, order: int, kappa: float, center: ngsolve.bla.Vec3D, scale: float = 1.0) -> None:
-        ...
-class BiotSavartRegularMLCF(CoefficientFunction):
-    def __init__(self, mp: BiotSavartSingularMLCF, center: ngsolve.bla.Vec3D, r: float, order: int = -1) -> None:
-        ...
-    @property
-    def mlmp(self) -> ...:
-        ...
-class BiotSavartSingularMLCF(CoefficientFunction):
-    def __init__(self, center: ngsolve.bla.Vec3D, r: float, order: int = -1, kappa: float) -> None:
-        ...
-    @property
-    def mlmp(self) -> SingularMLMP3:
-        ...
 class CoefficientFunction:
     """
     A CoefficientFunction (CF) is some function defined on a mesh.
@@ -420,6 +403,12 @@ class CoefficientFunction:
     def __neg__(self) -> CoefficientFunction:
         ...
     @typing.overload
+    def __or__(self, cf: CoefficientFunction) -> CoefficientFunction:
+        ...
+    @typing.overload
+    def __or__(self, cf: ...) -> None:
+        ...
+    @typing.overload
     def __pow__(self, exponent: int) -> CoefficientFunction:
         ...
     @typing.overload
@@ -993,31 +982,6 @@ class PlaceholderCF(CoefficientFunction):
 class PointEvaluationFunctional:
     def Assemble(self) -> ngsolve.bla.SparseVector:
         ...
-class RegularMLMP:
-    def Norm(self) -> float:
-        ...
-    def Print(self) -> None:
-        ...
-    def __str__(self) -> str:
-        ...
-class RegularMLMultiPoleCF(CoefficientFunction):
-    def __init__(self, mp: SingularMLMultiPoleCF, center: ngsolve.bla.Vec3D, r: float, order: int = -1) -> None:
-        ...
-    @property
-    def mlmp(self) -> RegularMLMP:
-        ...
-class RegularMultiPoleCF(CoefficientFunction):
-    def ShiftZ(self, arg0: float, arg1: RegularMultiPoleCF) -> None:
-        ...
-    def Spectrum(self, scaled: bool) -> ngsolve.bla.VectorD:
-        ...
-    def Transform(self, arg0: RegularMultiPoleCF) -> None:
-        ...
-    def __init__(self, order: int, kappa: float, center: ngsolve.bla.Vec3D, scale: float = 1.0) -> None:
-        ...
-    @property
-    def sh(self) -> Sphericalharmonics:
-        ...
 class ScalarFE(FiniteElement):
     """
     a scalar-valued finite element
@@ -1070,58 +1034,6 @@ class ScalarFE(FiniteElement):
         mip : ngsolve.BaseMappedIntegrationPoint
           input mapped integration point
         """
-class SingularMLMP:
-    def AddCharge(self, arg0: ngsolve.bla.Vec3D, arg1: complex) -> None:
-        ...
-    def AddDipole(self, arg0: ngsolve.bla.Vec3D, arg1: ngsolve.bla.Vec3D, arg2: complex) -> None:
-        ...
-    def Calc(self) -> None:
-        ...
-    def Norm(self) -> float:
-        ...
-    def Print(self) -> None:
-        ...
-    def __init__(self, arg0: ngsolve.bla.Vec3D, arg1: float, arg2: int, arg3: float) -> None:
-        ...
-    def __str__(self) -> str:
-        ...
-class SingularMLMP3:
-    def AddCurrent(self, sp: ngsolve.bla.Vec3D, ep: ngsolve.bla.Vec3D, j: complex, num: int = 100) -> None:
-        ...
-    def Calc(self) -> None:
-        ...
-    def __init__(self, arg0: ngsolve.bla.Vec3D, arg1: float, arg2: int, arg3: float) -> None:
-        ...
-class SingularMLMultiPoleCF(CoefficientFunction):
-    def __init__(self, center: ngsolve.bla.Vec3D, r: float, order: int = -1, kappa: float) -> None:
-        ...
-    @property
-    def mlmp(self) -> SingularMLMP:
-        ...
-class SingularMultiPoleCF(CoefficientFunction):
-    def AddCharge(self, arg0: ngsolve.bla.Vec3D, arg1: complex) -> None:
-        ...
-    def AddDipole(self, arg0: ngsolve.bla.Vec3D, arg1: ngsolve.bla.Vec3D, arg2: complex) -> None:
-        ...
-    @typing.overload
-    def ShiftZ(self, arg0: float, arg1: RegularMultiPoleCF) -> None:
-        ...
-    @typing.overload
-    def ShiftZ(self, arg0: float, arg1: SingularMultiPoleCF) -> None:
-        ...
-    def Spectrum(self, scaled: bool) -> ngsolve.bla.VectorD:
-        ...
-    @typing.overload
-    def Transform(self, arg0: RegularMultiPoleCF) -> None:
-        ...
-    @typing.overload
-    def Transform(self, arg0: SingularMultiPoleCF) -> None:
-        ...
-    def __init__(self, order: int, kappa: float, center: ngsolve.bla.Vec3D, scale: float = 1.0) -> None:
-        ...
-    @property
-    def sh(self) -> Sphericalharmonics:
-        ...
 class SpecialCFCreator:
     def EdgeCurvature(self, dim: int) -> ...:
         """
@@ -1184,29 +1096,6 @@ class SpecialCFCreator:
         """
         local mesh-size (approximate element diameter) as CF
         """
-class SphericalHarmonicsCF(CoefficientFunction):
-    def __init__(self, arg0: int) -> None:
-        ...
-    @property
-    def sh(self) -> Sphericalharmonics:
-        ...
-class Sphericalharmonics:
-    def RotateY(self, arg0: float) -> None:
-        ...
-    def RotateZ(self, arg0: float) -> None:
-        ...
-    def __getitem__(self, arg0: tuple[int, int]) -> complex:
-        ...
-    def __setitem__(self, arg0: tuple[int, int], arg1: complex) -> None:
-        ...
-    @property
-    def coefs(self) -> ngsolve.bla.FlatVectorC:
-        """
-        coefficient vector
-        """
-    @property
-    def order(self) -> int:
-        ...
 def BlockBFI(bfi: BFI = 0, dim: int = 2, comp: int = 0) -> ...:
     """
     Block Bilinear Form Integrator