ngsolve 6.2.2503__cp312-cp312-macosx_10_15_universal2.whl → 6.2.2504.post12.dev0__cp312-cp312-macosx_10_15_universal2.whl

netgen/include/preconditioner.hpp

@@ -99,12 +99,12 @@ namespace ngcomp
     virtual void InitLevel (shared_ptr<BitArray> freedofs = NULL) { ; }
     virtual void FinalizeLevel (const ngla::BaseMatrix * mat = NULL) { ; }
     virtual void AddElementMatrix (FlatArray<int> dnums,
-				   const FlatMatrix<double> & elmat,
+				   FlatMatrix<double> elmat,
 				   ElementId ei, 
 				   LocalHeap & lh) { ; }
 
     virtual void AddElementMatrix (FlatArray<int> dnums,
-				   const FlatMatrix<Complex> & elmat,
+				   FlatMatrix<Complex> elmat,
 				   ElementId ei, 
 				   LocalHeap & lh) { ; }
 
@@ -186,12 +186,12 @@ namespace ngcomp
     static DocInfo GetDocu ();
     
     ///
-    virtual bool IsComplex() const { return jacobi->IsComplex(); }
+    virtual bool IsComplex() const override { return jacobi->IsComplex(); }
     
     ///
-    virtual void FinalizeLevel (const BaseMatrix * mat);
+    virtual void FinalizeLevel (const BaseMatrix * mat) override;
 
-    virtual void Update ()
+    virtual void Update () override
     {
       if (GetTimeStamp() < bfa->GetTimeStamp())
         FinalizeLevel (&bfa->GetMatrix());
@@ -201,14 +201,14 @@ namespace ngcomp
 
 
     ///
-    virtual const BaseMatrix & GetMatrix() const
+    virtual const BaseMatrix & GetMatrix() const override
     {
       if (!jacobi)
         ThrowPreconditionerNotReady();
       return *jacobi;
     }
     
-    virtual shared_ptr<BaseMatrix> GetMatrixPtr()
+    virtual shared_ptr<BaseMatrix> GetMatrixPtr() override
     {
       if (!jacobi)
         ThrowPreconditionerNotReady();
@@ -216,12 +216,12 @@ namespace ngcomp
     }
 
     ///
-    virtual const BaseMatrix & GetAMatrix() const
+    virtual const BaseMatrix & GetAMatrix() const override
     {
       return bfa->GetMatrix(); 
     }
     ///
-    virtual const char * ClassName() const
+    virtual const char * ClassName() const override
     { return "Local Preconditioner"; }
     void LocPrecTest () const;
   };
@@ -258,29 +258,29 @@ namespace ngcomp
       ; // delete pre;
     }
     
-    virtual void InitLevel (shared_ptr<BitArray> _freedofs);
+    virtual void InitLevel (shared_ptr<BitArray> _freedofs) override;
 
-    virtual void FinalizeLevel (const BaseMatrix *);
+    virtual void FinalizeLevel (const BaseMatrix *) override;
     virtual void AddElementMatrix (FlatArray<int> dnums,
-				   const FlatMatrix<SCAL> & elmat,
+				   FlatMatrix<SCAL> elmat,
 				   ElementId id, 
-				   LocalHeap & lh);
+				   LocalHeap & lh) override;
 
-    virtual void Update ()
+    virtual void Update () override
     {
       if (timestamp < bfa->GetTimeStamp())
         throw Exception("A BDDC preconditioner must be defined before assembling");
     }  
 
-    virtual const BaseMatrix & GetAMatrix() const
+    virtual const BaseMatrix & GetAMatrix() const override
     {
       return bfa->GetMatrix();
     }
 
-    virtual const BaseMatrix & GetMatrix() const;
-    virtual shared_ptr<BaseMatrix> GetMatrixPtr();
+    virtual const BaseMatrix & GetMatrix() const override;
+    virtual shared_ptr<BaseMatrix> GetMatrixPtr() override;
 
