ngsolve 6.2.2502__cp39-cp39-manylinux_2_28_x86_64.whl → 6.2.2502.post11.dev1__cp39-cp39-manylinux_2_28_x86_64.whl

{ngsolve-6.2.2502.data → ngsolve-6.2.2502.post11.dev1.data}/data/include/netgen/fespace.hpp

@@ -256,7 +256,7 @@ ANY                  1 1 1 1 | 15
 
     virtual void UpdateDofTables() { ; } 
     virtual void UpdateCouplingDofArray() { ; } 
-
+    virtual void UpdateFreeDofs();
     /// update element coloring
     virtual void FinalizeUpdate();
 
@@ -640,7 +640,7 @@ ANY                  1 1 1 1 | 15
     /// Set multigrid prolongation
     // void SetProlongation (ngmg::Prolongation * aprol)
     // { prol = aprol; }
-    virtual void SetHarmonicProlongation (shared_ptr<BilinearForm> bfa);
+    virtual void SetHarmonicProlongation (shared_ptr<BilinearForm> bfa, string inverse);
 
     /// returns function-evaluator
     shared_ptr<DifferentialOperator> GetEvaluator (VorB vb = VOL) const
@@ -1109,6 +1109,7 @@ ANY                  1 1 1 1 | 15
 
     /// copies dofcoupling from components
     void UpdateCouplingDofArray() override;
+    virtual void UpdateFreeDofs() override;
     
     void SetDefinedOn (VorB vb, const BitArray& defon) override;
 

{ngsolve-6.2.2502.data → ngsolve-6.2.2502.post11.dev1.data}/data/include/netgen/mptools.hpp

@@ -10,6 +10,12 @@
 #include <coefficient.hpp>
 #include <recursive_pol.hpp>
 
+
+namespace ngcomp
+{
+  class Region;
+}
+
 namespace ngfem
 {
 
@@ -570,7 +576,7 @@ namespace ngfem
 
       entry_type EvaluateDeriv(Vec<3> p, Vec<3> d) const
       {
-        entry_type sum = 0;
+        entry_type sum{0.0};
         if (childs[0])
         {
             for (auto & child : childs)
@@ -727,7 +733,7 @@ namespace ngfem
       root.AddCharge(x, c);
     }
 
-    void AddDipole(Vec<3> x, Vec<3> d, Complex c)
+    void AddDipole(Vec<3> x, Vec<3> d, entry_type c)
     {
       root.AddDipole(x, d, c);
     }
@@ -756,7 +762,7 @@ namespace ngfem
         }
       */
     }
-    
+
     void Print (ostream & ost) const
     {
       root.Print(ost);
@@ -1226,6 +1232,9 @@ namespace ngfem
 
 
 
+  template <typename entry_type> class RegularMLMultiPoleCF;
+  
+
   template <typename RADIAL, typename entry_type=Complex>
   class MultiPoleCF : public CoefficientFunction
   {
@@ -1285,7 +1294,8 @@ namespace ngfem
       
     }
     
-    shared_ptr<SingularMLMultiPole<entry_type>> MLMP() { return mlmp; }
+    shared_ptr<SingularMLMultiPole<entry_type>> MLMP() const { return mlmp; }
+    shared_ptr<RegularMLMultiPoleCF<entry_type>> CreateRegularExpansion(Vec<3> center, double r) const;
   };
   
 
@@ -1296,6 +1306,8 @@ namespace ngfem
   public:
     RegularMLMultiPoleCF (shared_ptr<SingularMLMultiPoleCF<entry_type>> asingmp, Vec<3> center, double r, int order)
       : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLMultiPole<entry_type>>(asingmp->MLMP(), center, r, order)} { } 
+    RegularMLMultiPoleCF (shared_ptr<SingularMLMultiPole<entry_type>> asingmp, Vec<3> center, double r, int order)
+      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLMultiPole<entry_type>>(asingmp, center, r, order)} { } 
     
     virtual double Evaluate (const BaseMappedIntegrationPoint & ip) const override
     { throw Exception("real eval not available"); }

ngsolve-6.2.2502.post11.dev1.data/data/include/netgen/potentialtools.hpp

