ngsolve 6.2.2506.post38.dev0__cp39-cp39-macosx_10_15_universal2.whl → 6.2.2506.post60.dev0__cp39-cp39-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/expr.hpp

@@ -515,7 +515,7 @@ namespace ngbla
         }
 
 
-      if (TB::IsLinear())
+      if constexpr (TB::IsLinear())
 	{
 	  if (T::IsLinear())
 	    {
@@ -1492,8 +1492,39 @@ namespace ngbla
   }
 
 
+  /* ************************* OuterProduct ********************** */
+  
+  template <class TA, class TB>
+  class OuterProductExpr : public Expr<OuterProductExpr<TA,TB>>
+  {
+    TA a;
+    TB b;
+  public:
+    OuterProductExpr (TA aa, TB ab) : a(aa), b(ab) { ; }
 
+    // INLINE auto operator() (size_t i) const { return a[i] * b(i); }  
+    INLINE auto operator() (size_t i, size_t j) const { return a[i] * b[j]; }
 
+    INLINE auto View() const { return *this; }
+    INLINE auto Shape() const
+    {
+      return tuple<size_t,size_t> (a.Size(), b.Width());
+    }
+    
+    INLINE const auto A() const { return a; }
+    INLINE const auto B() const { return b; }
+    INLINE auto Height() const { return a.Size(); }
+    INLINE auto Width() const { return b.Size(); }
+
+    static constexpr bool IsLinear() { return false; }         
+  };
+
+
+  template <typename TA, typename TB>
+  INLINE auto OuterProduct (const Expr<TA> & a, const Expr<TB> & b)
+  {
+    return OuterProductExpr (a.View(), b.View());
+  }
 
 
 

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
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, 1e-16);
+      return make_shared<SingularMLExpansion<mp_type>> (c, r, 1e-16);
     }
 
     auto CreateLocalExpansion (Vec<3> c, double r) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, 1e-16);
+      return make_shared<RegularMLExpansion<mp_type>> (c, r, 1e-16);
     }
 
-    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}, };    
+    Array<KernelTerm> terms;
 
     auto CreateMultipoleExpansion (Vec<3> c, double r) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, 1e-16);
+      return make_shared<SingularMLExpansion<mp_type>> (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));
-    }
-
-    void EvaluateMPTrans(RegularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
-    {
-      val(0) = Real(mp.EvaluateDirectionalDerivative(pnt, nv));
-    }
-  };
-
-
-  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
-    {
-      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);
     }
-    
-    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));
     }
   };
 
@@ -646,6 +634,127 @@ namespace ngsbem
   };
 
 
