ngsolve 6.2.2505__cp39-cp39-manylinux_2_28_x86_64.whl → 6.2.2505.post17.dev0__cp39-cp39-manylinux_2_28_x86_64.whl

{ngsolve-6.2.2505.data → ngsolve-6.2.2505.post17.dev0.data}/data/include/netgen/fespace.hpp

@@ -448,7 +448,8 @@ ANY                  1 1 1 1 | 15
     virtual void GetDofNrs (NodeId ni, Array<DofId> & dnums) const;
     BitArray GetDofs (const Region & reg) const;
     Table<int> CreateDofTable (VorB vorb) const;
-
+    virtual void SelectDofs (const string & name, BitArray & dofs) const;
+                  
     /// get coupling types of dofs
     virtual void GetDofCouplingTypes (int elnr, Array<COUPLING_TYPE> & dnums) const;
     
@@ -1141,7 +1142,8 @@ ANY                  1 1 1 1 | 15
     void GetEdgeDofNrs (int ednr, Array<DofId> & dnums) const override;
     void GetFaceDofNrs (int fanr, Array<DofId> & dnums) const override;
     void GetInnerDofNrs (int elnr, Array<DofId> & dnums) const override;
-
+    void SelectDofs (const string & name, BitArray & dofs) const override;
+    
     void SolveM(CoefficientFunction * rho, BaseVector & vec, Region * definedon,
                         LocalHeap & lh) const override;
     void ApplyM(CoefficientFunction * rho, BaseVector & vec, Region * definedon,

{ngsolve-6.2.2505.data → ngsolve-6.2.2505.post17.dev0.data}/data/include/netgen/h1amg.hpp

@@ -9,6 +9,20 @@
 namespace ngcomp
 {
   using namespace ngla;
+
+
+
+  struct H1AMG_Parameters
+  {
+    int verbose = 0;
+    int smoothing_steps = 3;
+    int coarsenings_per_level = 3; // number of binary coarsenings per level
+    bool block_smoother = true;    // block or point smoother ?
+    bool use_smoothed_prolongation = true;
+    int max_coarse = 10;
+    int max_level = 20;
+  };
+
   
   template <class SCAL>
   class NGS_DLL_HEADER H1AMG_Matrix : public ngla::BaseMatrix
@@ -26,6 +40,7 @@ namespace ngcomp
                   ngcore::FlatArray<ngcore::IVec<2>> e2v,
                   ngcore::FlatArray<double> edge_weights,
                   ngcore::FlatArray<double> vertex_weights,
+                  const H1AMG_Parameters & param,                  
                   size_t level);
 
     virtual int VHeight() const override { return size; }
@@ -50,7 +65,9 @@ namespace ngcomp
 
     ParallelHashTable<IVec<2>,double> edge_weights_ht;
     ParallelHashTable<IVec<1>,double> vertex_weights_ht;
-
+    
+    H1AMG_Parameters param;
+    
   public:
 
     static shared_ptr<Preconditioner> CreateBF (shared_ptr<BilinearForm> bfa, const Flags & flags, const string & name)
@@ -71,6 +88,12 @@ namespace ngcomp
         cout << IM(3) << "Create H1AMG" << endl;
       else
         cout << IM(3) << "Create H1AMG, complex" << endl;
+      
+      param.verbose = int(flags.GetNumFlag("verbose", 0));
+      param.smoothing_steps = int(flags.GetNumFlag("smoothingsteps", 1));    
+      param.use_smoothed_prolongation = flags.GetDefineFlagX("smoothedprolongation").IsMaybeTrue();
+      param.max_coarse = int(flags.GetNumFlag("maxcoarse", 10));
+      param.max_level = int(flags.GetNumFlag("maxlevel", 20));
     }
 
     virtual void InitLevel (shared_ptr<BitArray> _freedofs) override

{ngsolve-6.2.2505.data → ngsolve-6.2.2505.post17.dev0.data}/data/include/netgen/hdivhofespace.hpp

@@ -143,6 +143,8 @@ namespace ngcomp
 	} 
     }
 
+    void SelectDofs (const string & name, BitArray & dofs) const override;
+
     int GetFirstInnerDof(int elnr) const { return(first_inner_dof[elnr]);}; 
     // virtual int LowOrderDof() const { if(discont) return(0); else return(1);} 
 

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

