ngsolve 6.2.2501.post83.dev1__cp311-cp311-win_amd64.whl → 6.2.2503__cp311-cp311-win_amd64.whl

netgen/include/ngblas.hpp

@@ -655,6 +655,20 @@ namespace ngbla
   template <bool ADD, ORDERING ord>
   extern NGS_DLL_HEADER  
   void NgGEMV (Complex s, BareSliceMatrix<double,ord> a, FlatVector<const Complex> x, FlatVector<Complex> y) NETGEN_NOEXCEPT;
+  
+
+
+  template <bool ADD, ORDERING ord, int S>
+  void NgGEMV (Complex s, BareSliceMatrix<double,ord> a, SliceVector<Vec<S,Complex>> x, SliceVector<Vec<S,Complex>> y) NETGEN_NOEXCEPT
+  {
+    SliceMatrix<Complex> mx(x.Size(), S, S*x.Dist(), x.Data()->Data());
+    SliceMatrix<Complex> my(y.Size(), S, S*y.Dist(), y.Data()->Data());
+    if constexpr (ADD)
+      my += s * a.AddSize(y.Size(), x.Size()) * mx;
+    else
+      my = s * a.AddSize(y.Size(), x.Size()) * mx;
+  }
+
 
   
   template <bool ADD, ORDERING ord>

netgen/include/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 ngsbem
+{
+  
+  extern void AddCurrentDensity (SingularMLMultiPole<Vec<3,Complex>> & mp, shared_ptr<CoefficientFunction> current, ngcomp::Region reg);
+ 
+}
+
+#endif

netgen/include/prolongation.hpp

@@ -8,7 +8,7 @@
 /*********************************************************************/
 
 namespace ngcomp { class NedelecFESpace; }
-
+namespace ngla { class SparseFactorization; } 
 namespace ngmg
 {
 
@@ -229,6 +229,148 @@ namespace ngmg
     ///
     virtual void RestrictInline (int finelevel, BaseVector & v) const override;
   };
+
+  class NGS_DLL_HEADER HarmonicProlongation : public Prolongation
+  {
+    shared_ptr<Prolongation> baseprol;
+    weak_ptr<BilinearForm> wbfa;
+    Array<shared_ptr<BaseMatrix>> innerinverses;
+    Array<size_t> facets_on_level;
+    Array<shared_ptr<BitArray>> freedofs;
+    string inverse;
+  public:
+    HarmonicProlongation (shared_ptr<Prolongation> abaseprol,
+                          shared_ptr<BilinearForm> abfa, string ainverse);
+
+    virtual void Update (const FESpace & fes) override;
+    
+    virtual size_t GetNDofLevel (int level) override { return baseprol->GetNDofLevel(level); } 
+
+    virtual shared_ptr<SparseMatrix< double >> CreateProlongationMatrix( int finelevel ) const override;
+    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);
+        }
+
+    }
+    
+  };
+  
+  
+  
 }
 
 

netgen/include/python_ngstd.hpp

@@ -12,6 +12,7 @@
 #endif
 
 #include <pybind11/pybind11.h>
+#include <pybind11/iostream.h>
 #include <pybind11/eval.h>
 #include <pybind11/operators.h>
 #include <pybind11/complex.h>

netgen/include/sparsecholesky.hpp

@@ -34,7 +34,7 @@ namespace ngla
 
     void DoArchive(Archive& ar) override;
 
-    virtual bool IsComplex() const override { return matrix.lock()->IsComplex(); }
+    // virtual bool IsComplex() const override { return matrix.lock()->IsComplex(); }
 
     virtual void Smooth (BaseVector & u, const BaseVector & f, BaseVector & y) const;
 

netgen/include/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;    
   }
   
 

netgen/include/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;};
 

netgen/include/tensor.hpp