+
+
+
+  /*
+    Dissertation Guenther Of
+    "BETI–Gebietszerlegungsmethoden
+    mit schnellen Randelementverfahren
+    und Anwendungen"
+    page 85
+   */
+
+  template <int D> class LameSLKernel;
+
+  template<>
+  class LameSLKernel<3> : public BaseKernel
+  {
+    double E, nu;
+    double alpha;
+  public:
+    typedef double value_type;
+    
+    static string Name() { return "LameSL"; }
+    static auto Shape() { return IVec<2>(3,3); }
+    
+    LameSLKernel (const LameSLKernel&) = default;
+    LameSLKernel (LameSLKernel&&) = default;
+    LameSLKernel (double _E, double _nu) : E(_E), nu(_nu)
+    {
+      alpha = (1+nu)/((1-nu)*2*E);
+
+      terms += { 3-4*nu, 0, 0, 0 };
+      terms += { 3-4*nu, 0, 1, 1 };
+      terms += { 3-4*nu, 0, 2, 2 };
+
+      terms += { 1, 1, 0, 0 };
+      terms += { 1, 2, 0, 1 };
+      terms += { 1, 2, 1, 0 };
+
+      terms += { 1, 3, 0, 2 };
+      terms += { 1, 3, 2, 0 };
+      terms += { 1, 4, 1, 1 };
+
+      terms += { 1, 5, 1, 2 };
+      terms += { 1, 5, 2, 1 };
+      terms += { 1, 6, 2, 2 };
+    }
+
+    Array<KernelTerm> terms;
+
+    template <typename T>    
+    auto Evaluate (Vec<3,T> x, Vec<3,T> y, Vec<3,T> nx, Vec<3,T> ny) const
+    {
+      T norm = L2Norm(x-y);
+      auto lapkern = alpha / (4 * M_PI * norm);  // lapkern times factor
+
+      return Vec<7,T> { lapkern,
+                        (x(0)-y(0))*(x(0)-y(0))/sqr(norm) * lapkern,
+                        (x(0)-y(0))*(x(1)-y(1))/sqr(norm) * lapkern,
+                        (x(0)-y(0))*(x(2)-y(2))/sqr(norm) * lapkern,
+                        (x(1)-y(1))*(x(1)-y(1))/sqr(norm) * lapkern,
+                        (x(1)-y(1))*(x(2)-y(2))/sqr(norm) * lapkern,
+                        (x(2)-y(2))*(x(2)-y(2))/sqr(norm) * lapkern
+      };
+    }
+
+    
+    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    {
+      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16);
+    }
+
+    auto CreateLocalExpansion (Vec<3> c, double r) const
+    {
+      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16);
+    }
+
+    
+    void AddSource (SingularMLExpansion<Vec<6,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
+    {
+      Vec<6> charge = 0.0;
+      charge.Range(0,3) = val;
+      mp.AddCharge(pnt, charge);   // Row 1+2
+
+      Mat<3,3> jacobi = OuterProduct(pnt, val) + InnerProduct(pnt, val) * Id<3>();
+
+      for (int k = 0; k < 3; k++)
+        {
+          Vec<6> dipole_charge = 0.0; 
+          dipole_charge.Range(3,6) = jacobi.Col(k);
+          
+          auto ek = UnitVec<3>(k);          
+          mp.AddDipole(pnt, -ek, dipole_charge);          
+        }
+    }
+
+    void EvaluateMP (RegularMLExpansion<Vec<6,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
+    {
+      Vec<6> mpval = Real(mp.Evaluate (pnt));
+      val.Range(0,3) = 0;
+      val += (3-4*nu)*alpha * mpval.Range(0,3);  // Row 1
+      
+      val -= alpha/2 * mpval.Range(3,6);        // Row 3
+
+      // Row 2
+      Mat<3,3> jacobi = 0.0; 
+      for (int k = 0; k < 3; k++)    
+        {
+          auto ek = UnitVec<3>(k);
+          jacobi.Col(k) = Real(mp.EvaluateDirectionalDerivative(pnt, ek).Range(0,3));
+        }
+
+      val -= alpha/2 * ( Trans(jacobi) * pnt + Trace(jacobi) * pnt);
+    }
+  };
+
+
+
+
+
+  
+
 }
 
 

netgen/include/l2hofe.hpp

@@ -71,6 +71,7 @@ namespace ngfem
 
   public:
     using ET_trait<ET>::ElementType;
+    using BaseScalarFiniteElement::CalcShape;
     
     INLINE L2HighOrderFE () { ; }
     INLINE L2HighOrderFE (int aorder)

netgen/include/mptools.hpp

@@ -884,26 +884,30 @@ namespace ngsbem
             return sum;
           }
 
-        {
-          // static Timer t("fmm direct eval"); RegionTimer reg(t);
-          // t.AddFlops (charges.Size());
         if (simd_charges.Size())
           {
             // static Timer t("mptool singmp, evaluate, simd charges"); RegionTimer r(t);
+            // t.AddFlops (charges.Size());
             
             simd_entry_type vsum{0.0};
             if (mp.Kappa() < 1e-12)
               {
                 for (auto [x,c] : simd_charges)
                   {
+                    auto rho = L2Norm(p-x);
+                    auto kernel = 1/(4*M_PI)/rho;
+                    kernel = If(rho > 0.0, kernel, SIMD<double,FMM_SW>(0.0));
+                    vsum += kernel * c;
+
+                    /*
                     auto rho2 = L2Norm2(p-x);
                     auto kernel = (1/(4*M_PI)) * rsqrt(rho2);
                     kernel = If(rho2 > 0.0, kernel, SIMD<double,FMM_SW>(0.0));
                     vsum += kernel * c;
+                    */
                   }
               }
-            else
-            if (mp.Kappa() < 1e-8)
+            else if (mp.Kappa() < 1e-8)
               for (auto [x,c] : simd_charges)
                 {
                   auto rho = L2Norm(p-x);
@@ -920,7 +924,7 @@ namespace ngsbem
                   kernel = If(rho > 0.0, kernel, SIMD<Complex,FMM_SW>(0.0));
                   vsum += kernel * c;
                 }
-              
+            
             sum += HSum(vsum);
           }
         else
@@ -936,41 +940,40 @@ namespace ngsbem
                 if (double rho = L2Norm(p-x); rho > 0)
                   sum += (1/(4*M_PI))*exp(Complex(0,rho*mp.Kappa())) / rho * c;
           }
-        }
 
         if (simd_dipoles.Size())
