ngsolve 6.2.2505.post105.dev0__cp311-cp311-manylinux_2_28_x86_64.whl → 6.2.2506__cp311-cp311-manylinux_2_28_x86_64.whl

ngsolve-6.2.2506.data/data/include/netgen/analytic_integrals.hpp

@@ -0,0 +1,10 @@
+#include <bla.hpp>
+
+namespace ngsbem
+{
+  using namespace ngbla;
+
+  NGS_DLL_HEADER double LaplaceSL_Triangle (Vec<3> a, Vec<3> b, Vec<3> c, Vec<3> x);
+  NGS_DLL_HEADER double LaplaceDL_Triangle (Vec<3> a, Vec<3> b, Vec<3> c, Vec<3> x);
+}
+

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/include/netgen/bdbequations.hpp

@@ -229,6 +229,26 @@ namespace ngfem
       Cast(fel).CalcMappedDShape (mip, Trans(mat));
     }
 
+
+    static int DimRef() { return D-1; } 
+    
+    template <typename IP, typename MAT>
+    static void GenerateMatrixRef (const FiniteElement & fel, const IP & ip,
+                                   MAT && mat, LocalHeap & lh)
+    {
+      Cast(fel).CalcDShape (ip, Trans(mat));
+    }
+
+    template <typename MIP, typename MAT>
+    static void CalcTransformationMatrix (const MIP & mip,
+                                          MAT & mat, LocalHeap & lh)
+    {
+      mat = Trans(static_cast<const MappedIntegrationPoint<D-1,D>&>(mip).GetJacobianInverse());
+    }
+
+
+    
+
     static void GenerateMatrixSIMDIR (const FiniteElement & fel,
                                       const SIMD_BaseMappedIntegrationRule & mir,
                                       BareSliceMatrix<SIMD<double>> mat)

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/include/netgen/hcurl_equations.hpp

@@ -643,6 +643,17 @@ namespace ngfem
     enum { DIM_DMAT = 1 };
     enum { DIFFORDER = 1 };
 
+    static string Name() { return "curl"; }
+
+    static const FEL & Cast(const FiniteElement & fel)
+    {
+        return static_cast<const FEL&> (fel);
+    }
+
+    
+    static int DimRef() { return 1; }
+
+    
     static constexpr bool SUPPORT_PML = true;
     template <typename AFEL, typename MIP, typename MAT>
     static void GenerateMatrix (const AFEL & fel, const MIP & mip,
@@ -651,6 +662,22 @@ namespace ngfem
       mat = 1.0/mip.GetJacobiDet() * 
 	Trans (static_cast<const FEL&>(fel).GetCurlShape(mip.IP(),lh));
     }