@@ -877,6 +877,34 @@ namespace ngsbem
   class NGS_DLL_HEADER RegularMLMultiPole
   {
     static Array<size_t> nodes_on_level;
+
+    
+    struct RecordingRS
+    {
+      const MultiPole<MPSingular,elem_type> * mpS;
+      MultiPole<MPRegular,elem_type> * mpR;
+      Vec<3> dist;
+      double len, theta, phi;
+    public:
+      RecordingRS() = default;
+      RecordingRS (const MultiPole<MPSingular,elem_type> * ampS,
+                   MultiPole<MPRegular,elem_type> * ampR,
+                   Vec<3> adist)
+        : mpS(ampS), mpR(ampR), dist(adist)
+      {
+        len = L2Norm(dist);
+        if (len < 1e-30)
+          theta = 0;
+        else
+          theta = acos (dist(2) / len);
+        
+        if (sqr(dist(0))+sqr(dist(1)) < 1e-30)
+          phi = 0;
+        else
+          phi = atan2(dist(1), dist(0));
+      }
+    };
+
     
     struct Node
     {
@@ -912,8 +940,9 @@ namespace ngsbem
             childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
           }
       }
-
-      void AddSingularNode (const typename SingularMLMultiPole<elem_type>::Node & singnode, bool allow_refine)
+      
+      void AddSingularNode (const typename SingularMLMultiPole<elem_type>::Node & singnode, bool allow_refine,
+                            Array<RecordingRS> * recording)
       {
         if (mp.SH().Order() < 0) return;
         if (singnode.mp.SH().Order() < 0) return;
@@ -936,12 +965,15 @@ namespace ngsbem
                 singnode.childs[0]->mp.Order() < singnode.mp.Order())
               {
                 for (auto & child : singnode.childs)
-                  AddSingularNode (*child, allow_refine);
+                  AddSingularNode (*child, allow_refine, recording);
                 return;
               }
 
             // static Timer t("mptool transform Helmholtz-criterion"); RegionTimer r(t);
-            singnode.mp.TransformAdd(mp, dist);
+            if (recording)
+              *recording += RecordingRS(&singnode.mp, &mp, dist);
+            else
+              singnode.mp.TransformAdd(mp, dist);
             return;
           }
 
@@ -960,21 +992,21 @@ namespace ngsbem
                   CreateChilds();
                 
                 for (auto & ch : childs)
-                  ch -> AddSingularNode (singnode, allow_refine);
+                  ch -> AddSingularNode (singnode, allow_refine, recording);
               }
             else
               {
-                if (total_targets < 1000)
+                if (total_targets < 1000 || recording)
                   {
                     for (auto & ch : childs)
                       if (ch)
-                        ch -> AddSingularNode (singnode, allow_refine);
+                        ch -> AddSingularNode (singnode, allow_refine, recording);
                   }
                 else
                   ParallelFor (8, [&] (int nr)
                                {
                                  if (childs[nr])
-                                   childs[nr] -> AddSingularNode (singnode, allow_refine);
+                                   childs[nr] -> AddSingularNode (singnode, allow_refine, recording);
                                });
                 
                 if (targets.Size())
@@ -984,7 +1016,7 @@ namespace ngsbem
         else
           {
             for (auto & childsing : singnode.childs)
-              AddSingularNode (*childsing, allow_refine);
+              AddSingularNode (*childsing, allow_refine, recording);
           }
       }
 
@@ -1158,8 +1190,8 @@ namespace ngsbem
       nodes_on_level = 0;
       nodes_on_level[0] = 1;
       {
-        static Timer t("mptool compute regular MLMP"); RegionTimer rg(t);            
-        root.AddSingularNode(singmp->root, true);
+        static Timer t("mptool compute regular MLMP"); RegionTimer rg(t);
+        root.AddSingularNode(singmp->root, true, nullptr);
         // cout << "norm after S->R conversion: " << root.Norm() << endl;
       }
 
@@ -1200,9 +1232,27 @@ namespace ngsbem
 
       root.CalcTotalTargets();
       root.RemoveEmptyTrees();
-        
-      root.AddSingularNode(singmp->root, false);
 