-        {
-          // static Timer t("mptool singmp, evaluate, simd dipoles"); RegionTimer r(t);
-          
-          simd_entry_type vsum{0.0};
-          for (auto [x,d,c] : simd_dipoles)
           {
-            auto rho = L2Norm(p-x);
-            auto drhodp = (1.0/rho) * (p-x);
-            auto [si,co] = sincos(rho*mp.Kappa());
-            auto dGdrho = (1/(4*M_PI))*SIMD<Complex,FMM_SW>(co,si) * 
-                          (-1.0/(rho*rho) + SIMD<Complex,FMM_SW>(0, mp.Kappa())/rho);
-            auto kernel = dGdrho * InnerProduct(drhodp, d);
-            kernel = If(rho > 0.0, kernel, SIMD<Complex,FMM_SW>(0.0));
-            vsum += kernel * c;
+            // static Timer t("mptool singmp, evaluate, simd dipoles"); RegionTimer r(t);
+            
+            simd_entry_type vsum{0.0};
+            for (auto [x,d,c] : simd_dipoles)
+              {
+                auto rho = L2Norm(p-x);
+                auto drhodp = (1.0/rho) * (p-x);
+                auto [si,co] = sincos(rho*mp.Kappa());
+                auto dGdrho = (1/(4*M_PI))*SIMD<Complex,FMM_SW>(co,si) * 
+                  (-1.0/(rho*rho) + SIMD<Complex,FMM_SW>(0, mp.Kappa())/rho);
+                auto kernel = dGdrho * InnerProduct(drhodp, d);
+                kernel = If(rho > 0.0, kernel, SIMD<Complex,FMM_SW>(0.0));
+                vsum += kernel * c;
+              }
+            sum += HSum(vsum);
           }
-          sum += HSum(vsum);
-        }
         else
-        {
-          for (auto [x,d,c] : dipoles)
-          if (double rho = L2Norm(p-x); rho > 0)
           {
-              Vec<3> drhodp = 1.0/rho * (p-x);
-              Complex dGdrho = (1/(4*M_PI))*exp(Complex(0,rho*mp.Kappa())) *
-              (Complex(0, mp.Kappa())/rho - 1.0/sqr(rho));
-              sum += dGdrho * InnerProduct(drhodp, d) * c;
+            for (auto [x,d,c] : dipoles)
+              if (double rho = L2Norm(p-x); rho > 0)
+                {
+                  Vec<3> drhodp = 1.0/rho * (p-x);
+                  Complex dGdrho = (1/(4*M_PI))*exp(Complex(0,rho*mp.Kappa())) *
+                    (Complex(0, mp.Kappa())/rho - 1.0/sqr(rho));
+                  sum += dGdrho * InnerProduct(drhodp, d) * c;
+                }
           }
-        }
-
-
-        
-        if (simd_chargedipoles.Size())
+      
+      
+      
+      if (simd_chargedipoles.Size())
         {
           // static Timer t("mptool singmp, evaluate, simd chargedipoles"); RegionTimer r(t);
           // t.AddFlops (simd_chargedipoles.Size()*FMM_SW);
@@ -982,10 +985,10 @@ namespace ngsbem
               auto rhokappa = rho*mp.Kappa();
               auto invrho = If(rho>0.0, 1.0/rho, SIMD<double,FMM_SW>(0.0));
               auto [si,co] = sincos(rhokappa);
-
+              
               auto kernelc = (1/(4*M_PI))*invrho*SIMD<Complex,FMM_SW>(co,si);
               vsum += kernelc * c;   
-
+              
               auto kernel = 
                 invrho*invrho * InnerProduct(p-x, d) * 
                 kernelc * SIMD<Complex,FMM_SW>(-1.0, rhokappa);
@@ -994,7 +997,7 @@ namespace ngsbem
             }
           sum += HSum(vsum);
         }
-        else
+      else
         {
           // static Timer t("mptool singmp, evaluate, chargedipoles"); RegionTimer r(t);
           // t.AddFlops (chargedipoles.Size());
@@ -1003,7 +1006,7 @@ namespace ngsbem
             if (double rho = L2Norm(p-x); rho > 0)
               {
                 sum += (1/(4*M_PI))*exp(Complex(0,rho*mp.Kappa())) / rho * c;
-                  
+                
                 Vec<3> drhodp = 1.0/rho * (p-x);
                 Complex dGdrho = (1/(4*M_PI))*exp(Complex(0,rho*mp.Kappa())) *
                   (Complex(0, mp.Kappa())/rho - 1.0/sqr(rho));
@@ -1052,7 +1055,14 @@ namespace ngsbem
         }
 
         if (dipoles.Size())
-            throw Exception("EvaluateDeriv not implemented for dipoles in SingularMLExpansion");
+          {
+            static int cnt = 0;
+            cnt++;
+            if (cnt < 3)
+              cout << "we know what we do - evaluateDeriv not implemented for dipoles in SingularMLExpansion" << endl;
+            // return sum;
+            // throw Exception("EvaluateDeriv not implemented for dipoles in SingularMLExpansion");
+          }
         if (chargedipoles.Size())
             throw Exception("EvaluateDeriv not implemented for dipoles in SingularMLExpansion");
 

netgen/include/thdivfe_impl.hpp

@@ -264,7 +264,7 @@ namespace ngfem
                    T_CalcShape (GetTIPGrad<DIM>(mir[i].IP()),
                                 SBLambda ([divshapesi,invJ] (size_t j, THDiv2DivShape<DIM,SIMD<double>> val)
                                           {
-                                            divshapesi(j) = invJ*val; 
+                                            divshapesi(j) = invJ*val.Get(); 
                                           }));
                }
            }