@@ -371,7 +371,7 @@ public:
   
   ~Tensor() 
   {
-    delete this->Data();
+    delete [] this->Data();
   }
 
   FlatTensor<DIM,T> operator= (double d)

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2501-83-gaf867070b")
+set(PACKAGE_VERSION "6.2.2503")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..
@@ -23,15 +23,15 @@ set(NGSOLVE_PYBIND_INCLUDE_DIR "")
 set(NGSOLVE_PYTHON_INCLUDE_DIRS "C:/Python311/include")
 set(NGSOLVE_PYTHON_LIBRARIES "C:/Python311/libs/python311.lib")
 set(NGSOLVE_PYTHON_PACKAGES_INSTALL_DIR  "")
-set(NGSOLVE_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tcl/generic")
+set(NGSOLVE_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tcl/generic")
 set(NGSOLVE_TCL_LIBRARY "C:/Python311/tcl/tclstub86.lib")
 set(NGSOLVE_TK_DND_LIBRARY "")
-set(NGSOLVE_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tk/generic")
+set(NGSOLVE_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tk/generic")
 set(NGSOLVE_TK_LIBRARY "C:/Python311/tcl/tkstub86.lib")
 set(NGSOLVE_X11_X11_LIB "")
 set(NGSOLVE_X11_Xmu_LIB "")
-set(NGSOLVE_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/include")
-set(NGSOLVE_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
+set(NGSOLVE_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/include")
+set(NGSOLVE_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
 
 set(NGSOLVE_INTEL_MIC       OFF)
 set(NGSOLVE_USE_CCACHE ON)

ngsolve/cmake/ngsolve-targets.cmake

@@ -19,7 +19,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_cmake_targets_defined "")
 set(_cmake_targets_not_defined "")
 set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack netgen_python ngstd ngbla ngla ngfem ngcomp ngsolve)
+foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack netgen_python ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve)
   list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
   if(TARGET "${_cmake_expected_target}")
     list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -107,6 +107,13 @@ set_target_properties(ngfem PROPERTIES
   INTERFACE_LINK_LIBRARIES "ngbla;ngstd;\$<LINK_ONLY:>"
 )
 
+# Create imported target ngsbem
+add_library(ngsbem INTERFACE IMPORTED)
+
+set_target_properties(ngsbem PROPERTIES
+  INTERFACE_LINK_LIBRARIES "ngcomp;ngfem;ngla;ngbla;ngstd;\$<LINK_ONLY:>"
+)
+
 # Create imported target ngcomp
 add_library(ngcomp INTERFACE IMPORTED)
 
@@ -118,7 +125,7 @@ set_target_properties(ngcomp PROPERTIES
 add_library(ngsolve SHARED IMPORTED)
 
 set_target_properties(ngsolve PROPERTIES
-  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngbla;ngla;ngstd"
+  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngsbem;ngbla;ngla;ngstd"
 )
 
 if(CMAKE_VERSION VERSION_LESS 3.0.0)

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.2501-83-gaf867070b"
-NGSOLVE_VERSION_GIT = "v6.2.2501-83-gaf867070b"
-NGSOLVE_VERSION_PYTHON = "6.2.2501.post83.dev1"
+NGSOLVE_VERSION = "6.2.2503"
+NGSOLVE_VERSION_GIT = "v6.2.2503-0-ga44fe5348"
+NGSOLVE_VERSION_PYTHON = "6.2.2503"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "83"
-NGSOLVE_VERSION_PATCH = "2501"
-NGSOLVE_VERSION_HASH = "gaf867070b"
+NGSOLVE_VERSION_TWEAK = "0"
+NGSOLVE_VERSION_PATCH = "2503"
+NGSOLVE_VERSION_HASH = "ga44fe5348"
 
 CMAKE_CXX_COMPILER           = "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.44.35207/bin/Hostx64/x64/cl.exe"
 CMAKE_CUDA_COMPILER          = ""

{ngsolve-6.2.2501.post83.dev1.dist-info → ngsolve-6.2.2503.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: ngsolve
-Version: 6.2.2501.post83.dev1
+Version: 6.2.2503
 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.2503
 Requires-Dist: mkl