-    virtual void CleanUpLevel ()
+    virtual void CleanUpLevel () override
     {
       /*
       delete pre;
@@ -290,10 +290,10 @@ namespace ngcomp
     }
 
 
-    virtual void Mult (const BaseVector & x, BaseVector & y) const;
-    virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const;
+    virtual void Mult (const BaseVector & x, BaseVector & y) const override;
+    virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;
 
-    virtual const char * ClassName() const
+    virtual const char * ClassName() const override
     { return "BDDC Preconditioner"; }
   };
 

netgen/include/sparsematrix_dyn.hpp

@@ -42,20 +42,19 @@ namespace ngla
           fm = matvec(i);
         }
     }
-
+    
     virtual int VHeight() const override { return size; }
     virtual int VWidth() const override { return width; }
-
+    
     virtual void Mult (const BaseVector & x, BaseVector & y) const override;
     virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;
-
+    
     AutoVector CreateRowVector() const override
-    { throw Exception("CreateRowVector not implemented for SparseMatrixDynamic!"); }
+    { throw make_unique<VVector<TSCAL>> (VWidth()); }
     AutoVector CreateColVector() const override
-    { throw  Exception("CreateColVector not implemented for SparseMatrixDynamic!"); }
-
+    { throw make_unique<VVector<TSCAL>> (VHeight()); }
+    
     virtual tuple<int,int> EntrySizes() const override { return { bh, bw }; }
-
   };
   
 

netgen/include/special_matrix.hpp

@@ -182,6 +182,8 @@ namespace ngla
 
     virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;
     virtual void MultTransAdd (double s, const BaseVector & x, BaseVector & y) const override;
+
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;    
   };
 
 

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;
@@ -614,7 +615,7 @@ public:
     SIMD_IntegrationRule simd_ir;   // if non-empty use this integration-rule
 
   public:
-    SymbolicFacetLinearFormIntegrator (shared_ptr<CoefficientFunction> acf, VorB avb);
+    NGS_DLL_HEADER SymbolicFacetLinearFormIntegrator (shared_ptr<CoefficientFunction> acf, VorB avb);
 
     virtual VorB VB() const override { return vb; }
     virtual bool BoundaryForm() const override { return vb == BND; }

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.2503'
+__version__: str = '6.2.2504-12-gd2e909551'
 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.2503")
+set(PACKAGE_VERSION "6.2.2504-12-gd2e909551")
 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/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/ngsolve/external_dependencies/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/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/ngsolve/external_dependencies/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/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_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_INTEL_MIC       OFF)
 set(NGSOLVE_USE_CCACHE ON)

ngsolve/comp/__init__.pyi

@@ -7,24 +7,22 @@ import ngsolve.bla
 import ngsolve.fem
 import ngsolve.la
 import ngsolve.ngstd
+import ngsolve.solve_implementation
 import numpy
 import pyngcore.pyngcore
 import typing
 from . import pml
-__all__ = ['APhiHCurlAMG', 'Array_N6ngcomp13COUPLING_TYPEE_S', 'BBBND', 'BBND', 'BDDCPreconditioner', 'BDDCPreconditioner_complex', 'BDDCPreconditioner_double', 'BND', 'BilinearForm', 'BndElementId', 'BoundaryFromVolumeCF', 'COUPLING_TYPE', 'ComponentGridFunction', 'Compress', 'CompressCompound', 'ContactBoundary', 'ConvertOperator', 'DifferentialSymbol', 'Discontinuous', 'DualProxyFunction', 'ElementId', 'ElementRange', 'FESpace', 'FESpaceElement', 'FESpaceElementRange', 'FacetFESpace', 'FacetSurface', 'FlatArray_N6ngcomp13COUPLING_TYPEE_S', 'FromArchiveCF', 'FromArchiveFESpace', 'FromArchiveMesh', 'GlobalInterfaceSpace', 'GlobalSpace', 'GlobalVariables', 'GridFunction', 'GridFunctionC', 'GridFunctionCoefficientFunction', 'GridFunctionD', 'H1', 'H1LumpingFESpace', 'HCurl', 'HCurlAMG', 'HCurlCurl', 'HCurlDiv', 'HDiv', 'HDivDiv', 'HDivDivSurface', 'HDivSurface', 'Hidden', 'Integral', 'Integrate', 'IntegrationRuleSpace', 'IntegrationRuleSpaceSurface', 'Interpolate', 'InterpolateProxy', 'KSpaceCoeffs', 'L2', 'LinearForm', 'LocalPreconditioner', 'MatrixFreeOperator', 'MatrixValued', 'Mesh', 'MeshNode', 'MeshNodeRange', 'MultiGridPreconditioner', 'NGS_Object', 'Ngs_Element', 'NodalFESpace', 'NodeId', 'NodeRange', 'NormalFacetFESpace', 'NormalFacetSurface', 'NumberSpace', 'ORDER_POLICY', 'PatchwiseSolve', 'Periodic', 'PlateauFESpace', 'Preconditioner', 'ProductSpace', 'Prolongate', 'ProlongateCoefficientFunction', 'Prolongation', 'ProxyFunction', 'QuasiPeriodicC', 'QuasiPeriodicD', 'Region', 'RegisterPreconditioner', 'Reorder', 'SetHeapSize', 'SetTestoutFile', 'SumOfIntegrals', 'SurfaceL2', 'SymbolTable_D', 'SymbolTable_sp_D', 'SymbolTable_sp_N5ngfem19CoefficientFunctionE', 'SymbolTable_sp_N6ngcomp10LinearFormE', 'SymbolTable_sp_N6ngcomp12BilinearFormE', 'SymbolTable_sp_N6ngcomp12GridFunctionE', 'SymbolTable_sp_N6ngcomp14PreconditionerE', 'SymbolTable_sp_N6ngcomp7FESpaceE', 'SymbolicBFI', 'SymbolicEnergy', 'SymbolicLFI', 'SymbolicTPBFI', 'TangentialFacetFESpace', 'TangentialSurfaceL2', 'TensorProductFESpace', 'TensorProductIntegrate', 'ToArchive', 'Transfer2StdMesh', 'VOL', 'VTKOutput', 'Variation', 'VectorFacetFESpace', 'VectorFacetSurface', 'VectorH1', 'VectorL2', 'VectorNodalFESpace', 'VectorSurfaceL2', 'VectorValued', 'VorB', 'ngsglobals', 'pml']
+__all__ = ['APhiHCurlAMG', 'Array_N6ngcomp13COUPLING_TYPEE_S', 'BBBND', 'BBND', 'BDDCPreconditioner', 'BDDCPreconditioner_complex', 'BDDCPreconditioner_double', 'BND', 'BilinearForm', 'BndElementId', 'BoundaryFromVolumeCF', 'COUPLING_TYPE', 'ComponentGridFunction', 'Compress', 'CompressCompound', 'ContactBoundary', 'ConvertOperator', 'DifferentialSymbol', 'Discontinuous', 'DualProxyFunction', 'ElementId', 'ElementRange', 'FESpace', 'FESpaceElement', 'FESpaceElementRange', 'FacetFESpace', 'FacetSurface', 'FlatArray_N6ngcomp13COUPLING_TYPEE_S', 'FromArchiveCF', 'FromArchiveFESpace', 'FromArchiveMesh', 'GlobalInterfaceSpace', 'GlobalSpace', 'GlobalVariables', 'GridFunction', 'GridFunctionC', 'GridFunctionCoefficientFunction', 'GridFunctionD', 'H1', 'H1AMG', 'H1LumpingFESpace', 'HCurl', 'HCurlAMG', 'HCurlCurl', 'HCurlDiv', 'HDiv', 'HDivDiv', 'HDivDivSurface', 'HDivSurface', 'Hidden', 'Integral', 'Integrate', 'IntegrationRuleSpace', 'IntegrationRuleSpaceSurface', 'Interpolate', 'InterpolateProxy', 'KSpaceCoeffs', 'L2', 'LinearForm', 'LocalPreconditioner', 'MatrixFreeOperator', 'MatrixValued', 'Mesh', 'MeshNode', 'MeshNodeRange', 'MultiGridPreconditioner', 'NGS_Object', 'Ngs_Element', 'NodalFESpace', 'NodeId', 'NodeRange', 'NormalFacetFESpace', 'NormalFacetSurface', 'NumberSpace', 'ORDER_POLICY', 'PatchwiseSolve', 'Periodic', 'PlateauFESpace', 'Preconditioner', 'ProductSpace', 'Prolongate', 'ProlongateCoefficientFunction', 'Prolongation', 'ProxyFunction', 'QuasiPeriodicC', 'QuasiPeriodicD', 'Region', 'RegisterPreconditioner', 'Reorder', 'SetHeapSize', 'SetTestoutFile', 'SumOfIntegrals', 'SurfaceL2', 'SymbolTable_D', 'SymbolTable_sp_D', 'SymbolTable_sp_N5ngfem19CoefficientFunctionE', 'SymbolTable_sp_N6ngcomp10LinearFormE', 'SymbolTable_sp_N6ngcomp12BilinearFormE', 'SymbolTable_sp_N6ngcomp12GridFunctionE', 'SymbolTable_sp_N6ngcomp14PreconditionerE', 'SymbolTable_sp_N6ngcomp7FESpaceE', 'SymbolicBFI', 'SymbolicEnergy', 'SymbolicLFI', 'SymbolicTPBFI', 'TangentialFacetFESpace', 'TangentialSurfaceL2', 'TensorProductFESpace', 'TensorProductIntegrate', 'ToArchive', 'Transfer2StdMesh', 'VOL', 'VTKOutput', 'Variation', 'VectorFacetFESpace', 'VectorFacetSurface', 'VectorH1', 'VectorL2', 'VectorNodalFESpace', 'VectorSurfaceL2', 'VectorValued', 'VorB', 'ngsglobals', 'pml']
 class APhiHCurlAMG(HCurlAMG):
     """
     
      Keyword arguments can be:
-    inverse: 
-      Inverse type used in Preconditioner.
-    test: bool = False
-      Computes condition number for preconditioner, if testout file
-      is set, prints eigenvalues to file.
-    block: 
-      use block-Jacobi/block-Gauss-Seidel
-    blocktype: 
-      blocktype like 'vertexpatch', 'edgepatch', ...
+    smoothingsteps: int = 3
+      number of pre and post-smoothing steps
+    smoothedprolongation: bool = true
+      use smoothed prolongation
+    verbose: int = 3
+      verbosity level, 0..no output, 5..most output
     """
     def __init__(self, bf: BilinearForm, **kwargs) -> None:
         ...
@@ -230,6 +228,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 +252,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
@@ -1710,6 +1714,18 @@ class H1(FESpace):
         ...
     def __setstate__(self, arg0: tuple) -> None:
         ...
+class H1AMG(Preconditioner):
+    """
+    
+     Keyword arguments can be:
+    blockjustfortest: bool = false
+      use block Jacobi/Gauss-Seidel
+    """
+    @staticmethod
+    def __flags_doc__() -> dict:
+        ...
+    def __init__(self, bf: BilinearForm, **kwargs) -> None:
+        ...
 class H1LumpingFESpace(FESpace):
     """
     H1-FESpace with nodal basis for mass lumping.
@@ -1855,16 +1871,16 @@ class HCurlAMG(Preconditioner):
     """
     
      Keyword arguments can be:
-    inverse: 
-      Inverse type used in Preconditioner.
-    test: bool = False
-      Computes condition number for preconditioner, if testout file
-      is set, prints eigenvalues to file.
-    block: 
-      use block-Jacobi/block-Gauss-Seidel
-    blocktype: 
-      blocktype like 'vertexpatch', 'edgepatch', ...
+    smoothingsteps: int = 3
+      number of pre and post-smoothing steps
+    smoothedprolongation: bool = true
+      use smoothed prolongation
+    verbose: int = 3
+      verbosity level, 0..no output, 5..most output
     """
+    @staticmethod
+    def __flags_doc__() -> dict:
+        ...
     def __init__(self, bf: BilinearForm, **kwargs) -> None:
         ...
 class HCurlCurl(FESpace):

ngsolve/config/__init__.pyi

@@ -24,14 +24,14 @@ 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.2503'
-NGSOLVE_VERSION_GIT: str = 'v6.2.2503-0-ga44fe5348'
-NGSOLVE_VERSION_HASH: str = 'ga44fe5348'
+NGSOLVE_VERSION: str = '6.2.2504-12-gd2e909551'
+NGSOLVE_VERSION_GIT: str = 'v6.2.2504-12-gd2e909551'
+NGSOLVE_VERSION_HASH: str = 'gd2e909551'
 NGSOLVE_VERSION_MAJOR: str = '6'
 NGSOLVE_VERSION_MINOR: str = '2'
-NGSOLVE_VERSION_PATCH: str = '2503'
-NGSOLVE_VERSION_PYTHON: str = '6.2.2503'
-NGSOLVE_VERSION_TWEAK: str = '0'
+NGSOLVE_VERSION_PATCH: str = '2504'
+NGSOLVE_VERSION_PYTHON: str = '6.2.2504.post12.dev0'
+NGSOLVE_VERSION_TWEAK: str = '12'
 USE_CCACHE: bool = True
 USE_HYPRE: bool = False
 USE_LAPACK: bool = True
@@ -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.2503-0-ga44fe5348'
+version: str = 'v6.2.2504-12-gd2e909551'

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.2503"
-NGSOLVE_VERSION_GIT = "v6.2.2503-0-ga44fe5348"
-NGSOLVE_VERSION_PYTHON = "6.2.2503"
+NGSOLVE_VERSION = "6.2.2504-12-gd2e909551"
+NGSOLVE_VERSION_GIT = "v6.2.2504-12-gd2e909551"
+NGSOLVE_VERSION_PYTHON = "6.2.2504.post12.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "0"
-NGSOLVE_VERSION_PATCH = "2503"
-NGSOLVE_VERSION_HASH = "ga44fe5348"
+NGSOLVE_VERSION_TWEAK = "12"
+NGSOLVE_VERSION_PATCH = "2504"
+NGSOLVE_VERSION_HASH = "gd2e909551"
 
 CMAKE_CXX_COMPILER           = "/Library/Developer/CommandLineTools/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/config/config.pyi

@@ -26,14 +26,14 @@ 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.2503'
-NGSOLVE_VERSION_GIT: str = 'v6.2.2503-0-ga44fe5348'
-NGSOLVE_VERSION_HASH: str = 'ga44fe5348'
+NGSOLVE_VERSION: str = '6.2.2504-12-gd2e909551'
+NGSOLVE_VERSION_GIT: str = 'v6.2.2504-12-gd2e909551'
+NGSOLVE_VERSION_HASH: str = 'gd2e909551'
 NGSOLVE_VERSION_MAJOR: str = '6'
 NGSOLVE_VERSION_MINOR: str = '2'
-NGSOLVE_VERSION_PATCH: str = '2503'
-NGSOLVE_VERSION_PYTHON: str = '6.2.2503'
-NGSOLVE_VERSION_TWEAK: str = '0'
+NGSOLVE_VERSION_PATCH: str = '2504'
+NGSOLVE_VERSION_PYTHON: str = '6.2.2504.post12.dev0'
+NGSOLVE_VERSION_TWEAK: str = '12'
 USE_CCACHE: bool = True
 USE_HYPRE: bool = False
 USE_LAPACK: bool = True
@@ -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.2503-0-ga44fe5348'
+version: str = 'v6.2.2504-12-gd2e909551'

ngsolve/fem.pyi

@@ -403,6 +403,12 @@ class CoefficientFunction:
     def __neg__(self) -> CoefficientFunction:
         ...
     @typing.overload
+    def __or__(self, cf: CoefficientFunction) -> CoefficientFunction:
+        ...
+    @typing.overload
+    def __or__(self, cf: ...) -> typing.Any:
+        ...
+    @typing.overload
     def __pow__(self, exponent: int) -> CoefficientFunction:
         ...
     @typing.overload

ngsolve/preconditioners.py

@@ -1,6 +1,7 @@
 from ngsolve.comp import MultiGridPreconditioner as MultiGrid
 from ngsolve.comp import LocalPreconditioner as Local
 from ngsolve.comp import HCurlAMG
+from ngsolve.comp import H1AMG
 from ngsolve.comp import BDDCPreconditioner as BDDC
 
 

ngsolve/preconditioners.pyi

@@ -1,6 +1,7 @@
 from __future__ import annotations
 from ngsolve.comp import BDDCPreconditioner as BDDC
+from ngsolve.comp import H1AMG
 from ngsolve.comp import HCurlAMG
 from ngsolve.comp import LocalPreconditioner as Local
 from ngsolve.comp import MultiGridPreconditioner as MultiGrid
-__all__ = ['BDDC', 'HCurlAMG', 'Local', 'MultiGrid']
+__all__ = ['BDDC', 'H1AMG', 'HCurlAMG', 'Local', 'MultiGrid']