ngsolve 6.2.2506.post38.dev0__cp313-cp313-manylinux_2_28_x86_64.whl → 6.2.2506.post45.dev0__cp313-cp313-manylinux_2_28_x86_64.whl

{ngsolve-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/include/netgen/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());
+  }
 
 
 

{ngsolve-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/include/netgen/kernels.hpp

@@ -646,6 +646,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);
+    }
+  };
+
+
+
+
+
+  
+
 }
 
 

{ngsolve-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/include/netgen/l2hofe.hpp

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

{ngsolve-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/include/netgen/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");
 

{ngsolve-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/include/netgen/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(); 
                                           }));
                }
            }

{ngsolve-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/include/netgen/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-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/lib/cmake/ngsolve/NGSolveConfig.cmake

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

{ngsolve-6.2.2506.post38.dev0.data → ngsolve-6.2.2506.post45.dev0.data}/data/lib/python3.13/site-packages/ngsolve/config/config.py

@@ -29,15 +29,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE  = "include/netgen"
 NGSOLVE_INSTALL_DIR_CMAKE    = "lib/cmake/ngsolve"
 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-45-g573446995"
+NGSOLVE_VERSION_GIT = "v6.2.2506-45-g573446995"
+NGSOLVE_VERSION_PYTHON = "6.2.2506.post45.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "38"
+NGSOLVE_VERSION_TWEAK = "45"
 NGSOLVE_VERSION_PATCH = "2506"
-NGSOLVE_VERSION_HASH = "gc3cacfb0d"
+NGSOLVE_VERSION_HASH = "g573446995"
 
 CMAKE_CXX_COMPILER           = "/opt/rh/gcc-toolset-14/root/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngsolve
-Version: 6.2.2506.post38.dev0
+Version: 6.2.2506.post45.dev0
 Summary: NGSolve
 Author: The NGSolve team
 License: LGPL2.1