ngsolve 6.2.2406.post36.dev1__cp312-cp312-macosx_10_15_universal2.whl → 6.2.2406.post57.dev1__cp312-cp312-macosx_10_15_universal2.whl

netgen/include/jacobi.hpp

@@ -7,6 +7,9 @@
 /* Date:   06. Oct. 96                                                    */
 /* *************************************************************************/
 
+
+#include "sparsematrix.hpp"
+
 namespace ngla
 {
 

netgen/include/la.hpp

@@ -2,15 +2,6 @@
 #define FILE_NGLA
 
 #include <bla.hpp>
-#include <core/mpi_wrapper.hpp>
-
-/*
-namespace ngcomp
-{
-  class Preconditioner;
-  class LocalPreconditioner;
-}
-*/
 
 /** namespace for linear algebra.
  */
@@ -33,13 +24,10 @@ namespace ngla
 #include "order.hpp"
 #include "sparsecholesky.hpp"
 #include "pardisoinverse.hpp"
-// include these only from c++-files
-// #include "umfpackinverse.hpp"
-// #include "superluinverse.hpp"
-// #include "mumpsinverse.hpp"
 #include "jacobi.hpp"
 #include "blockjacobi.hpp"
 #include "commutingAMG.hpp"
+#include "diagonalmatrix.hpp"
 #include "special_matrix.hpp"
 #include "elementbyelement.hpp"
 #include "cg.hpp"

netgen/include/meshaccess.hpp

@@ -9,8 +9,6 @@
 
 
 #include <nginterface_v2.hpp>
-#include <core/ranges.hpp>
-
 #include <elementtopology.hpp>
 
 namespace ngfem
@@ -26,7 +24,6 @@ namespace ngcomp
 {
   class PML_Transformation;
   
-  // using ngcore::INT;
   using netgen::Ng_Node;
   using ngfem::ELEMENT_TYPE;
   

netgen/include/mgpre.hpp

@@ -9,7 +9,7 @@
 /*********************************************************************/
 
 #include <bilinearform.hpp>
-#include <la.hpp>
+// #include <la.hpp>
 
 namespace ngmg
 {

netgen/include/multivector.hpp

@@ -7,6 +7,8 @@
 /* Date:   June 2020                                                 */
 /*********************************************************************/
 
+#include "basevector.hpp"
+
 namespace ngla {
 
   /* TODO: 

netgen/include/ngsobject.hpp

@@ -2,7 +2,7 @@
 #define FILE_NGSOBJECT
 
 /*********************************************************************/
-/* File:   ngsobject.hh                                              */
+/* File:   ngsobject.hpp                                             */
 /* Author: Joachim Schoeberl                                         */
 /* Date:   2. Aug. 2000                                              */
 /*********************************************************************/

netgen/include/order.hpp

@@ -2,7 +2,7 @@
 #define FILE_ORDER
 
 /* *************************************************************************/
-/* File:   order.hh                                                       */
+/* File:   order.hpp                                                      */
 /* Author: Joachim Schoeberl                                              */
 /* Date:   18. Jun. 97                                                    */
 /* *************************************************************************/
@@ -10,6 +10,8 @@
 
 namespace ngla
 {
+  using namespace ngcore;
+  using namespace ngstd;  
 
   /*
     reordering for sparse cholesky factoriztion

netgen/include/parallel_matrices.hpp

@@ -7,6 +7,11 @@
 /* Date:   2007,2011                                                      */
 /* ************************************************************************/
 
+
+#include <basematrix.hpp>
+#include <sparsematrix.hpp>
+#include <paralleldofs.hpp>
+
 namespace ngla
 {
 

netgen/include/paralleldofs.hpp

@@ -8,10 +8,14 @@
 /**************************************************************************/
 
 
+#include <core/mpi_wrapper.hpp>
+#include <ngstd.hpp>
 
 namespace ngla
 {
+  using namespace ngstd;
 
+  
 #ifdef PARALLEL
 
   /**
@@ -133,7 +137,7 @@ namespace ngla
   public:
     ParallelDofs (NgMPI_Comm acomm, Table<int> && adist_procs, 
 		  int dim = 1, bool iscomplex = false)
-      : es(dim), complex(iscomplex)
+      : es(dim), complex(iscomplex), ndof(adist_procs.Size())
     { ; }
     
     int GetNDofLocal () const { return ndof; }
@@ -223,18 +227,6 @@ namespace ngla
     nrecv = 0;
 
     /** Count send/recv size **/
-    /*
-    for (int i = 0; i < GetNDofLocal(); i++) {
-      auto dps = GetDistantProcs(i);
-      if(!dps.Size()) continue;
-      int master = min2(rank, dps[0]);
-      if(rank==master)
-	for(auto p:dps)
-	  nrecv[p]++;
-      else
-	nsend[master]++;
-    }
-    */
     for (int i = 0; i < GetNDofLocal(); i++)
       if (auto dps = GetDistantProcs(i); dps.Size())
         {
@@ -244,55 +236,39 @@ namespace ngla
           else
             nsend[dps[0]]++;
         }
-
     
     Table<T> send_data(nsend);
     Table<T> recv_data(nrecv);
 
     /** Fill send_data **/
     nsend = 0;
-    /*
-    for (int i = 0; i < GetNDofLocal(); i++) {
-      auto dps = GetDistantProcs(i);
-      if(!dps.Size()) continue;
-      int master = min2(rank, dps[0]);
-      if(master!=rank)
-	send_data[master][nsend[master]++] = data[i];
-    }
-    */
     for (int i = 0; i < GetNDofLocal(); i++)
       if (auto dps = GetDistantProcs(i); dps.Size())
         if (rank > dps[0])
           send_data[dps[0]][nsend[dps[0]]++] = data[i];
 
-    NgMPI_Requests requests; 
+    NgMPI_Requests send_requests; 
+    NgMPI_Requests recv_requests; 
     for (int i = 0; i < ntasks; i++)
       {
 	if (nsend[i])
-	  requests += comm.ISend(send_data[i], i, NG_MPI_TAG_SOLVE);
+	  send_requests += comm.ISend(send_data[i], i, NG_MPI_TAG_SOLVE);
 	if (nrecv[i])
-	  requests += comm.IRecv(recv_data[i], i, NG_MPI_TAG_SOLVE);
+	  recv_requests += comm.IRecv(recv_data[i], i, NG_MPI_TAG_SOLVE);
       }
-    requests.WaitAll();
 
     Array<int> cnt(ntasks);
     cnt = 0;
     
     NG_MPI_Datatype type = GetMPIType<T>();
-    /*
-    for (int i = 0; i < GetNDofLocal(); i++)
-      if (IsMasterDof(i))
-	{
-	  FlatArray<int> distprocs = GetDistantProcs (i);
-	  for (int j = 0; j < distprocs.Size(); j++)
-	    NG_MPI_Reduce_local (&recv_data[distprocs[j]][cnt[distprocs[j]]++], 
-                                 &data[i], 1, type, op);
-	}
-    */
+
+    recv_requests.WaitAll();
     for (int i = 0; i < GetNDofLocal(); i++)
       if (IsMasterDof(i))
         for (auto p : GetDistantProcs (i))
           NG_MPI_Reduce_local (&recv_data[p][cnt[p]++], &data[i], 1, type, op);
+
+    send_requests.WaitAll();    
   }    
 
 
@@ -359,20 +335,6 @@ namespace ngla
 
 #endif //PARALLEL
 
-
-  class DofRange : public T_Range<size_t>
-  {
-    shared_ptr<ParallelDofs> pardofs;
-  public:
-    DofRange () { }
-    DofRange (T_Range<size_t> range, shared_ptr<ParallelDofs> apardofs)
-      : T_Range<size_t>(range), pardofs(apardofs) { ; }
-    shared_ptr<ParallelDofs> GetParallelDofs() const { return pardofs; }
-  };
-  
-
 }
 
-
-
 #endif

netgen/include/parallelngs.hpp

@@ -1,6 +1,7 @@
 #ifndef FILE_PARALLELNGS
 #define FILE_PARALLELNGS
 
+/*
 #include <ngstd.hpp>
 #include <la.hpp>
 
@@ -9,7 +10,7 @@ namespace ngparallel
   using namespace ngstd;
   using namespace ngla;
 }
-
+*/
 
 #include "parallelvector.hpp"
 #include "parallel_matrices.hpp"

netgen/include/parallelvector.hpp

@@ -7,10 +7,13 @@
 /* Date:   2007,2011                                                      */
 /* ************************************************************************/
 
-
+#include <vvector.hpp>
+#include <multivector.hpp>
+#include <paralleldofs.hpp>
 
 namespace ngla
 {
+  
   class NGS_DLL_HEADER ParallelBaseVector : virtual public BaseVector
   {
   protected:
@@ -169,7 +172,7 @@ namespace ngla
     using ParallelBaseVector :: sreqs;
     using ParallelBaseVector :: rreqs;
 
-    Table<SCAL> * recvvalues;
+    Table<SCAL> recvvalues;
 
     using S_BaseVectorPtr<TSCAL> :: pdata;
     using ParallelBaseVector :: local_vec;

netgen/include/pardisoinverse.hpp

@@ -15,6 +15,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#include "sparsecholesky.hpp"  // for SparseFactorization
 
 namespace ngla
 {

netgen/include/preconditioner.hpp

@@ -7,8 +7,10 @@
 /* Date:   10. Jul. 2000                                             */
 /*********************************************************************/
 
-#include <la.hpp>
+// #include <la.hpp>
+#include <basematrix.hpp>
 #include <mgpre.hpp>
+#include <chebyshev.hpp>
 
 namespace ngcomp
 {

netgen/include/sparsecholesky.hpp

@@ -11,6 +11,10 @@
   sparse cholesky factorization
 */
 
+#include "basematrix.hpp"
+#include "sparsematrix.hpp"
+#include "order.hpp"
+
 namespace ngla
 {
 

netgen/include/sparsematrix.hpp

@@ -8,6 +8,9 @@
 /**************************************************************************/
 
 
+#include "vvector.hpp"
+#include "basematrix.hpp"
+
 namespace ngla
 {
 
@@ -555,7 +558,7 @@ namespace ngla
     virtual tuple<int,int> EntrySizes() const override { return { ngbla::Height<TM>(), ngbla::Width<TM>() }; }
     
     shared_ptr<BaseSparseMatrix>
-      CreateTransposeTM (const function<shared_ptr<SparseMatrixTM<decltype(Trans(TM()))>>(const Array<int>&, int)> & creator) const;
+      CreateTransposeTM (const function<shared_ptr<SparseMatrixTM<decltype(ngbla::Trans(TM()))>>(const Array<int>&, int)> & creator) const;
 
   public:
     using BaseMatrix::GetMemoryTracer;
@@ -616,37 +619,13 @@ namespace ngla
     { return { string("SparseMatrix")+typeid(TM).name(), this->Height(), this->Width() }; }
     
     virtual shared_ptr<BaseJacobiPrecond>
-      CreateJacobiPrecond (shared_ptr<BitArray> inner) const override
-    {
-      // if constexpr(mat_traits<TM>::HEIGHT != mat_traits<TM>::WIDTH) return nullptr;
-      if constexpr(ngbla::Height<TM>() != ngbla::Width<TM>()) return nullptr;
-      else if constexpr(ngbla::Height<TM>() > MAX_SYS_DIM) {
-	  throw Exception(string("MAX_SYS_DIM = ")+to_string(MAX_SYS_DIM)+string(", need ")+to_string(mat_traits<TM>::HEIGHT));
-	  return nullptr;
-	}
-      else return make_shared<JacobiPrecond<TM,TV_ROW,TV_COL>> (*this, inner);
-    }
+      CreateJacobiPrecond (shared_ptr<BitArray> inner) const override;
     
     virtual shared_ptr<BaseBlockJacobiPrecond>
       CreateBlockJacobiPrecond (shared_ptr<Table<int>> blocks,
                                 const BaseVector * constraint = 0,
                                 bool parallel = 1,
-                                shared_ptr<BitArray> freedofs = NULL) const override
-    { 
-      // if constexpr(mat_traits<TM>::HEIGHT != mat_traits<TM>::WIDTH) return nullptr;
-      if constexpr(ngbla::Height<TM>() != ngbla::Width<TM>()) return nullptr;
-      else if constexpr(ngbla::Height<TM>() > MAX_SYS_DIM) {
-	  throw Exception(string("MAX_SYS_DIM = ")+to_string(MAX_SYS_DIM)+string(", need ")+to_string(ngbla::Height<TM>()));
-	  return nullptr;
-	}
-      else
-        // return make_shared<BlockJacobiPrecond<TM,TV_ROW,TV_COL>> (*this, blocks, parallel);
-
-        return make_shared<BlockJacobiPrecond<TM,TV_ROW,TV_COL>>
-          ( dynamic_pointer_cast<const SparseMatrix>
-            (this->shared_from_this()),
-            blocks, parallel);
-    }
+                                shared_ptr<BitArray> freedofs = NULL) const override;
 
     virtual shared_ptr<BaseMatrix> InverseMatrix (shared_ptr<BitArray> subset = nullptr) const override;
     virtual shared_ptr<BaseMatrix> InverseMatrix (shared_ptr<const Array<int>> clusters) const override;
@@ -793,24 +772,12 @@ namespace ngla
       this->AddElementMatrixSymmetric (dnums1, elmat, use_atomic);
     }
     
-    virtual shared_ptr<BaseJacobiPrecond> CreateJacobiPrecond (shared_ptr<BitArray> inner) const override
-    { 
-      return make_shared<JacobiPrecondSymmetric<TM,TV>> (*this, inner);
-    }
-
+    virtual shared_ptr<BaseJacobiPrecond> CreateJacobiPrecond (shared_ptr<BitArray> inner) const override;
     virtual shared_ptr<BaseBlockJacobiPrecond>
       CreateBlockJacobiPrecond (shared_ptr<Table<int>> blocks,
                                 const BaseVector * constraint = 0,
                                 bool parallel  = 1,
-                                shared_ptr<BitArray> freedofs = NULL) const override
-    { 
-      // return make_shared<BlockJacobiPrecondSymmetric<TM,TV>> (*this, blocks);
-      return make_shared<BlockJacobiPrecondSymmetric<TM,TV>>
-        ( dynamic_pointer_cast<const SparseMatrixSymmetric>
-          (this->shared_from_this()),
-          blocks);
-    }
-
+                                shared_ptr<BitArray> freedofs = NULL) const override;
 
     virtual shared_ptr<BaseSparseMatrix> Restrict (const SparseMatrixTM<double> & prol,
 					 shared_ptr<BaseSparseMatrix> cmat = nullptr) const override;

netgen/include/sparsematrix_dyn.hpp

@@ -8,6 +8,8 @@
 /**************************************************************************/
 
 
+#include "sparsematrix.hpp"
+
 namespace ngla
 {
 

netgen/include/sparsematrix_impl.hpp

@@ -155,6 +155,44 @@ namespace ngla
     : SparseMatrixTM<TM> (std::move(agraph))
   { ; }
  
+
+
+  template <class TM, class TV_ROW, class TV_COL>  
+  shared_ptr<BaseJacobiPrecond> SparseMatrix<TM,TV_ROW,TV_COL> :: 
+  CreateJacobiPrecond (shared_ptr<BitArray> inner) const
+  {
+    // if constexpr(mat_traits<TM>::HEIGHT != mat_traits<TM>::WIDTH) return nullptr;
+    if constexpr(ngbla::Height<TM>() != ngbla::Width<TM>()) return nullptr;
+    else if constexpr(ngbla::Height<TM>() > MAX_SYS_DIM) {
+      throw Exception(string("MAX_SYS_DIM = ")+to_string(MAX_SYS_DIM)+string(", need ")+to_string(mat_traits<TM>::HEIGHT));
+      return nullptr;
+    }
+    else return make_shared<JacobiPrecond<TM,TV_ROW,TV_COL>> (*this, inner);
+  }
+  
+  template <class TM, class TV_ROW, class TV_COL>    
+  shared_ptr<BaseBlockJacobiPrecond> SparseMatrix<TM,TV_ROW,TV_COL> :: 
+  CreateBlockJacobiPrecond (shared_ptr<Table<int>> blocks,
+                            const BaseVector * constraint,
+                            bool parallel,
+                            shared_ptr<BitArray> freedofs) const
+  { 
+    // if constexpr(mat_traits<TM>::HEIGHT != mat_traits<TM>::WIDTH) return nullptr;
+    if constexpr(ngbla::Height<TM>() != ngbla::Width<TM>()) return nullptr;
+    else if constexpr(ngbla::Height<TM>() > MAX_SYS_DIM) {
+      throw Exception(string("MAX_SYS_DIM = ")+to_string(MAX_SYS_DIM)+string(", need ")+to_string(ngbla::Height<TM>()));
+      return nullptr;
+    }
+    else
+      // return make_shared<BlockJacobiPrecond<TM,TV_ROW,TV_COL>> (*this, blocks, parallel);
+      
+      return make_shared<BlockJacobiPrecond<TM,TV_ROW,TV_COL>>
+        ( dynamic_pointer_cast<const SparseMatrix>
+          (this->shared_from_this()),
+          blocks, parallel);
+  }
+  
+
   
   template <class TM, class TV_ROW, class TV_COL>
   void SparseMatrix<TM,TV_ROW,TV_COL> ::
@@ -602,7 +640,7 @@ namespace ngla
   
   template <class TM>
   shared_ptr<BaseSparseMatrix> SparseMatrixTM<TM> ::
-  CreateTransposeTM (const function<shared_ptr<SparseMatrixTM<decltype(Trans(TM()))>>(const Array<int>&,int)> & creator) const
+  CreateTransposeTM (const function<shared_ptr<SparseMatrixTM<decltype(ngbla::Trans(TM()))>>(const Array<int>&,int)> & creator) const
   {
     Array<int> cnt(this->Width());
     cnt = 0;
@@ -750,7 +788,34 @@ namespace ngla
   {
     ; 
   }
+  
+
+  template <class TM, class TV>
+  shared_ptr<BaseJacobiPrecond>
+  SparseMatrixSymmetric<TM,TV> :: CreateJacobiPrecond (shared_ptr<BitArray> inner) const 
+  { 
+    return make_shared<JacobiPrecondSymmetric<TM,TV>> (*this, inner);
+  }
+  
 
+  template <class TM, class TV>  
+  shared_ptr<BaseBlockJacobiPrecond>
+  SparseMatrixSymmetric<TM,TV> :: CreateBlockJacobiPrecond (shared_ptr<Table<int>> blocks,
+                                                            const BaseVector * constraint,
+                                                            bool parallel,
+                                                            shared_ptr<BitArray> freedofs) const
+  { 
+    // return make_shared<BlockJacobiPrecondSymmetric<TM,TV>> (*this, blocks);
+    return make_shared<BlockJacobiPrecondSymmetric<TM,TV>>
+      ( dynamic_pointer_cast<const SparseMatrixSymmetric>
+        (this->shared_from_this()),
+        blocks);
+  }
+  
+
+
+
+  
   template <class TM, class TV>
   void SparseMatrixSymmetric<TM,TV> :: 
   MultAdd (double s, const BaseVector & x, BaseVector & y) const

netgen/include/special_matrix.hpp

@@ -7,147 +7,12 @@
 /* Date:   14 Mar. 02                                                     */
 /* ************************************************************************/
 
+#include "basematrix.hpp"
+#include "vvector.hpp"
+
 namespace ngla
 {
 
-
-  class NGS_DLL_HEADER Projector : public BaseMatrix
-  {
-    shared_ptr<BitArray> bits;
-    bool keep_values;
-  public:
-    // projector on true / false bits
-    Projector (shared_ptr<BitArray> abits, bool akeep_values = true)
-      : bits(abits), keep_values(akeep_values) { ; }
-    
-    virtual bool IsComplex() const override { return false; } 
-
-    virtual int VHeight() const override { return bits->Size(); }
-    virtual int VWidth() const override { return bits->Size(); }
-
-    virtual void Mult (const BaseVector & x, BaseVector & y) const override;    
-    virtual void MultTrans (const BaseVector & x, BaseVector & y) const override;
-    virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;    
-    virtual void MultTransAdd (double s, const BaseVector & x, BaseVector & y) const override;
-    virtual void Project (BaseVector & x) const;
-    virtual void SetValues (BaseVector & x, double val) const;
-
-    bool KeepValues() const { return keep_values; }
-    shared_ptr<BitArray> Mask() const { return bits; }
-
-    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
-    
-    AutoVector CreateRowVector() const override
-    { throw Exception("CreateRowVector not implemented for Projector!"); }
-    AutoVector CreateColVector() const override
-    { throw Exception("CreateColVector not implemented for Projector!"); }
-
-    AutoVector Evaluate(BaseVector & v) const override
-    {
-      auto res = v.CreateVector();
-      Mult (v, res);
-      return res;
-    }
-    
-  };
-
-
-  template <typename TM=double>
-  class NGS_DLL_HEADER DiagonalMatrix : public BaseMatrix
-  {
-    shared_ptr<VVector<TM>> diag;
-  public:
-    // typedef typename mat_traits<TM>::TV_ROW TV_ROW;
-    // typedef typename mat_traits<TM>::TV_COL TV_COL;
-    typedef typename mat_traits<TM>::TSCAL TSCAL;
-    
-    DiagonalMatrix(size_t h)
-      : diag(make_shared<VVector<TM>>(h)) { }
-    DiagonalMatrix(const VVector<TM> & diag_)
-      : diag(make_shared<VVector<TM>>(diag_)) { } 
-    DiagonalMatrix(shared_ptr<VVector<TM>> diag_)
-      : diag(diag_) { } 
-    
-    bool IsComplex() const override { return false; } 
-    TM & operator() (size_t i) { return (*diag)(i); }
-    const TM & operator() (size_t i) const { return (*diag)(i); }
-    int VHeight() const override { return diag->Size(); }
-    int VWidth() const override { return diag->Size(); }
-
-    BaseVector & AsVector() override { return *diag; }
-    const BaseVector & AsVector() const override { return *diag; }
-    ostream & Print (ostream & ost) const override;
-
-    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
-    
-    AutoVector CreateRowVector () const override;
-    AutoVector CreateColVector () const override;
-
-    void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;    
-    void MultTransAdd (double s, const BaseVector & x, BaseVector & y) const override;
-
-    shared_ptr<BaseMatrix> InverseMatrix (shared_ptr<BitArray> subset = nullptr) const override;
-  };
-
-
-  template <typename TM=double>  
-  class BlockDiagonalMatrix : public BaseMatrix
-  {
-    Tensor<3,TM> blockdiag;  
-    int blocks, dimy, dimx;
-  public:
-    // typedef double TSCAL;
-    
-    BlockDiagonalMatrix(Tensor<3,TM> _blockdiag);
-    bool IsComplex() const override { return ngbla::IsComplex<TM>(); } 
-
-    int VHeight() const override { return blocks*dimy; }
-    int VWidth() const override { return blocks*dimx; }
-
-    ostream & Print (ostream & ost) const override;
-    
-    AutoVector CreateRowVector () const override;
-    AutoVector CreateColVector () const override;
-
-    void Mult (const BaseVector & x, BaseVector & y) const override;    
-    void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;    
-    void MultTransAdd (double s, const BaseVector & x, BaseVector & y) const override;
-
-    shared_ptr<BaseMatrix> InverseMatrix (shared_ptr<BitArray> subset = nullptr) const override;
-  };
-
-  // blocks is inner-most dimension of tensor and vectors
-  class BlockDiagonalMatrixSoA : public BaseMatrix
-  {
-    Tensor<3> blockdiag;  
-    int blocks, dimy, dimx;
-    Matrix<double> nonzero;
-  public:
-    typedef double TSCAL;
-    
-    BlockDiagonalMatrixSoA(Tensor<3> _blockdiag);
-    bool IsComplex() const override { return false; } 
-
-    int VHeight() const override { return blocks*dimy; }
-    int VWidth() const override { return blocks*dimx; }
-
-    ostream & Print (ostream & ost) const override;
-    virtual BaseMatrix::OperatorInfo GetOperatorInfo () const override;
-    
-    AutoVector CreateRowVector () const override;
-    AutoVector CreateColVector () const override;
-
-    void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;    
-    void MultTransAdd (double s, const BaseVector & x, BaseVector & y) const override;
-    // shared_ptr<BaseMatrix> InverseMatrix (shared_ptr<BitArray> subset = nullptr) const override;
-
-    FlatTensor<3> GetBlockDiag () const { return blockdiag; }
-    FlatMatrix<double> GetNonZeroPattern() const { return nonzero; }
-  };
-
-
-  
-
   // Convert RowMajor to ColMajor matrix (stored as vector)
   class TransposeVector : public BaseMatrix
   {

netgen/include/tpintrule.hpp

@@ -46,6 +46,8 @@ namespace ngfem
     { throw Exception("TPMappedIntegrationRule::Range not implemented"); }
     virtual SliceMatrix<> GetPoints() const
     { throw Exception("TPMappedIntegrationRule::GetPoints not implemented"); }
+    virtual SliceMatrix<> GetNormals() const
+    { throw Exception("TPMappedIntegrationRule::GetNormals not implemented"); }
     virtual void ComputeNormalsAndMeasure (ELEMENT_TYPE et, int facetnr)
     { throw Exception("TPMappedIntegrationRule::ComputeNormalsAndMeasure not implemented"); }
     virtual bool IsComplex() const

netgen/include/umfpackinverse.hpp

@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <umfpack.h>
-
+#include "sparsecholesky.hpp"   // for SparseFactorization
 namespace ngla
 {