netgen/include/vector.hpp

@@ -978,8 +978,13 @@ namespace ngbla
   }
 
 
-
-
+  template <int S, typename T = double>
+  auto UnitVec(size_t i)
+  {
+    Vec<S,T> ei = T(0.0);
+    ei(i) = T(1.0);
+    return ei;
+  }
 
   template <class TV, class TSCAL> class Scalar2ElemVector
   {

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2506-38-gc3cacfb0d")
+set(PACKAGE_VERSION "6.2.2506-60-g1d0a21976")
 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-38-gc3cacfb0d"
-NGSOLVE_VERSION_GIT = "v6.2.2506-38-gc3cacfb0d"
-NGSOLVE_VERSION_PYTHON = "6.2.2506.post38.dev0"
+NGSOLVE_VERSION = "6.2.2506-60-g1d0a21976"
+NGSOLVE_VERSION_GIT = "v6.2.2506-60-g1d0a21976"
+NGSOLVE_VERSION_PYTHON = "6.2.2506.post60.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "38"
+NGSOLVE_VERSION_TWEAK = "60"
 NGSOLVE_VERSION_PATCH = "2506"
-NGSOLVE_VERSION_HASH = "gc3cacfb0d"
+NGSOLVE_VERSION_HASH = "g1d0a21976"
 
 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.post38.dev0.dist-info → ngsolve-6.2.2506.post60.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ngsolve
-Version: 6.2.2506.post38.dev0
+Version: 6.2.2506.post60.dev0
 Summary: NGSolve
 Home-page: UNKNOWN
 Author: The NGSolve team

{ngsolve-6.2.2506.post38.dev0.dist-info → ngsolve-6.2.2506.post60.dev0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-netgen/libngbla.dylib,sha256=ZOlzqse7U8QcNan8r9GtP-IW6VJwYRlRhcgIvzl-nNM,5843696
-netgen/libngcomp.dylib,sha256=74YTw75xzhamLyyLU-19KFz0VQXzv2a80tD4k1MeZqI,43080880
-netgen/libngfem.dylib,sha256=dEs9afYyCk3qq1hBFIB2szk7A1YUl4z_otznJKLHeMI,51660448
-netgen/libngla.dylib,sha256=thBr2gtGR-N9UqS8cb0PUHcQqXBhKQHdpSNDhB6kz1U,25551600
-netgen/libngsbem.dylib,sha256=zI7OepC4X3UpfSlUZgdFc5rGdY4VLJnDpKDUs5YAb_E,8739232
+netgen/libngbla.dylib,sha256=MfPGgv61vQoJjDJXpVYeSX7d2lnsoAQL8bCxg7FC2go,5843696
+netgen/libngcomp.dylib,sha256=sAO-m96qOPGo2B4ocuuVPcDH9zep0sTjt0QYPu2WUiQ,43079552
+netgen/libngfem.dylib,sha256=rR6H3Wod65nDXEctiH51fjj4tVbMJ7gO7Kk1fYJD6o4,51661008
+netgen/libngla.dylib,sha256=VYPpdrx-expBklKDYgwLIKT2RezMcw3ze2F_9lCZJuM,25551600
+netgen/libngsbem.dylib,sha256=6L2V5Zs5lY8Kb4t0WfNISN1jKIRVrKiLy-kUUOMrSwA,9441232
 netgen/libngsolve.dylib,sha256=CofNl7Q0kJY44t5enNNoczxpNct_Zh7yWZAIFDrFOe8,944192
-netgen/libngstd.dylib,sha256=ZbMuvLBDA-Sh4NWK5RY5W1XkYW1GcVxz9pTqIQwD9Ac,923728
+netgen/libngstd.dylib,sha256=gjGJ-FYmTmJTvDHlq25S4lgF8q57dpGlqM8uNxkqB0A,923728
 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
@@ -48,7 +49,7 @@ netgen/include/elementbyelement.hpp,sha256=k3RSmDYkU4BTm7rb9mYcJyel5eEmTB-5URmir
 netgen/include/elementtopology.hpp,sha256=OKzjGfwrN7zhvkbbHJrdBpwpDkVlhBxwQFeFwPQNFYg,44494
 netgen/include/elementtransformation.hpp,sha256=PDLQsfkVyDkA7L4hLBOBTSimd3a-E-069krvZrXxJgM,10408
 netgen/include/evalfunc.hpp,sha256=J0v1ACrYTkQDAxsklPUJYhv-fPjHIUDqvzlZoCucAqg,10019
-netgen/include/expr.hpp,sha256=z4p2M3u6TfB32Lqj05HJ5Q2EGEt-xW1IikhCQfPuzuY,45129
+netgen/include/expr.hpp,sha256=kuCXH9Za4BRnWhxB8ZFMZchuFvfVPxpLxZbaf4gG2k4,46132
 netgen/include/facetfe.hpp,sha256=h1vCg8GhJAvxvVgt15MuhA8MXOwvVahZaWB5__PhCDs,4920
 netgen/include/facetfespace.hpp,sha256=1vXyL3r6FkZTLSwYw-zWdJTddyF4m27Taqdt26E0c6U,4739
 netgen/include/facethofe.hpp,sha256=-ks3RV2WUrPgQ0ElYIM7h7t0Mwvu6MIGiW1bCIeHtSc,3701
@@ -103,8 +104,8 @@ 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=tqjNDYZqsjlJm3XbXXqK5Fmq40_ECGPNg6yPJmrcOHc,20479
-netgen/include/l2hofe.hpp,sha256=Qjg5jtkhx8cE1gUdoKslhKTqlUg9qbAbL8g4NTMCW2s,6650
+netgen/include/kernels.hpp,sha256=pKuBM9bjaEdhpnTVJKF68-4-XP9s8xMKmBE8cnFR_Dc,23574
+netgen/include/l2hofe.hpp,sha256=kbCezYmmgGqfIN0WZRNDKBEoWQTTcgpg7TEuDERolSY,6696
 netgen/include/l2hofe_impl.hpp,sha256=-rWVybAL7QTkfNNXAz1tP4RYQcBuOVYLTZE3E502tuA,15848
 netgen/include/l2hofefo.hpp,sha256=sQhmfliTW2Ac_XLucufzbRdtSRr471i3qPFAMSByvU0,16592
 netgen/include/l2hofespace.hpp,sha256=-Xu_I1KUYVZGuw6XFi7kvwe0x4uGncB2fTctswygZuU,12057
@@ -115,7 +116,7 @@ netgen/include/memusage.hpp,sha256=H-8rWQ8UQDCnOiYQnbwvILPuPoJD8bqwiNGB2QAUa0o,1
 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=PIBiO1_z-DKPskD9LVSK_UptikVzIj057lPEyPOZ92g,70190
+netgen/include/mptools.hpp,sha256=elGoYLWZooEjH8NJmFOzFQJD_tuqgjDaCWZk7aZWzmo,70712
 netgen/include/multigrid.hpp,sha256=ovl1GXcTfXuYLVVMcFfCKP5sg6diSGlqdjCMMPCgFUo,856
 netgen/include/multivector.hpp,sha256=nuLxMiq2y6HoH5w9j6ka2BhJjRyREPeEnNFx_x0SMU0,12635
 netgen/include/mumpsinverse.hpp,sha256=Jaa5NPQzwPo2kSbHijI_LX3tr0qUmVhqVlRM14KeD18,4062
@@ -181,7 +182,7 @@ netgen/include/tensorproductintegrator.hpp,sha256=ZtcEnhvibtXK20dmfntzk0xKFdwazP
 netgen/include/thcurlfe.hpp,sha256=37ry6XxTNT72uzM8IAcUiVtNrpi2dscnHTp0Bo6injI,4971
 netgen/include/thcurlfe_impl.hpp,sha256=ddHcRzB2zDUU7k9IFTC8tUfTK7eQFtL49ViYiM9v2dM,15212
 netgen/include/thdivfe.hpp,sha256=MCC9aF1qGedORrPuERnZAw-j4U7bEzZhHmi2TtvyuPE,2913
-netgen/include/thdivfe_impl.hpp,sha256=CQqky11Y41M_Mw8eGOFoiSzmMGRAIkR54oaLDhPRAas,17503
+netgen/include/thdivfe_impl.hpp,sha256=SIsUIlKLxjFcMta3uAa3cUVRiOFUIzF3Gqx559dXK6I,17509
 netgen/include/tpdiffop.hpp,sha256=hsu3qokOrj7BPhFVPDK4OGcWTqGKzOwrQNQRHd3xgf8,18355
 netgen/include/tpfes.hpp,sha256=3M-UHBpV_rzOSsFjnWf1Z35JegQUYE4Ck_fvW6BLkKQ,4537
 netgen/include/tpintrule.hpp,sha256=paPl3fGLFe7ynxsplntJF0FvU3XFql4KnNFRJV2KuYA,8733
@@ -189,7 +190,7 @@ netgen/include/triangular.hpp,sha256=gU5xq35XlBTGJkNnSG9X_GTe4BUpVIYVl0n2XMSS_iM
 netgen/include/tscalarfe.hpp,sha256=D8A1jFfPz5GAljkxckSEPc68W2OwY5ylDHum5jTe2cw,10706
 netgen/include/tscalarfe_impl.hpp,sha256=mmD48AmFcxGahXiwK7lNHk7SRuOI4y_ukqksEWOb0fY,38706
 netgen/include/umfpackinverse.hpp,sha256=JJZFhK6Y0laJcrVhdOBuSKn7jsp3Gl1J4G4V6mC0Oeg,4287
-netgen/include/vector.hpp,sha256=uigo3pNZgjlhcPJcKrl54WZqh8xMQiVHdxlvXkEEp3Y,33218
+netgen/include/vector.hpp,sha256=d9pA2yAsmMAip4r3F-JJ5mxyMWAflpGy5zp49ZQCuAg,33350
 netgen/include/voxelcoefficientfunction.hpp,sha256=NVHmt3Geq2mDNMYo_4CmjAwv56N4lzDmS0_AHawKWZo,1498
 netgen/include/vtkoutput.hpp,sha256=PlNdvQcY4fdzSuIHBuvsfjJB8IG1-xuCb3HlTp7QBsw,6430
 netgen/include/vvector.hpp,sha256=x98Zea83T3TARxNOX-F-ZMxaR5SEjiwA35-ZWE0yCdU,4577
@@ -210,18 +211,18 @@ ngsolve/ngscxx.py,sha256=q3t5DgE3sJazWueas8FTXJ9jZM-LVa9KbGj_RTam6V4,1293
 ngsolve/ngslib.so,sha256=KCpWZJlPkoeS2OhoDSFPwkNjAhQ2cM84B5Z5Sx4WygM,336856
 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=wV4NlmWrCQKa7-1qpkXgUN8kSp2iLLg0l3nqJ2IizvM,5054
+ngsolve/cmake/NGSolveConfig.cmake,sha256=VKaccLs5NduMh98lOgU5r51CeFr2B7iUtR3AHk7tIX0,5054
 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=9OJGZqfIHOWhK83AGIG839PWAFq0PL1g1FeMYwxSrz8,2465
+ngsolve/config/config.py,sha256=szLv8v-ruuVtgoJAEHzBKorz6dn8amOtMpXSrDsd7oQ,2465
 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.post38.dev0.data/data/Netgen.icns,sha256=Ebqct4LKxLzxdJLwGg0tTUQb1VjLwkKhtmdYhpRhKjg,291475
-ngsolve-6.2.2506.post38.dev0.data/data/bin/ngscxx,sha256=ELkWfd_zU4SS4gatogC7PjTVMj4mk-PuJ3Pq2zCUJa8,1751
-ngsolve-6.2.2506.post38.dev0.data/data/bin/ngsld,sha256=50UErkFWLTocn8GtZDTkUWmPTIqsoK5lcfBGwyP0Vnc,557
-ngsolve-6.2.2506.post38.dev0.data/data/bin/ngsolve.tcl,sha256=SSBYLyp4zgl6eM17LXIiLoj1Doy-h2s4EZg6oKi6ucA,20995
-ngsolve-6.2.2506.post38.dev0.data/data/bin/ngspy,sha256=KEtzflkZPs86Jnf7knSPWZqLlX70W7P1iyoyxbzMsec,104
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/beam.geo,sha256=EtxklGAIo6SxZlHHC_FZHoQGZqZUDGJQSheEMFO-bJ8,387
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/beam.vol,sha256=aotG4VA7sIgAsPQsYkzbMP1Jta_TddG2gMCblkSPkqc,13594
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/chip.in2d,sha256=g6C-mcoD8-q9JtZpuh4mf4iFEZUIGvvivp4C5YYMlAw,551
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/chip.vol,sha256=if0yLn8E3P4mZ_X5sBcrEIp2C4ZhMysGROtB1YCkJHI,27897
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/coil.geo,sha256=PVD4I9ztZowKwNOUrjnoOP7Tj2KG9J0UCJFRS9EhlxU,364
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/coil.vol,sha256=IOZe4oPxMUa9vBGJWN4LG9M79XAruY23S2rtAh_2_98,144724
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/coilshield.geo,sha256=lCUDCAhfowBttSGEY_giyY0xEFInAbgVfIPwSWBb504,605
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/coilshield.vol,sha256=2Dq5VCX7dqGxo_ExtUhI716I-SnxhLGPawW29IR9nYY,162397
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/cube.geo,sha256=kbBNVUYVSf1ogV7-Xf31KXju3LCUIPaDLfvwZHMgddI,386
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/cube.vol,sha256=54108a3RvrTUOJSFltxUY8iiNzyWoBTtNrWM0kufj7c,90295
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=bPQAvbYlyvCfLzk9cOzjXDn94UFC_vBCONl7fEIaMVs,1304
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=Mq3Ap63mWqjQyXsASFAlkRQ0AWxBlY3BYYejTYd-lwg,1101
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d1_square.pde,sha256=ysOroxhoAOePmB_Aswps9iGjA2qV5435iu3hOnSvN8M,1029
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=AowiGbuAWEdyFUB3d1LlZeQ7rarbkqIYsj1QcWc89-A,950
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=nG0HxrxboI2qGoR5_LNZt7RYB7ji2o5jtkyIqTFR4y8,568
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=-C4RgoVtBXZu7XHCwZy7F7pr_PGNGcRwWCFzBppq1mQ,1033
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=QOYC7YN7LdcjSFeLdJu1Tlfi-lmsVsa7b9G6qoCsGo8,1985
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=Iua3INfuIUeaBk21qNg4u5KZt__H1B8BZUsy5frjhdY,1901
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=-ELH2obynMJcvSOqoYT1OThXcllIcdss0ZrklLSimZw,1200
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=WUUulvd3dsedB25sFVQgU7FgZ3B7BkbxgkXTEBglk1w,1141
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=drLxnz1GvCEeme-FV772cGbS-YTgeUB4G5DrbkLdapw,1479
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=bKn7m7eCcoLimGgoO3nxhiu7Mm0lIRnbx0TJh5dC1I0,506
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=Eg-H6nl2Hd5Nr593SFCCLVTDl25kIXuddrWpd7xlrP8,34987
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/piezo2d40round4.vol.gz,sha256=RuxM0vtYljoAImOH6U6avt0LmWaUbGNao37n8p_Yd1w,496477
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/shaft.geo,sha256=aPbk4EItJSLN_PjpOejnijk74y53QBW-IPCXHvLNlVs,2434
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/shaft.vol,sha256=fT8qu1L-p0MkI-l3WVisKG52W5FCzO_NzXaCvMJT1V4,270450
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/square.in2d,sha256=evpVgNNzReABv6bIs4J_r1OFeedMppoS-TEzE-tfKgY,192
-ngsolve-6.2.2506.post38.dev0.data/data/share/ngsolve/square.vol,sha256=IXIHYmq85hkFsMVZ_vEVthUnd0YTQWE4jRegjW8_ImI,9162
-ngsolve-6.2.2506.post38.dev0.dist-info/LICENSE,sha256=oZDcnIBDdV2Q-LCnX6ZrnkLUr0yYC_XdxjPwEk2zzuc,26430
-ngsolve-6.2.2506.post38.dev0.dist-info/METADATA,sha256=y_1WdI_ec6rNwqmlK31-5Bheu-U5iKjzPZfmeQPowLg,247
-ngsolve-6.2.2506.post38.dev0.dist-info/WHEEL,sha256=GUjFiIxJsa64p6UL_1XdSua8mJHV9PIo6rgmnfjsOyw,108
-ngsolve-6.2.2506.post38.dev0.dist-info/top_level.txt,sha256=1llU44DxNIP85uPT4RChsIuV3h2d0_5j0Ui_Df5vV8E,15
-ngsolve-6.2.2506.post38.dev0.dist-info/RECORD,,
+ngsolve-6.2.2506.post60.dev0.data/data/Netgen.icns,sha256=Ebqct4LKxLzxdJLwGg0tTUQb1VjLwkKhtmdYhpRhKjg,291475
+ngsolve-6.2.2506.post60.dev0.data/data/bin/ngscxx,sha256=ELkWfd_zU4SS4gatogC7PjTVMj4mk-PuJ3Pq2zCUJa8,1751
+ngsolve-6.2.2506.post60.dev0.data/data/bin/ngsld,sha256=50UErkFWLTocn8GtZDTkUWmPTIqsoK5lcfBGwyP0Vnc,557
+ngsolve-6.2.2506.post60.dev0.data/data/bin/ngsolve.tcl,sha256=SSBYLyp4zgl6eM17LXIiLoj1Doy-h2s4EZg6oKi6ucA,20995
+ngsolve-6.2.2506.post60.dev0.data/data/bin/ngspy,sha256=KEtzflkZPs86Jnf7knSPWZqLlX70W7P1iyoyxbzMsec,104
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/beam.geo,sha256=EtxklGAIo6SxZlHHC_FZHoQGZqZUDGJQSheEMFO-bJ8,387
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/beam.vol,sha256=aotG4VA7sIgAsPQsYkzbMP1Jta_TddG2gMCblkSPkqc,13594
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/chip.in2d,sha256=g6C-mcoD8-q9JtZpuh4mf4iFEZUIGvvivp4C5YYMlAw,551
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/chip.vol,sha256=if0yLn8E3P4mZ_X5sBcrEIp2C4ZhMysGROtB1YCkJHI,27897
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coil.geo,sha256=PVD4I9ztZowKwNOUrjnoOP7Tj2KG9J0UCJFRS9EhlxU,364
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coil.vol,sha256=IOZe4oPxMUa9vBGJWN4LG9M79XAruY23S2rtAh_2_98,144724
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coilshield.geo,sha256=lCUDCAhfowBttSGEY_giyY0xEFInAbgVfIPwSWBb504,605
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coilshield.vol,sha256=2Dq5VCX7dqGxo_ExtUhI716I-SnxhLGPawW29IR9nYY,162397
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/cube.geo,sha256=kbBNVUYVSf1ogV7-Xf31KXju3LCUIPaDLfvwZHMgddI,386
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/cube.vol,sha256=54108a3RvrTUOJSFltxUY8iiNzyWoBTtNrWM0kufj7c,90295
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=bPQAvbYlyvCfLzk9cOzjXDn94UFC_vBCONl7fEIaMVs,1304
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=Mq3Ap63mWqjQyXsASFAlkRQ0AWxBlY3BYYejTYd-lwg,1101
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d1_square.pde,sha256=ysOroxhoAOePmB_Aswps9iGjA2qV5435iu3hOnSvN8M,1029
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=AowiGbuAWEdyFUB3d1LlZeQ7rarbkqIYsj1QcWc89-A,950
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=nG0HxrxboI2qGoR5_LNZt7RYB7ji2o5jtkyIqTFR4y8,568
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=-C4RgoVtBXZu7XHCwZy7F7pr_PGNGcRwWCFzBppq1mQ,1033
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=QOYC7YN7LdcjSFeLdJu1Tlfi-lmsVsa7b9G6qoCsGo8,1985
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=Iua3INfuIUeaBk21qNg4u5KZt__H1B8BZUsy5frjhdY,1901
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=-ELH2obynMJcvSOqoYT1OThXcllIcdss0ZrklLSimZw,1200
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=WUUulvd3dsedB25sFVQgU7FgZ3B7BkbxgkXTEBglk1w,1141
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=drLxnz1GvCEeme-FV772cGbS-YTgeUB4G5DrbkLdapw,1479
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=bKn7m7eCcoLimGgoO3nxhiu7Mm0lIRnbx0TJh5dC1I0,506
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=Eg-H6nl2Hd5Nr593SFCCLVTDl25kIXuddrWpd7xlrP8,34987
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/piezo2d40round4.vol.gz,sha256=RuxM0vtYljoAImOH6U6avt0LmWaUbGNao37n8p_Yd1w,496477
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/shaft.geo,sha256=aPbk4EItJSLN_PjpOejnijk74y53QBW-IPCXHvLNlVs,2434
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/shaft.vol,sha256=fT8qu1L-p0MkI-l3WVisKG52W5FCzO_NzXaCvMJT1V4,270450
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/square.in2d,sha256=evpVgNNzReABv6bIs4J_r1OFeedMppoS-TEzE-tfKgY,192
+ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/square.vol,sha256=IXIHYmq85hkFsMVZ_vEVthUnd0YTQWE4jRegjW8_ImI,9162
+ngsolve-6.2.2506.post60.dev0.dist-info/LICENSE,sha256=oZDcnIBDdV2Q-LCnX6ZrnkLUr0yYC_XdxjPwEk2zzuc,26430
+ngsolve-6.2.2506.post60.dev0.dist-info/METADATA,sha256=kjQyQ1qoK9J7_WKPFpeIOLlA794QdiBD3GuI5iJjKcA,247
+ngsolve-6.2.2506.post60.dev0.dist-info/WHEEL,sha256=GUjFiIxJsa64p6UL_1XdSua8mJHV9PIo6rgmnfjsOyw,108
+ngsolve-6.2.2506.post60.dev0.dist-info/top_level.txt,sha256=1llU44DxNIP85uPT4RChsIuV3h2d0_5j0Ui_Df5vV8E,15
+ngsolve-6.2.2506.post60.dev0.dist-info/RECORD,,