ngsolve 6.2.2506.post45.dev0__cp311-cp311-macosx_10_15_universal2.whl → 6.2.2506.post74.dev0__cp311-cp311-macosx_10_15_universal2.whl

netgen/include/bdbequations.hpp

@@ -2344,6 +2344,39 @@ namespace ngfem
         mat.Rows(DIM_SPC*i, DIM_SPC*(i+1)).Cols(fel.GetRange(i)) = Trans(hmat);
     }
 
+    static int DimRef() { return DIM_SPC*DIM_ELEMENT; } 
+    
+    template <typename IP, typename MAT>
+    static void GenerateMatrixRef (const FiniteElement & bfel, const IP & ip,
+                                   MAT && mat, LocalHeap & lh)
+    {
+      HeapReset hr(lh);
+      auto & fel = static_cast<const VectorFiniteElement&> (bfel);
+      auto & feli = static_cast<const ScalarFiniteElement<DIM_ELEMENT>&> (fel[0]);
+      FlatMatrix<> hmat(feli.GetNDof(), DIM_ELEMENT, lh);
+      feli.CalcDShape(ip, hmat);
+      int ndof = feli.GetNDof();
+      mat.Rows(DIM_SPACE*DIM_ELEMENT).Cols(DIM_SPC*ndof) = 0.0;
+      for (int i = 0; i < DIM_SPACE; i++)
+        mat.Rows(i*DIM_ELEMENT, (i+1)*DIM_ELEMENT).Cols(i*ndof,(i+1)*ndof)
+          = Trans(hmat);
+    }
+
+    template <typename MIP, typename MAT>
+    static void CalcTransformationMatrix (const MIP & mip,
+                                          MAT & mat, LocalHeap & lh)
+    {
+      FlatMatrix<> hmat(DIM_SPC, DIM_ELEMENT, lh);      
+      hmat = Trans(static_cast<const MappedIntegrationPoint<DIM_ELEMENT,DIM_SPC>&>(mip).GetJacobianInverse());
+      mat.Rows(DIM_DMAT).Cols(DIM_ELEMENT*DIM_SPC) = 0.0;
+      for (int i = 0; i < DIM_SPACE; i++)
+        mat.Rows(i*DIM_SPC, (i+1)*DIM_SPC).Cols(i*DIM_ELEMENT, (i+1)*DIM_ELEMENT) = hmat;
+    }
+    
+
+
+
+
     
     static void GenerateMatrixSIMDIR (const FiniteElement & bfel,
                                       const SIMD_BaseMappedIntegrationRule & mir,

netgen/include/diffopwithfactor.hpp

@@ -0,0 +1,123 @@
+#ifndef DIFFOPWITHFACTOR_HPP
+#define DIFFOPWITHFACTOR_HPP
+
+
+
+namespace ngsbem
+{
+  using namespace ngfem;
+
+  class DifferentialOperatorWithFactor : public DifferentialOperator
+  {
+    shared_ptr<DifferentialOperator> diffop;
+    shared_ptr<CoefficientFunction> factor;
+
+  public:
+    DifferentialOperatorWithFactor (shared_ptr<DifferentialOperator> adiffop,
+                                    shared_ptr<CoefficientFunction> afactor)
+      : DifferentialOperator(afactor->Dimensions()[0], 1, adiffop->VB(), adiffop->DiffOrder()),
+        diffop(adiffop), factor(afactor)
+    {
+      ;
+    }
+
+    int DimRef() const override { return diffop->DimRef(); }
+
+    virtual IntRange UsedDofs(const FiniteElement & fel) const override { return diffop->UsedDofs(fel); }
+
+    auto BaseDiffOp() const { return diffop; }
+
+    void CalcMatrix (const FiniteElement & fel,
+                     const BaseMappedIntegrationPoint & mip,
+                     BareSliceMatrix<double,ColMajor> mat, 
+                     LocalHeap & lh) const override
+    {
+      FlatMatrix<double,ColMajor> hmat(diffop->Dim(), fel.GetNDof(), lh);
+      diffop -> CalcMatrix (fel, mip, hmat, lh);
+
+      auto dims = factor->Dimensions();      
+      FlatMatrix<double> factorx(dims[0], dims[1], lh);
+      factor->Evaluate (mip, factorx.AsVector());
+
+      IntRange used = diffop->UsedDofs(fel);
+      mat.Cols(used) = factorx * hmat.Cols(used);
+    }
+    
+    void CalcMatrix (const FiniteElement & fel,
+                     const SIMD_BaseMappedIntegrationRule & mir,
+                     BareSliceMatrix<SIMD<double>> mat) const override
+    {
+      // *testout << "CalcMatrix SIMD" << endl;      
+      Matrix<SIMD<double>> hmat (fel.GetNDof()*diffop->Dim(), mir.Size());
+      // hmat = SIMD<double>(0.0);
+      diffop -> CalcMatrix (fel, mir, hmat);
+
+      Matrix<SIMD<double>> fac(factor->Dimension(), mir.Size());
+      factor -> Evaluate (mir, fac);
+
+      auto dims = factor -> Dimensions();
+
+      mat.Rows(fel.GetNDof()*dims[1]).Cols(mir.Size()) = SIMD<double>(0.0);
+      
+      for (size_t i = 0; i < mir.Size(); i++)
+        for (size_t j = 0; j < dims[0]; j++)
+          for (size_t k = 0; k < dims[1]; k++)
+            mat.Col(i).Slice(j,dims[0]) += fac(j*dims[1]+k, i) * hmat.Col(i).Slice(k, dims[1]);
+    }
+    
+
+    void CalcMatrix (const FiniteElement & fel,
+                     const IntegrationPoint & ip,
+                     BareSliceMatrix<double,ColMajor> mat,
+                     LocalHeap & lh) const override
+    {
+      diffop -> CalcMatrix(fel, ip, mat, lh);
+      /*
+      *testout << "calcmatrix mip" << endl
+               << mat.Rows(Dim()).Cols(fel.GetNDof()) << endl;
+      */
+    }
+
+    void CalcTransformationMatrix (const BaseMappedIntegrationPoint & mip,
+                                   SliceMatrix<double> trans,
+                                   LocalHeap & lh) const override
+    {
+      HeapReset hr(lh);
+      auto dims = factor->Dimensions();
+      
+      FlatMatrix<double> factorx(dims[0], dims[1], lh);
+      factor->Evaluate (mip, factorx.AsVector());
+
+      FlatMatrix<double> basetrans(diffop->Dim(), diffop->DimRef(), lh);
+      diffop -> CalcTransformationMatrix(mip, basetrans, lh);
+
+      trans = factorx * basetrans;
+      // *testout << "trans = " << trans << endl;
+    }
+
+
+    void Apply (const FiniteElement & fel,
+                const SIMD_BaseMappedIntegrationRule & mir,
+                BareSliceVector<double> x, 
+                BareSliceMatrix<SIMD<double>> flux) const override
+    {
+      auto dims = factor->Dimensions();
+
+      Matrix<SIMD<double>> tmpflux(dims[1], mir.Size());
+      Matrix<SIMD<double>> factorx(dims[0]*dims[1], mir.Size());
+      
+      diffop -> Apply (fel, mir, x, tmpflux);
+      factor -> Evaluate (mir, factorx);
+      flux.Rows(0, dims[0]).Cols(0, mir.Size()) = SIMD<double>(0.0);
+      for (int i = 0; i < dims[0]; i++)
+        for (int j = 0; j < dims[1]; j++)
+          flux.Row(i).Range(mir.Size()) += pw_mult(factorx.Row(i*dims[1]+j), tmpflux.Row(j));
+    }
+
+    
+  };
+
+
+}
+
+#endif

netgen/include/kernels.hpp

@@ -2,6 +2,7 @@
 #define KERNELS_hpp
 
 #include "mptools.hpp"
+#include <type_traits>
 
 
 //  ****************************  The kernels **********************************
@@ -62,18 +63,26 @@ namespace ngsbem
   
   /** LaplaceSLkernel is the kernel for the single layer potential of 
       the Laplace equation $ \Delta u = 0 \,.$  */
-  template <int DIM> class LaplaceSLKernel;
+  template <int DIM, int COMPS=1> class LaplaceSLKernel;
 
   /** LaplaceSLkernel in 3D reads 
       $$ G(x-y) = \frac{1}{4\,\pi \, | x-y| }, \quad x, y \in \mathbb R^3, \; x\not=y\,. $$ */
-  template<>
-  class LaplaceSLKernel<3> : public BaseKernel
+  template<int COMPS>
+  class LaplaceSLKernel<3, COMPS> : public BaseKernel
   {
   public:
-    LaplaceSLKernel<3> () = default;
+    LaplaceSLKernel<3,COMPS>()
+    {
+      for (size_t i = 0; i < COMPS; i++)
+        terms += {1.0, 0, i, i};
+    };
     typedef double value_type;
+    using mp_type = typename std::conditional<COMPS == 1,
+                                              Complex,
+                                              Vec<COMPS, Complex>>::type;
+
     static string Name() { return "LaplaceSL"; }
-    static auto Shape() { return IVec<2>(1,1); }
+    static auto Shape() { return IVec<2>(COMPS,COMPS); }
     
     template <typename T>        
     auto Evaluate (Vec<3,T> x, Vec<3,T> y, Vec<3,T> nx, Vec<3,T> ny) const
@@ -83,45 +92,59 @@ namespace ngsbem
       return Vec<1,T> (1.0 / (4 * M_PI * norm));
     }
     
-    Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };
+    Array<KernelTerm> terms;
     
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, 1e-16);
+      return make_shared<SingularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, 1e-16);
+      return make_shared<RegularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
 