+    
+    template<typename IP, typename MAT>
+    static void GenerateMatrixRef (const FiniteElement & fel, const IP & ip,
+                                   MAT && mat, LocalHeap & lh)
+    {
+      Cast(fel).CalcCurlShape (ip, Trans(mat));
+    }
+
+    template <typename MIP, typename MAT>
+    static void CalcTransformationMatrix (const MIP & mip,
+                                          MAT & mat, LocalHeap & lh)
+    {
+      // auto & mip = static_cast<const MappedIntegrationPoint<D-1,D>&>(bmip);
+      mat = 1./mip.GetJacobiDet();
+    }
+    
 
     static void GenerateMatrixSIMDIR (const FiniteElement & fel,
                                       const SIMD_BaseMappedIntegrationRule & mir,
@@ -701,6 +728,8 @@ public:
   enum { DIM_DMAT = 3 };
   enum { DIFFORDER = 1 };
 
+  static string Name() { return "curl"; }
+  
     static constexpr bool SUPPORT_PML = true;
   static const FEL & Cast (const FiniteElement & fel) 
   { return static_cast<const FEL&> (fel); }

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/include/netgen/hdivfe_utils.hpp

@@ -563,6 +563,7 @@ namespace ngfem
   {
   public:
     INLINE operator SCAL () const { return SCAL(0.0); }
+    INLINE SCAL Get() const { return SCAL(0.0); }    
   };
 
   template <typename SCAL> class THDiv2DivShape<2,SCAL>

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/include/netgen/mptools.hpp

@@ -488,7 +488,8 @@ namespace ngsbem
 
   static constexpr int MPOrder (double rho_kappa)
   {
-    return max (20, int(2*rho_kappa));
+    // return max (20, int(2*rho_kappa));
+    return 20+int(2*rho_kappa);
   }
   static constexpr int maxdirect = 100;
 
@@ -823,7 +824,20 @@ namespace ngsbem
           // t.AddFlops (charges.Size());
         if (simd_charges.Size())
           {
+            // static Timer t("regmp, evaluate, simd charges"); RegionTimer r(t);
+            
             simd_entry_type vsum{0.0};
+            if (mp.Kappa() < 1e-12)
+              {
+                for (auto [x,c] : simd_charges)
+                  {
+                    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)
               for (auto [x,c] : simd_charges)
                 {
@@ -1546,7 +1560,7 @@ namespace ngsbem
       void LocalizeExpansion(bool allow_refine)
       {
         if (allow_refine)
-          if (mp.Order() > 20 && !childs[0])
+          if (mp.Order() > 30 && !childs[0])
             CreateChilds();
 
         if (childs[0])
@@ -1585,6 +1599,7 @@ namespace ngsbem
         else
           sum = mp.Eval(p-center);
 
+        // static Timer t("regmp, evaluate, singnode"); RegionTimer r(t);
         for (auto sn : singnodes)
           sum += sn->EvaluateMP(p);
 
@@ -1760,7 +1775,7 @@ namespace ngsbem
       root.AddTarget (t);
     }
 
-    void CalcMP(shared_ptr<SingularMLMultiPole<elem_type>> asingmp)
+    void CalcMP(shared_ptr<SingularMLMultiPole<elem_type>> asingmp, bool onlytargets = true)
     {
       static Timer t("mptool regular MLMP"); RegionTimer rg(t);
       static Timer trec("mptool regular MLMP - recording");
@@ -1769,15 +1784,17 @@ namespace ngsbem
       singmp = asingmp;
 
       root.CalcTotalTargets();
-      root.RemoveEmptyTrees();
+      if (onlytargets)
+        root.RemoveEmptyTrees();
 
       
-      // root.AddSingularNode(singmp->root, false, nullptr);
+      // root.AddSingularNode(singmp->root, !onlytargets, nullptr);
+
       // /*
       Array<RecordingRS> recording;
       {
         RegionTimer rrec(trec);
-        root.AddSingularNode(singmp->root, false, &recording);
+        root.AddSingularNode(singmp->root, !onlytargets, &recording);
       }
       
       // cout << "recorded: " << recording.Size() << endl;
@@ -1836,7 +1853,7 @@ namespace ngsbem
       */
 
       static Timer tloc("mptool regular localize expansion"); RegionTimer rloc(tloc);
-      root.LocalizeExpansion(false);
+      root.LocalizeExpansion(!onlytargets);
     }
 
     void Print (ostream & ost) const
@@ -1857,7 +1874,9 @@ namespace ngsbem
     elem_type Evaluate (Vec<3> p) const
     {
       // static Timer t("mptool Eval MLMP regular"); RegionTimer r(t);
-      if (L2Norm(p-root.center) > root.r) return elem_type{0.0};
+      // if (L2Norm(p-root.center) > root.r) return elem_type{0.0};
+      if (MaxNorm(p-root.center) > root.r)
+        return singmp->Evaluate(p);
       return root.Evaluate(p);
     }
 

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/include/netgen/thdivfe_impl.hpp

@@ -235,6 +235,7 @@ namespace ngfem
   CalcMappedDivShape (const SIMD_BaseMappedIntegrationRule & bmir, 
                       BareSliceMatrix<SIMD<double>> divshapes) const
   {
+    /*
     auto & mir = static_cast<const SIMD_MappedIntegrationRule<DIM,DIM>&> (bmir);
     for (size_t i = 0; i < mir.Size(); i++)
       {
@@ -246,6 +247,29 @@ namespace ngfem
                                    divshapesi(j) = val;
                                  }));
       }
+    */
+    Iterate<4-DIM>
+      ([this,&bmir,divshapes](auto CODIM)
+      {
+        constexpr int DIMSPACE = DIM+CODIM.value;
+        if (bmir.DimSpace() == DIMSPACE)
+          {
+            // cout << "use new div, dim " << DIMSPACE << endl;
+             auto & mir = static_cast<const SIMD_MappedIntegrationRule<DIM,DIMSPACE>&> (bmir);
+             for (size_t i = 0; i < mir.Size(); i++)
+               {
+                 auto divshapesi = divshapes.Col(i);
+                 auto invJ = 1.0/mir[i].GetJacobiDet();
+                 static_cast<const FEL*> (this) ->                 
+                   T_CalcShape (GetTIPGrad<DIM>(mir[i].IP()),
+                                SBLambda ([divshapesi,invJ] (size_t j, THDiv2DivShape<DIM,SIMD<double>> val)
+                                          {
+                                            divshapesi(j) = invJ*val; 
+                                          }));
+               }
+           }
+       });
+   
   }
 
   template <class FEL, ELEMENT_TYPE ET>
@@ -384,6 +408,8 @@ namespace ngfem
   EvaluateDiv (const SIMD_BaseMappedIntegrationRule & bmir, BareSliceVector<> coefs,
                BareVector<SIMD<double>> values) const
   {
+    /*
+    cout << "evaldiv, simd" << endl
     auto & mir = static_cast<const SIMD_MappedIntegrationRule<DIM,DIM>&> (bmir);
     for (size_t i = 0; i < mir.Size(); i++)
       {
@@ -399,6 +425,46 @@ namespace ngfem
                                  }));
         values(i) = sum;
       }
+    */
+
+    /*
+    Iterate<4-DIM>
+      ([this,&bmir,coefs,values](auto CODIM)
+      {
+        constexpr int DIMSPACE = DIM+CODIM.value;
+        if (bmir.DimSpace() == DIMSPACE)
+          {
+            auto & mir = static_cast<const SIMD_MappedIntegrationRule<DIM,DIMSPACE>&> (bmir);
+            for (size_t i = 0; i < mir.Size(); i++)
+               {
+                 SIMD<double> sum(0.0);                 
+                 static_cast<const FEL*> (this) ->                 
+                   T_CalcShape (GetTIPGrad<DIM>(mir[i].IP()),
+                                SBLambda ([=,&sum] (size_t j, THDiv2DivShape<DIM,SIMD<double>> divshape)
+                                          {
+                                            // auto vshape = HDiv2DivShapeNew (s); 
+                                            // shapesi.Range(j*vshape.Size(), (j+1)*vshape.Size()) = vshape;
+                                            // divshapesi(j) = HDiv2DivShapeNew (s);
+                                            sum += coefs(j) * divshape.Get();                                            
+                                          }));
+                 values(i) = 1/mir[i].GetJacobiDet() * sum;
+               }
+           }
+       });
+    */
+
+    auto & mir = bmir;
+    for (size_t i = 0; i < mir.Size(); i++)
+      {
+        SIMD<double> sum(0.0);                 
+        static_cast<const FEL*> (this) ->                 
+          T_CalcShape (GetTIPGrad<DIM>(mir[i].IP()),
+                       SBLambda ([=,&sum] (size_t j, THDiv2DivShape<DIM,SIMD<double>> divshape)
+                       {
+                         sum += coefs(j) * divshape.Get();                                            
+                       }));
+        values(i) = 1/mir[i].GetJacobiDet() * sum;
+      }
   }
   
   template <class FEL, ELEMENT_TYPE ET>

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/lib/cmake/ngsolve/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2505-105-g71e668761")
+set(PACKAGE_VERSION "6.2.2506")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/lib/python3.11/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.2505-105-g71e668761"
-NGSOLVE_VERSION_GIT = "v6.2.2505-105-g71e668761"
-NGSOLVE_VERSION_PYTHON = "6.2.2505.post105.dev0"
+NGSOLVE_VERSION = "6.2.2506"
+NGSOLVE_VERSION_GIT = "v6.2.2506-0-ga28640189"
+NGSOLVE_VERSION_PYTHON = "6.2.2506"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "105"
-NGSOLVE_VERSION_PATCH = "2505"
-NGSOLVE_VERSION_HASH = "g71e668761"
+NGSOLVE_VERSION_TWEAK = "0"
+NGSOLVE_VERSION_PATCH = "2506"
+NGSOLVE_VERSION_HASH = "ga28640189"
 
 CMAKE_CXX_COMPILER           = "/opt/rh/gcc-toolset-14/root/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

{ngsolve-6.2.2505.post105.dev0.data → ngsolve-6.2.2506.data}/data/lib/python3.11/site-packages/ngsolve/solve_implementation.py

@@ -51,6 +51,10 @@ class NonLinearApplication(Application):
         if rhs is not None and rhs != 0:
             rhs.Assemble()
             solver_args["rhs"] = rhs
+        if "freedofs" in kwargs:
+            solver_args["freedofs"] = kwargs.pop("freedofs")
+        if "inverse" in kwargs:
+            solver_args["inverse"] = kwargs.pop("inverse")
         solver = NewtonSolver(self.a, self.gf, **solver_args)
         if dirichlet is not None:
             dirichlet_gf = GridFunction(self.gf.space)

{ngsolve-6.2.2505.post105.dev0.dist-info → ngsolve-6.2.2506.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: ngsolve
-Version: 6.2.2505.post105.dev0
+Version: 6.2.2506
 Summary: NGSolve
 Author: The NGSolve team
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: netgen-mesher==6.2.2505.post50.dev0
+Requires-Dist: netgen-mesher==6.2.2506
 Requires-Dist: mkl
 Dynamic: author
 Dynamic: license