+      
+      root.AddSingularNode(singmp->root, false, nullptr);
+      /*
+      Array<RecordingRS> recording;      
+      root.AddSingularNode(singmp->root, false, &recording);
+      // cout << "recorded: " << recording.Size() << endl;
+      QuickSort (recording, [] (auto & a, auto & b)
+      {
+        if (a.len < (1-1e-8) * b.len) return true;
+        if (a.len > (1+1e-8) * b.len) return false;
+        return a.theta < b.theta;
+      });
+      for (auto & record : recording)
+        {
+          record.mpS->TransformAdd(*record.mpR, record.dist);
+          // *testout << record.len << ", " << record.theta << ", " << record.phi << endl;
+        }
+      */
+
+      
       /*
       int maxlevel = 0;
       for (auto [i,num] : Enumerate(RegularMLMultiPole::nodes_on_level))

{ngsolve-6.2.2505.data → ngsolve-6.2.2505.post17.dev0.data}/data/include/netgen/ngblas.hpp

@@ -584,12 +584,31 @@ namespace ngbla
       }
   }
 
-  template <typename TM, typename TVX, typename TVY>
-  extern void TestFunc (TM m, TVX x, TVY y);
-
+  // template <typename TM, typename TVX, typename TVY>
+  // extern void TestFunc (TM m, TVX x, TVY y);
+  
+  
+  template <typename TS, typename T> constexpr bool IsVec = false;
+  template <typename TS, int S> constexpr bool IsVec<TS, Vec<S,TS>> = true;  
+  
   template <bool ADD, bool POS, typename TM, ORDERING ORD, typename TX, typename TY>
   INLINE void NgGEMV (BareSliceMatrix<TM,ORD> a, FlatVector<const TX> x, FlatVector<TY> y)
   {
+    if constexpr (std::is_same<TM,double>() && std::is_same<TX,TY>() && IsVec<Complex,TX>)
+      {
+        FlatMatrix<double> mx(x.Size(), sizeof(TX)/sizeof(double), (double*)(void*)x.Addr(0));
+        FlatMatrix<double> my(y.Size(), sizeof(TX)/sizeof(double), (double*)(void*)y.Addr(0));
+        NgGEMM<ADD,POS> (a.AddSize(y.Size(), x.Size()),make_SliceMatrix(mx), make_SliceMatrix(my));
+        return;
+      }
+    if constexpr (std::is_same<TM,Complex>() && std::is_same<TX,TY>() && IsVec<Complex,TX>)
+      {
+        FlatMatrix<Complex> mx(x.Size(), sizeof(TX)/sizeof(Complex), &const_cast<Complex&>(*(x.Data()->Data())));
+        FlatMatrix<Complex> my(y.Size(), sizeof(TX)/sizeof(Complex), y.Data()->Data());
+        NgGEMM<ADD,POS> (a.AddSize(y.Size(), x.Size()),make_SliceMatrix(mx), make_SliceMatrix(my));
+        return;
+      }
+
     if (!ADD)
       {
         if (!POS)
@@ -635,6 +654,16 @@ namespace ngbla
   extern NGS_DLL_HEADER  
   void NgGEMV (double s, BareSliceMatrix<double,ord> a, SliceVector<double> x, SliceVector<double> y) NETGEN_NOEXCEPT;
   */
+
+
+
+
+
+
+
+  /* *********************** GEMV - SliceVector **************************** */
+
+
   
   template <bool ADD, ORDERING ord>
   extern NGS_DLL_HEADER  
@@ -714,7 +743,30 @@ namespace ngbla
   }
 
 
-
+  
+  
+  template <bool ADD, bool POS, typename TM, ORDERING ORD, typename TX, typename TY>
+  INLINE void NgGEMV (BareSliceMatrix<TM,ORD> a, SliceVector<TX> x, SliceVector<TY> y)
+  {
+    if constexpr (std::is_same<TM,double>() && std::is_same<TX,TY>() && IsVec<Complex,TX>)
+      {
+        constexpr int VS = sizeof(TX)/sizeof(double);
+        SliceMatrix<double> mx(x.Size(), VS, x.Dist()*VS, (double*)(void*)x.Addr(0));
+        SliceMatrix<double> my(y.Size(), VS, y.Dist()*VS, (double*)(void*)y.Addr(0));
+        NgGEMM<ADD,POS> (a.AddSize(y.Size(), x.Size()),make_SliceMatrix(mx), make_SliceMatrix(my));
+        return;
+      }
+    else if constexpr (std::is_same<TM,Complex>() && std::is_same<TX,TY>() && IsVec<Complex,TX>)
+      {
+        constexpr int VS = sizeof(TX)/sizeof(Complex);
+        SliceMatrix<Complex> mx(x.Size(), VS, x.Dist()*VS, &const_cast<Complex&>(*(x.Data()->Data())));
+        SliceMatrix<Complex> my(y.Size(), VS, y.Dist()*VS, y.Data()->Data());
+        NgGEMM<ADD,POS> (a.AddSize(y.Size(), x.Size()),make_SliceMatrix(mx), make_SliceMatrix(my));
+        return;
+      }
+    else
+      NgGEMV<ADD> (POS ? 1.0 : -1.0, a, x, y);
+  }
 
 
 
@@ -880,9 +932,14 @@ namespace ngbla
                          FlatVector<const TB>(prod.View().B().Range(0,w)),
                          FlatVector<T>(self.Spec().Range(0,h)));
       else
+        NgGEMV<ADD,POS> (make_BareSliceMatrix(prod.View().A()),
+                         SliceVector<TB>(prod.View().B().Range(0,w)),
+                         SliceVector<T>(self.Spec().Range(0,h)));
+        /*
         NgGEMV<ADD> (POS ? 1.0 : -1.0, make_BareSliceMatrix(prod.View().A()),
                      SliceVector<TB>(prod.View().B().Range(0,w)),
                      SliceVector<T>(self.Spec().Range(0,h)));
+        */
       return self.Spec();
     }
   };