-    void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
+    void AddSource (SingularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
     {
-      mp.AddCharge (pnt, val(0));
+      if constexpr (COMPS == 1)
+        mp.AddCharge (pnt, val(0));
+      else
+        mp.AddCharge (pnt, val);
     }
 
-    void EvaluateMP (RegularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
+    void EvaluateMP (RegularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
     {
-      val(0) = Real(mp.Evaluate (pnt));
+      if constexpr (COMPS == 1)
+        val(0) = Real(mp.Evaluate (pnt));
+      else
+        val = Real(mp.Evaluate (pnt));
     }
   };
 
 
   /** LaplaceDLkernel is the kernel for the double layer potential of 
       the Laplace equation $ \Delta u = 0 \,.$  */
-  template <int DIM> class LaplaceDLKernel;
+  template <int DIM, int COMPS=1> class LaplaceDLKernel;
 
   /** LaplaceDLkernel in 3D reads 
       $$ \frac{\partial }{ \partial n_y} G(x-y) = \frac{1}{4\,\pi} \, 
           \frac{ \langle n(y), x-y\rangle }{ | x-y|^3 }, 
           \quad x, y \in \mathbb R^3, \; x\not=y\,. $$ */
-  template<>
-  class LaplaceDLKernel<3> : public BaseKernel
+  template<int COMPS>
+  class LaplaceDLKernel<3, COMPS> : public BaseKernel
   {
   public:
+    LaplaceDLKernel<3,COMPS>()
+    {
+      for (size_t i = 0; i < COMPS; i++)
+        terms += {1.0, 0, i, i};
+    };
     typedef double value_type;
+    using mp_type = typename std::conditional<COMPS == 1,
+                                                  Complex,
+                                                  Vec<COMPS, Complex>>::type;
     static string Name() { return "LaplaceDL"; }
-    static auto Shape() { return IVec<2>(1,1); }
+    static auto Shape() { return IVec<2>(COMPS,COMPS); }
     
     template <typename T>
     auto Evaluate (Vec<3,T> x, Vec<3,T> y, Vec<3,T> nx, Vec<3,T> ny) const
@@ -132,83 +155,48 @@ namespace ngsbem
       return Vec<1,T> (nxy / (4 * M_PI * norm*norm*norm));
     }
 
-    Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };    
-
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
-    {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, 1e-16);
-    }
-
-    auto CreateLocalExpansion (Vec<3> c, double r) const
-    {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, 1e-16);
-    }
-
-    void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
-    {
-      mp.AddDipole(pnt, -nv, val(0));
-    }
-
-    void AddSourceTrans(SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
-    {
-      mp.AddCharge(pnt, val(0));
-    }
-
-    void EvaluateMP (RegularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
-    {
-      val(0) = Real(mp.Evaluate (pnt));
-    }
+    Array<KernelTerm> terms;
 
-    void EvaluateMPTrans(RegularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      val(0) = Real(mp.EvaluateDirectionalDerivative(pnt, nv));
+      return make_shared<SingularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
-  };
 
-
-  template <int DIM> class LaplaceHSKernel;
-  
-  template<>
-  class LaplaceHSKernel<3> : public BaseKernel 
-  {
-  public:
-    typedef double value_type;
-    static string Name() { return "LaplaceHL"; }
-    static auto Shape() { return IVec<2>(3,3); }
-    
-    template <typename T>        
-    auto Evaluate (Vec<3,T> x, Vec<3,T> y, Vec<3,T> nx, Vec<3,T> ny) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      T norm = L2Norm(x-y);
-      // return 1.0 / (4 * M_PI * norm);   
-      return Vec<1,T> (1.0 / (4 * M_PI * norm));
+      return make_shared<RegularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
-    
-    Array<KernelTerm> terms =
-      {
-        KernelTerm{1.0, 0, 0, 0},
-        KernelTerm{1.0, 0, 1, 1},
-        KernelTerm{1.0, 0, 2, 2},
-      };
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    void AddSource (SingularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
     {
-      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, 1e-16);
+      if constexpr (COMPS == 1)
+        mp.AddDipole(pnt, -nv, val(0));
+      else
+        mp.AddDipole(pnt, -nv, val);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    void AddSourceTrans(SingularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
     {
-      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, 1e-16);
+      if constexpr (COMPS == 1)
+        mp.AddCharge (pnt, val(0));
+      else
+        mp.AddCharge (pnt, val);
     }
 
-    void AddSource (SingularMLExpansion<Vec<3,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
+    void EvaluateMP (RegularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
     {
-      mp.AddCharge(pnt, val);
+      if constexpr (COMPS == 1)
+        val(0) = Real(mp.Evaluate (pnt));
+      else
+        val = Real(mp.Evaluate (pnt));
     }
 
-    void EvaluateMP (RegularMLExpansion<Vec<3,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
+    void EvaluateMPTrans(RegularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
     {
-      val = Real(mp.Evaluate (pnt));
+      if constexpr (COMPS == 1)
+        val(0) = Real(mp.EvaluateDirectionalDerivative(pnt, nv));
+      else
+        val = Real(mp.EvaluateDirectionalDerivative(pnt, nv));
     }
   };
 
@@ -243,14 +231,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -297,14 +285,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -357,14 +345,14 @@ namespace ngsbem
         KernelTerm{1.0, 0, 2, 2},
       };
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<3,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -410,14 +398,14 @@ namespace ngsbem
 	KernelTerm{1.0, 1, 3, 3},
       };
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, kappa, fmm_params);
     }
  
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<6,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -473,14 +461,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -531,14 +519,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms;
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<4,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<4,Complex>>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<4,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<4,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<4,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -598,14 +586,14 @@ namespace ngsbem
         KernelTerm{-1.0, 2, 1, 0},
       };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<3,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -712,14 +700,14 @@ namespace ngsbem
     }
 
     
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16);
+      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16);
+      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16, fmm_params);
     }
 
     