@@ -0,0 +1,20 @@
+#ifndef FILE_POTENTIALS
+#define FILE_POTENTIALS
+
+/*
+  tools for computing with potentials using multipoles
+ */
+
+
+#include <mptools.hpp>
+#include <meshaccess.hpp>
+
+
+namespace ngcomp
+{
+  
+  extern void AddCurrentDensity (SingularMLMultiPole<Vec<3,Complex>> & mp, shared_ptr<CoefficientFunction> current, ngcomp::Region reg);
+ 
+}
+
+#endif

{ngsolve-6.2.2502.data → ngsolve-6.2.2502.post11.dev1.data}/data/include/netgen/prolongation.hpp

@@ -233,12 +233,14 @@ namespace ngmg
   class NGS_DLL_HEADER HarmonicProlongation : public Prolongation
   {
     shared_ptr<Prolongation> baseprol;
-    shared_ptr<BilinearForm> bfa;
+    weak_ptr<BilinearForm> wbfa;
     Array<shared_ptr<BaseMatrix>> innerinverses;
-    Array<size_t> edges_on_level;
+    Array<size_t> facets_on_level;
+    Array<shared_ptr<BitArray>> freedofs;
+    string inverse;
   public:
     HarmonicProlongation (shared_ptr<Prolongation> abaseprol,
-                          shared_ptr<BilinearForm> abfa);
+                          shared_ptr<BilinearForm> abfa, string ainverse);
 
     virtual void Update (const FESpace & fes) override;
     
@@ -248,6 +250,127 @@ namespace ngmg
     virtual void ProlongateInline (int finelevel, BaseVector & v) const override;
     virtual void RestrictInline (int finelevel, BaseVector & v) const override;
   };
+
+
+
+
+  
+  template <int DIM>
+  class FacetProlongation : public Prolongation
+  {
+  protected:
+    shared_ptr<MeshAccess> ma;
+    
+    int dofs_per_facet = -1;
+    Array<Array<int>> first_dofs;
+    Array<int> prol_class;  // which prol to use ?
+    Array<size_t> facets_on_level;
+
+    static constexpr int NUMPROL = (DIM==2) ? 2 : 32;
+    array<Matrix<double>,NUMPROL> facetprol;
+    
+    bool haveprols = false;
+    
+  public:
+    FacetProlongation (shared_ptr<MeshAccess> ama)
+      : ma(ama) { }
+
+
+    virtual shared_ptr<SparseMatrix< double >> CreateProlongationMatrix( int finelevel ) const override
+    {
+      return nullptr;  // or NULL ? 
+    }
+
+    
+    virtual void ProlongateInline (int finelevel, BaseVector & v) const override
+    {
+      auto fv = v.FV<double>();
+      Matrix<double> tmp(facets_on_level[finelevel], dofs_per_facet);
+      tmp = 0.0;
+      
+      for (size_t i = 0; i < first_dofs[finelevel-1].Size()-1; i++)
+        {
+          IntRange r(first_dofs[finelevel-1][i], first_dofs[finelevel-1][i+1]);
+          if (r.Size() > 0)
+            tmp.Row(i) = fv.Range(r);
+        }
+
+      if constexpr (DIM==2)
+        {
+          for (int i = facets_on_level[finelevel-1]; i < facets_on_level[finelevel]; i++)
+            if (auto parents = get<1>(ma->GetParentEdges(i)); parents[1] == -1)
+              {
+                int pe = parents[0];
+                tmp.Row(i) = facetprol[prol_class[i]] * tmp.Row(pe);
+              }
+        }
+      else
+        {
+          for (int i = facets_on_level[finelevel-1]; i < facets_on_level[finelevel]; i++)
+          if (auto parents = get<1>(ma->GetParentFaces(i)); parents[1] == -1)
+            {
+              int pe = parents[0];
+              tmp.Row(i) = facetprol[prol_class[i]] * tmp.Row(pe);
+            }
+        }
+      
+      for (size_t i = 0; i < first_dofs[finelevel].Size()-1; i++)
+        {
+          IntRange r(first_dofs[finelevel][i], first_dofs[finelevel][i+1]);
+          if (r.Size() > 0)
+            fv.Range(r) = tmp.Row(i);
+        }
+    }
+    
+    virtual void RestrictInline (int finelevel, BaseVector & v) const override
+    {
+      auto fv = v.FV<double>();
+      Matrix<double> tmp(facets_on_level[finelevel], dofs_per_facet);
+      tmp = 0.0;
+      
+      for (size_t i = 0; i < first_dofs[finelevel].Size()-1; i++)
+        {
+          IntRange r(first_dofs[finelevel][i], first_dofs[finelevel][i+1]);
+          if (r.Size() > 0)
+            tmp.Row(i) = fv.Range(r);
+        }
+
+
+      if constexpr (DIM==2)
+        {
+          for (int i = facets_on_level[finelevel-1]; i < facets_on_level[finelevel]; i++)
+            if (auto parents = get<1>(ma->GetParentEdges(i)); parents[1] == -1)
+              {
+                int pe = parents[0];
+                tmp.Row(pe) += Trans(facetprol[prol_class[i]]) * tmp.Row(i);
+              }
+        }
+      else
+        {
+          // for (int i = facets_on_level[finelevel-1]; i < facets_on_level[finelevel]; i++)
+          for (int i = facets_on_level[finelevel]-1; i >= facets_on_level[finelevel-1]; i--)      
+            if (auto parents = get<1>(ma->GetParentFaces(i)); parents[1] == -1)
+              {
+                int pe = parents[0];
+                tmp.Row(pe) += Trans(facetprol[prol_class[i]]) * tmp.Row(i);
+                tmp.Row(i) = 0.0;  // optional, for testing
+              }
+        }
+      
+      fv = 0.0;
+      for (size_t i = 0; i < first_dofs[finelevel-1].Size()-1; i++)
+        {
+          IntRange r(first_dofs[finelevel-1][i], first_dofs[finelevel-1][i+1]);
+          if (r.Size() > 0)
+            fv.Range(r) = tmp.Row(i);
+        }
+
+    }
+    
+  };
+  
+  
+  
 }
 
 