@@ -1101,6 +1158,47 @@ namespace ngbla
   
 
 
+  template <bool ADD, bool POS, ORDERING OA, ORDERING OB>
+  extern NGS_DLL_HEADER void NgGEMMBare (size_t ah, size_t aw, size_t bw, BareSliceMatrix<Complex,OA> a, BareSliceMatrix<Complex,OB> b, BareSliceMatrix<Complex,RowMajor> c);
+
+
+  template <bool ADD, bool POS, ORDERING OA, ORDERING OB>
+  void NgGEMM (SliceMatrix<Complex,OA> a, SliceMatrix<Complex,OB> b, SliceMatrix<Complex,RowMajor> c)
+  {
+    size_t ah = a.Height();
+    size_t aw = a.Width();
+    size_t bw = b.Width();
+    NgGEMMBare<ADD,POS>(ah, aw, bw, make_BareSliceMatrix(a), make_BareSliceMatrix(b), make_BareSliceMatrix(c));
+  }
+  
+  template <bool ADD, bool POS, ORDERING OA, ORDERING OB>
+  void NgGEMM (SliceMatrix<Complex,OA> a, SliceMatrix<Complex,OB> b, SliceMatrix<Complex,ColMajor> c)
+  {
+    NgGEMM<ADD,POS> (Trans(b), Trans(a), Trans(c));
+  }
+  
+  template <typename OP, typename T, typename TA, typename TB>
+  class assign_trait<OP, T, MultExpr<TA, TB>,
+                     enable_if_t<IsConvertibleToSliceMatrix<TA,Complex>() &&
+                                 IsConvertibleToSliceMatrix<TB,Complex>() &&
+                                 IsConvertibleToSliceMatrix<T,Complex>(), int>>
+  {
+  public:
+    static inline T & Assign (MatExpr<T> & self, const Expr<MultExpr<TA, TB>> & prod) 
+    {
+      constexpr bool ADD = std::is_same<OP,typename MatExpr<T>::AsAdd>::value || std::is_same<OP,typename MatExpr<T>::AsSub>::value;
+      constexpr bool POS = std::is_same<OP,typename MatExpr<T>::As>::value || std::is_same<OP,typename MatExpr<T>::AsAdd>::value;
+
+      size_t n = CombinedSize(prod.View().A().Height(), self.Spec().Height());
+      size_t m = CombinedSize(prod.View().B().Width(), self.Spec().Width());
+      size_t k = CombinedSize(prod.View().A().Width(), prod.View().B().Height());
+      
+      NgGEMM<ADD,POS> (make_BareSliceMatrix(prod.View().A()).AddSize(n,k).RemoveConst(),
+                       make_BareSliceMatrix(prod.View().B()).AddSize(k,m).RemoveConst(),
+                       make_BareSliceMatrix(self.Spec()).AddSize(n,m));
+      return self.Spec();
+    }
+  };
 
   
 

{ngsolve-6.2.2505.data → ngsolve-6.2.2505.post17.dev0.data}/data/include/netgen/sparsematrix_dyn.hpp

@@ -50,9 +50,9 @@ namespace ngla
     virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;
     
     AutoVector CreateRowVector() const override
-    { throw make_unique<VVector<TSCAL>> (VWidth()); }
+    { return make_unique<VVector<TSCAL>> (VWidth()); }
     AutoVector CreateColVector() const override
-    { throw make_unique<VVector<TSCAL>> (VHeight()); }
+    { return make_unique<VVector<TSCAL>> (VHeight()); }
     
     virtual tuple<int,int> EntrySizes() const override { return { bh, bw }; }
   };

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

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

{ngsolve-6.2.2505.data → ngsolve-6.2.2505.post17.dev0.data}/data/lib/python3.9/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"
-NGSOLVE_VERSION_GIT = "v6.2.2505-0-g8fbbbc389"
-NGSOLVE_VERSION_PYTHON = "6.2.2505"
+NGSOLVE_VERSION = "6.2.2505-17-g2593d4c47"
+NGSOLVE_VERSION_GIT = "v6.2.2505-17-g2593d4c47"
+NGSOLVE_VERSION_PYTHON = "6.2.2505.post17.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "0"
+NGSOLVE_VERSION_TWEAK = "17"
 NGSOLVE_VERSION_PATCH = "2505"
-NGSOLVE_VERSION_HASH = "g8fbbbc389"
+NGSOLVE_VERSION_HASH = "g2593d4c47"
 
 CMAKE_CXX_COMPILER           = "/opt/rh/gcc-toolset-14/root/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

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

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