netgen/include/mp_coefficient.hpp

@@ -119,9 +119,9 @@ namespace ngsbem
     shared_ptr<RegularMLExpansion<entry_type>> mlmp;
   public:
     RegularMLExpansionCF (shared_ptr<SingularMLExpansionCF<entry_type>> asingmp, Vec<3> center, double r)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp->MLExpansion(), center, r)} { } 
+      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp->MLExpansion(), center, r, FMM_Parameters())} { } 
     RegularMLExpansionCF (shared_ptr<SingularMLExpansion<entry_type>> asingmp, Vec<3> center, double r)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp, center, r)} { } 
+      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp, center, r, FMM_Parameters())} { } 
     
     virtual double Evaluate (const BaseMappedIntegrationPoint & ip) const override
     { throw Exception("real eval not available"); }

netgen/include/mptools.hpp

@@ -58,6 +58,15 @@ namespace ngsbem
   
 
 
+  class FMM_Parameters
+  {
+  public:
+    int maxdirect = 100;
+    int minorder = 20;    // order = minorder + 2 kappa r 
+  };
+
+
+  
   
   inline std::tuple<double, double, double> SphericalCoordinates(Vec<3> dist){
     double len, theta, phi;
@@ -516,12 +525,14 @@ namespace ngsbem
 
   // ***************** parameters ****************
 
+  /*
   static constexpr int MPOrder (double rho_kappa)
   {
     // return max (20, int(2*rho_kappa));
     return 20+int(2*rho_kappa);
   }
   static constexpr int maxdirect = 100;
+  */
 
 
   template <typename SCAL, auto S>
@@ -665,11 +676,13 @@ namespace ngsbem
                   Vec<3,SIMD<double,FMM_SW>>, simd_entry_type>> simd_chargedipoles;
       
       int total_sources;
+      const FMM_Parameters & fmm_params;
       std::mutex node_mutex;
       atomic<bool> have_childs{false};
       
-      Node (Vec<3> acenter, double ar, int alevel, double akappa)
-        : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*akappa), akappa, ar) // min(1.0, ar*akappa))
+      Node (Vec<3> acenter, double ar, int alevel, double akappa, const FMM_Parameters & afmm_params)
+      // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*akappa), akappa, ar), fmm_params(afmm_params)
+        : center(acenter), r(ar), level(alevel), mp(afmm_params.minorder+2*ar*akappa, akappa, ar), fmm_params(afmm_params)
       {
         if (level < nodes_on_level.Size())
           nodes_on_level[level]++;
@@ -693,7 +706,7 @@ namespace ngsbem
             cc(0) += (i&1) ? r/2 : -r/2;
             cc(1) += (i&2) ? r/2 : -r/2;
             cc(2) += (i&4) ? r/2 : -r/2;
-            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
+            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa(), fmm_params);
           }
         have_childs = true;
       }
@@ -742,7 +755,7 @@ namespace ngsbem
 
         // if (r*mp.Kappa() < 1e-8) return;
         if (level > 20) return;
-        if (charges.Size() < maxdirect && r*mp.Kappa() < 5)
+        if (charges.Size() < fmm_params.maxdirect && r*mp.Kappa() < 5)
           return;
         
         SendSourcesToChilds();
@@ -772,7 +785,7 @@ namespace ngsbem
         dipoles.Append (tuple{x,d,c});
         
         if (level > 20) return;
-        if (dipoles.Size() < maxdirect)
+        if (dipoles.Size() < fmm_params.maxdirect)
           return;
 
         SendSourcesToChilds();
@@ -801,7 +814,7 @@ namespace ngsbem
         
         chargedipoles.Append (tuple{x,c,dir,c2});
 
-        if (chargedipoles.Size() < maxdirect || r < 1e-8)
+        if (chargedipoles.Size() < fmm_params.maxdirect || r < 1e-8)
           return;
 
         SendSourcesToChilds();
@@ -1269,12 +1282,13 @@ namespace ngsbem
       }
     };
     
-    Node root;
+    FMM_Parameters fmm_params;
+    Node root;    
     bool havemp = false;
     
   public:
-    SingularMLExpansion (Vec<3> center, double r, double kappa)
-      : root(center, r, 0, kappa)
+    SingularMLExpansion (Vec<3> center, double r, double kappa, FMM_Parameters _params = FMM_Parameters())
+      : fmm_params(_params), root(center, r, 0, kappa, fmm_params)
     {
       nodes_on_level = 0;
       nodes_on_level[0] = 1;
@@ -1661,11 +1675,13 @@ namespace ngsbem
       atomic<bool> have_childs{false};
 
       Array<const typename SingularMLExpansion<elem_type>::Node*> singnodes;
+      const FMM_Parameters & params;
 
-      Node (Vec<3> acenter, double ar, int alevel, double kappa)
+      
+      Node (Vec<3> acenter, double ar, int alevel, double kappa, const FMM_Parameters & _params)
         : center(acenter), r(ar), level(alevel),
           // mp(MPOrder(ar*kappa), kappa, ar) // 1.0/min(1.0, 0.25*r*kappa))
-          mp(-1, kappa, ar)
+          mp(-1, kappa, ar), params(_params)
           // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, 1.0)
       {
         if (level < nodes_on_level.Size())
@@ -1674,7 +1690,8 @@ namespace ngsbem
 
       void Allocate()
       {
-        mp = SphericalExpansion<Regular,elem_type>(MPOrder(r*mp.Kappa()), mp.Kappa(), r);
+        // mp = SphericalExpansion<Regular,elem_type>(MPOrder(r*mp.Kappa()), mp.Kappa(), r);
+        mp = SphericalExpansion<Regular,elem_type>(params.minorder+2*r*mp.Kappa(), mp.Kappa(), r);        
       }
       
       
@@ -1688,7 +1705,7 @@ namespace ngsbem
             cc(0) += (i&1) ? r/2 : -r/2;
             cc(1) += (i&2) ? r/2 : -r/2;
             cc(2) += (i&4) ? r/2 : -r/2;
-            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
+            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa(), params);
             if (allocate)
               childs[i] -> Allocate();
           }
@@ -1909,7 +1926,7 @@ namespace ngsbem
 
         // if (r*mp.Kappa() < 1e-8) return;
         if (level > 20) return;        
-        if (targets.Size() < maxdirect && r*mp.Kappa() < 5)
+        if (targets.Size() < params.maxdirect && r*mp.Kappa() < 5)
           return;
 
         CreateChilds();
@@ -1949,7 +1966,7 @@ namespace ngsbem
         vol_targets.Append (tuple(x,tr));
 
         if (level > 20) return;
-        if (vol_targets.Size() < maxdirect && (r*mp.Kappa() < 5))
+        if (vol_targets.Size() < params.maxdirect && (r*mp.Kappa() < 5))
           return;
 
         CreateChilds();
@@ -2018,14 +2035,16 @@ namespace ngsbem
       }
 
     };
-    
+
+    FMM_Parameters fmm_params;
     Node root;
     shared_ptr<SingularMLExpansion<elem_type>> singmp;
     
   public:
-  RegularMLExpansion (shared_ptr<SingularMLExpansion<elem_type>> asingmp, Vec<3> center, double r)
-      : root(center, r, 0, asingmp->Kappa()), singmp(asingmp)
-    {
+  RegularMLExpansion (shared_ptr<SingularMLExpansion<elem_type>> asingmp, Vec<3> center, double r,
+                      const FMM_Parameters & _params)
+  : fmm_params(_params), root(center, r, 0, asingmp->Kappa(), fmm_params), singmp(asingmp)
+  {
       if (!singmp->havemp) throw Exception("first call Calc for singular MP");
       root.Allocate();
       
@@ -2054,13 +2073,13 @@ namespace ngsbem
       }
     }
 
-    RegularMLExpansion (Vec<3> center, double r, double kappa)
-      : root(center, r, 0, kappa)
-    {
-      nodes_on_level = 0;
-      nodes_on_level[0] = 1;
-    }
-    
+  RegularMLExpansion (Vec<3> center, double r, double kappa, const FMM_Parameters & _params)
+  : fmm_params(_params), root(center, r, 0, kappa, fmm_params)
+  {
+    nodes_on_level = 0;
+    nodes_on_level[0] = 1;
+  }
+  
     void AddTarget (Vec<3> t)
     {
       root.AddTarget (t);

netgen/include/preconditioner.hpp

@@ -414,7 +414,7 @@ namespace ngcomp
     ///
     // MGPreconditioner * low_order_preconditioner;
     ///
-    shared_ptr<Preconditioner> coarse_pre;
+    shared_ptr<BaseMatrix> coarse_pre;
     ///
     int finesmoothingsteps;
     ///
@@ -462,7 +462,7 @@ namespace ngcomp
     void MgTest () const;
 
     void SetDirectSolverCluster(shared_ptr<Array<int>> cluster);
-    void SetCoarsePreconditioner(shared_ptr<Preconditioner> prec);
+    void SetCoarsePreconditioner(shared_ptr<BaseMatrix> prec);
   };
 
   class CommutingAMGPreconditioner : public Preconditioner

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2506-45-g573446995")
+set(PACKAGE_VERSION "6.2.2506-74-gd430159c1")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..

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.2506-45-g573446995"
-NGSOLVE_VERSION_GIT = "v6.2.2506-45-g573446995"
-NGSOLVE_VERSION_PYTHON = "6.2.2506.post45.dev0"
+NGSOLVE_VERSION = "6.2.2506-74-gd430159c1"
+NGSOLVE_VERSION_GIT = "v6.2.2506-74-gd430159c1"
+NGSOLVE_VERSION_PYTHON = "6.2.2506.post74.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "45"
+NGSOLVE_VERSION_TWEAK = "74"
 NGSOLVE_VERSION_PATCH = "2506"
-NGSOLVE_VERSION_HASH = "g573446995"
+NGSOLVE_VERSION_HASH = "gd430159c1"
 
 CMAKE_CXX_COMPILER           = "/Library/Developer/CommandLineTools/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/solve_implementation.py

@@ -58,7 +58,16 @@ class NonLinearApplication(Application):
         solver = NewtonSolver(self.a, self.gf, **solver_args)
         if dirichlet is not None:
             dirichlet_gf = GridFunction(self.gf.space)
-            if isinstance(dirichlet, Dirichlet):
+            if isinstance(dirichlet, list):
+                for i in range(len(dirichlet)):
+                    if dirichlet[i] is not None:
+                        if isinstance(dirichlet[i], Dirichlet):
+                            dirichlet_gf.components[i].Set(
+                                dirichlet[i].cf, definedon=dirichlet[i].region
+                            )
+                        else:
+                            dirichlet_gf.components[i].Set(dirichlet[i], BND)
+            elif isinstance(dirichlet, Dirichlet):
                 dirichlet_gf.Set(dirichlet.cf, definedon=dirichlet.region)
             else:
                 dirichlet_gf.Set(dirichlet, BND)