{ngsolve-6.2.2502.data → ngsolve-6.2.2502.post11.dev1.data}/data/include/netgen/sparsematrix_impl.hpp

@@ -51,28 +51,94 @@ namespace ngla
                  FlatArray<TM> val, size_t h, size_t w)
   {
     static Timer t("SparseMatrix::CreateFromCOO"); RegionTimer r(t);
-    Array<int> cnt(h);
+    static Timer t1("SparseMatrix::CreateFromCOO 1");
+    static Timer t2("SparseMatrix::CreateFromCOO 2");
+    static Timer t3("SparseMatrix::CreateFromCOO 3");
 
     /*
-    cnt = 0;
-    for (auto i : indi) cnt[i]++;
-    */
+    {
+    Array<int> cnt(h);
 
+    t1.Start();
     DynamicTable<int> tab(h);
     for (size_t i = 0; i < indi.Size(); i++)
       tab.AddUnique(indi[i], indj[i]);
+    t1.Stop();
     for (size_t i = 0; i < h; i++)
       cnt[i] = tab.EntrySize(i);
     
     auto matrix = make_shared<SparseMatrix<TM>> (cnt, w);
+    t2.Start();
     for (auto k : ngstd::Range(indi))
       matrix->CreatePosition(indi[k], indj[k]);
+    t2.Stop();
     matrix->SetZero();
 
+    t3.Start();
     for (auto k : ngstd::Range(indi))
       (*matrix)(indi[k], indj[k]) += val[k];
+    t3.Stop();
+    // return matrix;
+    }
+    */
+    
+    Array<int> cnt(h);
+    cnt = 0;
+    for (auto i : indi)
+      cnt[i]++;
+    
+    Table<int> tab(cnt);
+    cnt = 0;
+    
+    for (auto [i,j] : Zip(indi, indj))
+      tab[i][cnt[i]++] = j;
+
+    cnt = 0;
+    // for (int i = 0; i < tab.Size(); i++)
+    ParallelFor (tab.Size(), [&] (size_t i)
+      {
+        QuickSort (tab[i]);
+
+        int prev = -1;
+        for (auto j : tab[i])
+          {
+            if (j != prev) cnt[i]++;
+            prev = j;
+          }
+      });
+    
+    auto matrix = make_shared<SparseMatrix<TM>> (cnt, w);
+    t2.Start();
+    // for (auto k : ngstd::Range(indi))
+    // matrix->CreatePosition(indi[k], indj[k]);
 
-    return matrix;
+    cnt = 0;
+    for (int i = 0; i < tab.Size(); i++)
+      {
+        int prev = -1;
+        for (auto j : tab[i])
+          {
+            auto cols = matrix->GetRowIndices(i);
+            if (j != prev)
+              cols[cnt[i]++] = j;
+            prev = j;
+          }
+      }
+    
+    t2.Stop();
+    matrix->SetZero();
+
+    t3.Start();
+    /*
+    for (auto k : ngstd::Range(indi))
+      (*matrix)(indi[k], indj[k]) += val[k];
+    */
+    ParallelFor (indi.Size(), [&](size_t k)
+    {
+      AtomicAdd ( (*matrix)(indi[k], indj[k]),  val[k]);
+    });
+    t3.Stop();
+    return matrix;    
   }
   
 

{ngsolve-6.2.2502.data → ngsolve-6.2.2502.post11.dev1.data}/data/include/netgen/tangentialfacetfespace.hpp

@@ -16,34 +16,22 @@ namespace ngcomp
   class NGS_DLL_HEADER TangentialFacetFESpace : public FESpace
   {
   protected:
-    /// Level
-    // int level;
-    /// Number of Facets
-    // int nfacets;
-    /// 
-    // int ncfacets;
-    ///
-    // int nel;
-
     Array<int> first_facet_dof;
     Array<int> first_inner_dof;  // for highest_order_dc
-    // int ndof_lo;
 
     int rel_order;
 
     Array<IVec<2> > order_facet;
     Array<bool> fine_facet;
 
-    // int ndof;
-    // Array<int> ndlevel;
     bool var_order;
     bool print;
 
     bool highest_order_dc;
     bool hide_highest_order_dc;
+    bool all_dofs_together;
     
   public:
-    ///
     TangentialFacetFESpace (shared_ptr<MeshAccess> ama, const Flags & flags, 
                             bool parseflags = false );
 
@@ -61,20 +49,11 @@ namespace ngcomp
     virtual void SetOrder (NodeId ni, int order) override;
     virtual int GetOrder (NodeId ni) const override;
 
-    
-    // virtual size_t GetNDof() const throw() override { return ndof; }
-    // virtual size_t GetNDofLevel ( int i ) const override { return ndlevel[i]; }
-
     virtual FlatArray<VorB> GetDualShapeNodes (VorB vb) const override;
 
-    // virtual int GetNDofLowOrder () const
-    // { return ndof_lo; }
 
     virtual FiniteElement & GetFE(ElementId ei, Allocator & lh) const override;
     
-    // virtual const FiniteElement & GetFE ( int elnr, LocalHeap & lh ) const;
-    // virtual const FiniteElement & GetSFE ( int selnr, LocalHeap & lh ) const;
-
     virtual void GetFacetDofNrs (int felnr, Array<DofId> & dnums) const;
 
     virtual int GetNFacetDofs (int felnr) const;
@@ -90,6 +69,12 @@ namespace ngcomp
     virtual IVec<2> GetFacetOrder(int fnr) const;
 
     virtual int GetFirstFacetDof(int fanr) const;
+    const auto & GetFirstFacetDof() const { return first_facet_dof; }
+
+    IntRange GetFacetDofs (int nr) const
+    { 
+      return IntRange (first_facet_dof[nr], first_facet_dof[nr+1]); 
+    }
 
     virtual bool UsesHighestOrderDiscontinuous() const {return highest_order_dc;};
 

{ngsolve-6.2.2502.data → ngsolve-6.2.2502.post11.dev1.data}/data/lib/cmake/ngsolve/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2502")
+set(PACKAGE_VERSION "6.2.2502-11-g4d6a78d51")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..

{ngsolve-6.2.2502.data → ngsolve-6.2.2502.post11.dev1.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.2502"
-NGSOLVE_VERSION_GIT = "v6.2.2502-0-g984bf8ae2"
-NGSOLVE_VERSION_PYTHON = "6.2.2502"
+NGSOLVE_VERSION = "6.2.2502-11-g4d6a78d51"
+NGSOLVE_VERSION_GIT = "v6.2.2502-11-g4d6a78d51"
+NGSOLVE_VERSION_PYTHON = "6.2.2502.post11.dev1"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "0"
+NGSOLVE_VERSION_TWEAK = "11"
 NGSOLVE_VERSION_PATCH = "2502"
-NGSOLVE_VERSION_HASH = "g984bf8ae2"
+NGSOLVE_VERSION_HASH = "g4d6a78d51"
 
 CMAKE_CXX_COMPILER           = "/opt/rh/gcc-toolset-14/root/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

{ngsolve-6.2.2502.dist-info → ngsolve-6.2.2502.post11.dev1.dist-info}/METADATA

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