{ngsolve-6.2.2506.post45.dev0.dist-info → ngsolve-6.2.2506.post74.dev0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: ngsolve
-Version: 6.2.2506.post45.dev0
+Version: 6.2.2506.post74.dev0
 Summary: NGSolve
 Author: The NGSolve team
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: netgen-mesher (==6.2.2506.post8.dev0)
+Requires-Dist: netgen-mesher (==6.2.2506.post11.dev0)
 

{ngsolve-6.2.2506.post45.dev0.dist-info → ngsolve-6.2.2506.post74.dev0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-netgen/libngbla.dylib,sha256=3g_N-j2aphEgTsBx73uO9s9mesnm8H8ueAcfC6sTmVs,5859920
-netgen/libngcomp.dylib,sha256=3xuR79SQw5IEi-m_03vJoS1Pjeo-QVde9KYJoc0EtHQ,43094720
-netgen/libngfem.dylib,sha256=fBCvgYwiuG7SMow2UYQTS_Sr-msBPnquM6-qlvfilbE,51659744
-netgen/libngla.dylib,sha256=FREKXYknfUVtBXVsCG6WD7G9zni30aJpeYJ5iNMkghE,25567728
-netgen/libngsbem.dylib,sha256=kIuJkPuAOgWAoZs3OpXo6BBxqbRdGa6UVxjl7YbI5Fc,9120288
-netgen/libngsolve.dylib,sha256=Fc0RE6ytRezOAiyK0ZSDnXTGuBNnNY2WAMAE7xJMVIU,944000
-netgen/libngstd.dylib,sha256=Do1YzAE8LiVds8GIxjInTQVavMFGid4HT0kak3kHkJw,939808
+netgen/libngbla.dylib,sha256=TB_qZIYG_AqeBdM9BUnrA6jdNK2Rf0pkmAO-clXW8BM,5989488
+netgen/libngcomp.dylib,sha256=Yx4aGXic4Y0PcPGMKmv_QTfl4vLZeA-rn_7nlth-q0I,44587984
+netgen/libngfem.dylib,sha256=P3zpoLP0yQJ-MVhzxpqvikSnj0GZJ2vlMD4DNjpYSSY,52069760
+netgen/libngla.dylib,sha256=TaH-68Nw1R7qaU6ZzCNawR8GS3yuaFLSXh4FVkDBJg8,26137856
+netgen/libngsbem.dylib,sha256=3zWXoPAkbNeBdmlErlz_mzidJR56xsHM0J2bTBvPm5k,9696176
+netgen/libngsolve.dylib,sha256=jX9bAL1bPfVRthdx83wzLdIpx0is4rfGeJ4xFa-jLlo,1069632
+netgen/libngstd.dylib,sha256=V7ZLxFMC-URHU-jcyu0i2sooIHN9ONOSvmmnDZbD53U,1041104
 netgen/include/analytic_integrals.hpp,sha256=xLVJ8n0-t6UlU_yKE8i0vYkXilsNuqVixkzJlmxptKw,238
 netgen/include/arnoldi.hpp,sha256=b8mRu9wGyaLa7z6mXCFIhxfW_xcQvsOMD6TqbfYZ05g,1437
 netgen/include/bandmatrix.hpp,sha256=zwKz89QY53MPsWgNsl0cXEAFKka_W4sXPIO54M3eT80,7778
 netgen/include/basematrix.hpp,sha256=6YGW07HMH7F2JWXUKOwlGZ2ZvEoP7uCSGihdrzzKPag,28634
 netgen/include/basevector.hpp,sha256=6UISVxCMw3kEzHzZmpOCdv9mLHlaWTR2AXLMbNNC6YQ,31108
-netgen/include/bdbequations.hpp,sha256=JPgzNFMfZeD56SgRGukVup7lEmT1O3lCTX0LdvHybpY,90406
+netgen/include/bdbequations.hpp,sha256=df_vU9kve1uGd06Tgzuhc3Z3qxQ7_cDvYNxb94NL6nc,91716
 netgen/include/bdbintegrator.hpp,sha256=-KCvBBh8zZQ29tLiLIa28c6QWJBsN8xYC7K-NwEZhYw,47590
 netgen/include/bem_diffops.hpp,sha256=ZPuCPiqrZcQj4w5BTkYJzOFTP33gC7ST7qh1AdvI-uM,16307
 netgen/include/bessel.hpp,sha256=-6k_a2bsoY1rWgLSUvQMfm92xVLnlB28CU6Qwryj-GI,25282
@@ -38,6 +38,7 @@ netgen/include/diagonalmatrix.hpp,sha256=_P9pv36VUbh0WGuYtKlAHJv-SNVqg7PsGPwphbm
 netgen/include/differentialoperator.hpp,sha256=uUDW_sGO8prj3gtFv4CNkcpttAaeqYrr1fOWEYRsemI,9380
 netgen/include/diffop.hpp,sha256=w7IteI4MKRSX13M3u74BuPKBvZfD9gU_jjAVSJD8hW4,44359
 netgen/include/diffop_impl.hpp,sha256=aJTf9vwbAz9QXy6RfFLh9VldZClZysdcVSa2fiXFfr8,11345
+netgen/include/diffopwithfactor.hpp,sha256=bQhwxhFqA7l3yo9RjzZrHmtO97dqXuYhuW_MRXVSyC8,4053
 netgen/include/discontinuous.hpp,sha256=_Mwx37ZOJ0tKVJ6FdJClEJo3fQYs1ht7-vzn-vhvWGg,3069
 netgen/include/dump.hpp,sha256=SIdx6wQbmxGOthnUKGnGl5IYL4zRC_l6x0YdOXi598I,27010
 netgen/include/ectypes.hpp,sha256=4eUASFuK828kMN4-OS83fy1kH1pstYByxqJGjPH_3H0,2595
@@ -103,7 +104,7 @@ netgen/include/intrule.hpp,sha256=VSDdG7fpraQHY1eZFaKo7bLyfpwBjMM0Z2qJgcmYW3w,80
 netgen/include/intrules_SauterSchwab.hpp,sha256=1HiSgmdJHNoCp1ZYY7gNFPHdanepbGtay2YJrTaYHBg,650
 netgen/include/irspace.hpp,sha256=DcpkPMFKx5nDvfLfTWKmpYuLX-X5rBuWF8Ta9e__m-A,1508
 netgen/include/jacobi.hpp,sha256=hFhMn5Q46_DxHGofXV_or5VCTREslMvpccV7FZCAefE,4738
-netgen/include/kernels.hpp,sha256=J50yqnQl2Y9P2yAZ3mtFU7x0aOWfkmevKIVV94J5u8U,23737
+netgen/include/kernels.hpp,sha256=duCj2F7Gzz6drTp7_vi-oGIra0IiVK9VP5Ov4bpanCg,24354
 netgen/include/l2hofe.hpp,sha256=kbCezYmmgGqfIN0WZRNDKBEoWQTTcgpg7TEuDERolSY,6696
 netgen/include/l2hofe_impl.hpp,sha256=-rWVybAL7QTkfNNXAz1tP4RYQcBuOVYLTZE3E502tuA,15848
 netgen/include/l2hofefo.hpp,sha256=sQhmfliTW2Ac_XLucufzbRdtSRr471i3qPFAMSByvU0,16592
@@ -114,8 +115,8 @@ netgen/include/matrix.hpp,sha256=6Tg9xvyHWRmzrmK_pa15fE_V77y9pof3z78GnyzXmRE,557
 netgen/include/memusage.hpp,sha256=H-8rWQ8UQDCnOiYQnbwvILPuPoJD8bqwiNGB2QAUa0o,1168
 netgen/include/meshaccess.hpp,sha256=j5dinD-8bVm18MkVqG9j-IhhZUHHXw3erdZy-LHxl-8,47133
 netgen/include/mgpre.hpp,sha256=zdNozWRSyluOF8E4GLeOR290Yw2wqGYGc1sTTSB5n3U,4825
-netgen/include/mp_coefficient.hpp,sha256=AvH0tzkfqeOGZiydF2f0-M7vtW-29szci-9Krpl_Dow,4980
-netgen/include/mptools.hpp,sha256=elGoYLWZooEjH8NJmFOzFQJD_tuqgjDaCWZk7aZWzmo,70712
+netgen/include/mp_coefficient.hpp,sha256=EFdnM3YDWmNya2NskFV5Idur6RKpGoHcgwN0qogB5hI,5016
+netgen/include/mptools.hpp,sha256=_SR1XBtP7oGw7sZHNEINZJj-Fn-4IrGFM4b9aIiuNww,71593
 netgen/include/multigrid.hpp,sha256=ovl1GXcTfXuYLVVMcFfCKP5sg6diSGlqdjCMMPCgFUo,856
 netgen/include/multivector.hpp,sha256=nuLxMiq2y6HoH5w9j6ka2BhJjRyREPeEnNFx_x0SMU0,12635
 netgen/include/mumpsinverse.hpp,sha256=Jaa5NPQzwPo2kSbHijI_LX3tr0qUmVhqVlRM14KeD18,4062
@@ -146,7 +147,7 @@ netgen/include/pmltrafo.hpp,sha256=SrlOgJ4qmBST4uIjtl4VatEw5dsGrL1-7xSrXnuAPAg,1
 netgen/include/postproc.hpp,sha256=kaMQUfm_kd5Q4E0C5NaXPv3XyZncgOjwnZrvNJIP39A,5192
 netgen/include/potentialtools.hpp,sha256=Js9DZrAHaAnQT61v0vFcd4RX6vYtxWbXsW4kueo8m9c,465
 netgen/include/precomp.hpp,sha256=R-xo8gpTBNlyaQ-vj12q-VZoGZMox0FM5IWF22zWmMA,1277
-netgen/include/preconditioner.hpp,sha256=RW6Bf782q38Bx77ia3Iz3gwR_q8bp2O0bpsMHYswPBQ,14166
+netgen/include/preconditioner.hpp,sha256=5TN6kvNNNk2JxR2ghUdD1iunrnCPgoeOE7z6NEW_zEw,14158
 netgen/include/prolongation.hpp,sha256=_VUX2vzhcXOGPM1HnRBXkTKrNyXew72VWRnAnvFitF4,10927
 netgen/include/python_comp.hpp,sha256=IVR8USVPy6hf1ZksUCUjvXcK7lcnyTpqzteR8a6Sblw,3464
 netgen/include/python_fem.hpp,sha256=9-GoQrCprOReAgK9-v_X3NwGWJ229vmGjtwGI9td5GA,3072
@@ -207,21 +208,21 @@ ngsolve/krylovspace.py,sha256=wBSsE4-lmBnJsiNU1BYBKjfYgFAcqR1Ioe84DMwIjIM,31863
 ngsolve/meshes.py,sha256=fxxtbxkfKuO2nUkXUiYwAwBAVxr9gkdnyIbZX3VpITQ,26786
 ngsolve/ngs2petsc.py,sha256=6978Z7Na6eMOZ5NTEZx0ZVflyX6Kyy4gPQT_9RYuNss,12499
 ngsolve/ngscxx.py,sha256=q3t5DgE3sJazWueas8FTXJ9jZM-LVa9KbGj_RTam6V4,1293
-ngsolve/ngslib.so,sha256=IM3vb9hsk0R_cGRfu_WUcwrbvOAiqDZi_iaWE5RaV5Q,336760
+ngsolve/ngslib.so,sha256=eIil7sQVWEG_SrLeovXm1ptXoFUNAphJ_WvJw5gzdN4,374712
 ngsolve/nonlinearsolvers.py,sha256=8Q_CrD9vjdpZRV9sj2Fth7Y_kJJl7djPgarQmTK7Xfw,8216
 ngsolve/preconditioners.py,sha256=DLRUd9wQwxXUWL1wEBAbHQbWNp71qZYOFvH5Krfa834,239
-ngsolve/solve_implementation.py,sha256=sX5NClaPmhRZFbIrUVN6Ld4lg1_D5QzxtQxynK_Qq8E,5056
+ngsolve/solve_implementation.py,sha256=-yyggHGmivv_hhSfRpShFqfWw2SOECpR3BMvccidvE4,5540
 ngsolve/solvers.py,sha256=WgZ9X1x9mtQegXDu8VcTjP-wbS2EnrUS96Y8LXqeflw,304
 ngsolve/timestepping.py,sha256=SLbsgE5pY5tXYTLGlVypk4kS2Ui8GxOwWmKVxqneZRU,8350
 ngsolve/timing.py,sha256=Xqkq2byJjNNK9vJjHG2O3cMf6xuKIyySjk8yv6Le2T8,3985
 ngsolve/utils.py,sha256=V2yVF4K3uv1007-DEs_GrzJ3BOOh09c4lDGGR1Xw-PU,4557
 ngsolve/webgui.py,sha256=EUhaOtWHZy80aLXhXbHwbCQVNjRSw-BAAE50cz7Ydaw,24313
-ngsolve/cmake/NGSolveConfig.cmake,sha256=x8K70SBGt70rruI4AMLUCXxTUi0WCLS1NldxQxqHDvo,5066
+ngsolve/cmake/NGSolveConfig.cmake,sha256=G73Eh-fY6Fml23lU-IHRT9rAbl0Xt_aYvHPTQ0u1INw,5066
 ngsolve/cmake/ngsolve-targets-release.cmake,sha256=2dUHzaaMQX08eT7Tjti0crzp_Ah3oqW86gp5UgSufmw,3426
 ngsolve/cmake/ngsolve-targets.cmake,sha256=1cQTFW-4aJfY356XRcuslSbFClmwPOSS03bj3WL15iM,5637
 ngsolve/config/__init__.py,sha256=A00lpnUKg-q3y_b-cN3jKF9urkGTGjb2Yz_gGc9WCLs,22
 ngsolve/config/__main__.py,sha256=m8k2RrXnXR5oYaUna1dwkKNhOZBiM7EyFSE9kIcZKvo,89
-ngsolve/config/config.py,sha256=ccfbPWLQ7ao7P_CmCVFwdkQSTszaPlquHWCC6eokujU,2467
+ngsolve/config/config.py,sha256=Gl-U399IWsAqvIYYD2GzuX27xEI0qR8M4Ip9cA54D8w,2467
 ngsolve/demos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ngsolve/demos/TensorProduct/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ngsolve/demos/TensorProduct/tp_dg_1d_1d.py,sha256=CrJCkbJNinVYUL3DO-4DnCAMGSAhegNc0QVWiJTk3Js,2109
@@ -253,41 +254,41 @@ ngsolve/demos/mpi/mpi_cmagnet.py,sha256=HuN4lttA2q2kNWss6LZNUKraHqskRQNVEBRjkrU2
 ngsolve/demos/mpi/mpi_navierstokes.py,sha256=Sct0G6EziYVfeIeSa7_b6r3WiYXcxZekoOGsZQALx-c,2911
 ngsolve/demos/mpi/mpi_poisson.py,sha256=UvXODjpWtqIgqq7lvMJf3ZEoJZLY1Dck-82R7auiW6I,2468
 ngsolve/demos/mpi/mpi_timeDG.py,sha256=TPJZ-DwmzOpuAol-fFKeU-R2rJ74MbjOm3DDkQI9BcY,1881
-ngsolve-6.2.2506.post45.dev0.data/data/Netgen.icns,sha256=Ebqct4LKxLzxdJLwGg0tTUQb1VjLwkKhtmdYhpRhKjg,291475
-ngsolve-6.2.2506.post45.dev0.data/data/bin/ngscxx,sha256=TDWPvQxbPYsPFhbPU6RlApEuxCoOOzwj3J80VKMMyp8,1755
-ngsolve-6.2.2506.post45.dev0.data/data/bin/ngsld,sha256=50UErkFWLTocn8GtZDTkUWmPTIqsoK5lcfBGwyP0Vnc,557
-ngsolve-6.2.2506.post45.dev0.data/data/bin/ngsolve.tcl,sha256=SSBYLyp4zgl6eM17LXIiLoj1Doy-h2s4EZg6oKi6ucA,20995
-ngsolve-6.2.2506.post45.dev0.data/data/bin/ngspy,sha256=OvTnzkYgC9G3IK42QJpjmXkV7Q_Arig43STSfPDsDD4,103
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/beam.geo,sha256=EtxklGAIo6SxZlHHC_FZHoQGZqZUDGJQSheEMFO-bJ8,387
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/beam.vol,sha256=aotG4VA7sIgAsPQsYkzbMP1Jta_TddG2gMCblkSPkqc,13594
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/chip.in2d,sha256=g6C-mcoD8-q9JtZpuh4mf4iFEZUIGvvivp4C5YYMlAw,551
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/chip.vol,sha256=if0yLn8E3P4mZ_X5sBcrEIp2C4ZhMysGROtB1YCkJHI,27897
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/coil.geo,sha256=PVD4I9ztZowKwNOUrjnoOP7Tj2KG9J0UCJFRS9EhlxU,364
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/coil.vol,sha256=IOZe4oPxMUa9vBGJWN4LG9M79XAruY23S2rtAh_2_98,144724
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/coilshield.geo,sha256=lCUDCAhfowBttSGEY_giyY0xEFInAbgVfIPwSWBb504,605
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/coilshield.vol,sha256=2Dq5VCX7dqGxo_ExtUhI716I-SnxhLGPawW29IR9nYY,162397
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/cube.geo,sha256=kbBNVUYVSf1ogV7-Xf31KXju3LCUIPaDLfvwZHMgddI,386
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/cube.vol,sha256=54108a3RvrTUOJSFltxUY8iiNzyWoBTtNrWM0kufj7c,90295
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=bPQAvbYlyvCfLzk9cOzjXDn94UFC_vBCONl7fEIaMVs,1304
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=Mq3Ap63mWqjQyXsASFAlkRQ0AWxBlY3BYYejTYd-lwg,1101
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d1_square.pde,sha256=ysOroxhoAOePmB_Aswps9iGjA2qV5435iu3hOnSvN8M,1029
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=AowiGbuAWEdyFUB3d1LlZeQ7rarbkqIYsj1QcWc89-A,950
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=nG0HxrxboI2qGoR5_LNZt7RYB7ji2o5jtkyIqTFR4y8,568
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=-C4RgoVtBXZu7XHCwZy7F7pr_PGNGcRwWCFzBppq1mQ,1033
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=QOYC7YN7LdcjSFeLdJu1Tlfi-lmsVsa7b9G6qoCsGo8,1985
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=Iua3INfuIUeaBk21qNg4u5KZt__H1B8BZUsy5frjhdY,1901
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=-ELH2obynMJcvSOqoYT1OThXcllIcdss0ZrklLSimZw,1200
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=WUUulvd3dsedB25sFVQgU7FgZ3B7BkbxgkXTEBglk1w,1141
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=drLxnz1GvCEeme-FV772cGbS-YTgeUB4G5DrbkLdapw,1479
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=bKn7m7eCcoLimGgoO3nxhiu7Mm0lIRnbx0TJh5dC1I0,506
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=Eg-H6nl2Hd5Nr593SFCCLVTDl25kIXuddrWpd7xlrP8,34987
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/piezo2d40round4.vol.gz,sha256=RuxM0vtYljoAImOH6U6avt0LmWaUbGNao37n8p_Yd1w,496477
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/shaft.geo,sha256=aPbk4EItJSLN_PjpOejnijk74y53QBW-IPCXHvLNlVs,2434
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/shaft.vol,sha256=fT8qu1L-p0MkI-l3WVisKG52W5FCzO_NzXaCvMJT1V4,270450
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/square.in2d,sha256=evpVgNNzReABv6bIs4J_r1OFeedMppoS-TEzE-tfKgY,192
-ngsolve-6.2.2506.post45.dev0.data/data/share/ngsolve/square.vol,sha256=IXIHYmq85hkFsMVZ_vEVthUnd0YTQWE4jRegjW8_ImI,9162
-ngsolve-6.2.2506.post45.dev0.dist-info/LICENSE,sha256=oZDcnIBDdV2Q-LCnX6ZrnkLUr0yYC_XdxjPwEk2zzuc,26430
-ngsolve-6.2.2506.post45.dev0.dist-info/METADATA,sha256=WSRFyct6lsZumR-OIZaqRWsgxh9HEHEmTlpDCz8oW74,201
-ngsolve-6.2.2506.post45.dev0.dist-info/WHEEL,sha256=YeDGh2t9OVO8eQwJ7A2CpeTltZRPMYGUji0_oep_V1g,110
-ngsolve-6.2.2506.post45.dev0.dist-info/top_level.txt,sha256=1llU44DxNIP85uPT4RChsIuV3h2d0_5j0Ui_Df5vV8E,15
-ngsolve-6.2.2506.post45.dev0.dist-info/RECORD,,
+ngsolve-6.2.2506.post74.dev0.data/data/Netgen.icns,sha256=Ebqct4LKxLzxdJLwGg0tTUQb1VjLwkKhtmdYhpRhKjg,291475
+ngsolve-6.2.2506.post74.dev0.data/data/bin/ngscxx,sha256=TDWPvQxbPYsPFhbPU6RlApEuxCoOOzwj3J80VKMMyp8,1755
+ngsolve-6.2.2506.post74.dev0.data/data/bin/ngsld,sha256=50UErkFWLTocn8GtZDTkUWmPTIqsoK5lcfBGwyP0Vnc,557
+ngsolve-6.2.2506.post74.dev0.data/data/bin/ngsolve.tcl,sha256=SSBYLyp4zgl6eM17LXIiLoj1Doy-h2s4EZg6oKi6ucA,20995
+ngsolve-6.2.2506.post74.dev0.data/data/bin/ngspy,sha256=OvTnzkYgC9G3IK42QJpjmXkV7Q_Arig43STSfPDsDD4,103
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/beam.geo,sha256=EtxklGAIo6SxZlHHC_FZHoQGZqZUDGJQSheEMFO-bJ8,387
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/beam.vol,sha256=aotG4VA7sIgAsPQsYkzbMP1Jta_TddG2gMCblkSPkqc,13594
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/chip.in2d,sha256=g6C-mcoD8-q9JtZpuh4mf4iFEZUIGvvivp4C5YYMlAw,551
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/chip.vol,sha256=if0yLn8E3P4mZ_X5sBcrEIp2C4ZhMysGROtB1YCkJHI,27897
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/coil.geo,sha256=PVD4I9ztZowKwNOUrjnoOP7Tj2KG9J0UCJFRS9EhlxU,364
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/coil.vol,sha256=IOZe4oPxMUa9vBGJWN4LG9M79XAruY23S2rtAh_2_98,144724
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/coilshield.geo,sha256=lCUDCAhfowBttSGEY_giyY0xEFInAbgVfIPwSWBb504,605
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/coilshield.vol,sha256=2Dq5VCX7dqGxo_ExtUhI716I-SnxhLGPawW29IR9nYY,162397
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/cube.geo,sha256=kbBNVUYVSf1ogV7-Xf31KXju3LCUIPaDLfvwZHMgddI,386
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/cube.vol,sha256=54108a3RvrTUOJSFltxUY8iiNzyWoBTtNrWM0kufj7c,90295
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=bPQAvbYlyvCfLzk9cOzjXDn94UFC_vBCONl7fEIaMVs,1304
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=Mq3Ap63mWqjQyXsASFAlkRQ0AWxBlY3BYYejTYd-lwg,1101
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d1_square.pde,sha256=ysOroxhoAOePmB_Aswps9iGjA2qV5435iu3hOnSvN8M,1029
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=AowiGbuAWEdyFUB3d1LlZeQ7rarbkqIYsj1QcWc89-A,950
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=nG0HxrxboI2qGoR5_LNZt7RYB7ji2o5jtkyIqTFR4y8,568
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=-C4RgoVtBXZu7XHCwZy7F7pr_PGNGcRwWCFzBppq1mQ,1033
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=QOYC7YN7LdcjSFeLdJu1Tlfi-lmsVsa7b9G6qoCsGo8,1985
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=Iua3INfuIUeaBk21qNg4u5KZt__H1B8BZUsy5frjhdY,1901
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=-ELH2obynMJcvSOqoYT1OThXcllIcdss0ZrklLSimZw,1200
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=WUUulvd3dsedB25sFVQgU7FgZ3B7BkbxgkXTEBglk1w,1141
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=drLxnz1GvCEeme-FV772cGbS-YTgeUB4G5DrbkLdapw,1479
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=bKn7m7eCcoLimGgoO3nxhiu7Mm0lIRnbx0TJh5dC1I0,506
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=Eg-H6nl2Hd5Nr593SFCCLVTDl25kIXuddrWpd7xlrP8,34987
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/piezo2d40round4.vol.gz,sha256=RuxM0vtYljoAImOH6U6avt0LmWaUbGNao37n8p_Yd1w,496477
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/shaft.geo,sha256=aPbk4EItJSLN_PjpOejnijk74y53QBW-IPCXHvLNlVs,2434
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/shaft.vol,sha256=fT8qu1L-p0MkI-l3WVisKG52W5FCzO_NzXaCvMJT1V4,270450
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/square.in2d,sha256=evpVgNNzReABv6bIs4J_r1OFeedMppoS-TEzE-tfKgY,192
+ngsolve-6.2.2506.post74.dev0.data/data/share/ngsolve/square.vol,sha256=IXIHYmq85hkFsMVZ_vEVthUnd0YTQWE4jRegjW8_ImI,9162
+ngsolve-6.2.2506.post74.dev0.dist-info/LICENSE,sha256=oZDcnIBDdV2Q-LCnX6ZrnkLUr0yYC_XdxjPwEk2zzuc,26430
+ngsolve-6.2.2506.post74.dev0.dist-info/METADATA,sha256=AxP0amt0QMSdbnK3LiqNnnUQvtPEfMCcQbWcqFwi_ZE,202
+ngsolve-6.2.2506.post74.dev0.dist-info/WHEEL,sha256=YeDGh2t9OVO8eQwJ7A2CpeTltZRPMYGUji0_oep_V1g,110
+ngsolve-6.2.2506.post74.dev0.dist-info/top_level.txt,sha256=1llU44DxNIP85uPT4RChsIuV3h2d0_5j0Ui_Df5vV8E,15
+ngsolve-6.2.2506.post74.dev0.dist-info/RECORD,,