ngsolve 6.2.2404.post156.dev0__cp39-cp39-win_amd64.whl → 6.2.2406.post112.dev1__cp39-cp39-win_amd64.whl

netgen/include/parallelvector.hpp

@@ -7,16 +7,13 @@
 /* Date:   2007,2011                                                      */
 /* ************************************************************************/
 
-
-
-// #ifdef PARALLEL
+#include <vvector.hpp>
+#include <multivector.hpp>
+#include <paralleldofs.hpp>
 
 namespace ngla
 {
-  // using ngparallel::ParallelDofs;
-  // using ngla::ParallelDofs;
-
-
+  
   class NGS_DLL_HEADER ParallelBaseVector : virtual public BaseVector
   {
   protected:
@@ -24,8 +21,8 @@ namespace ngla
     shared_ptr<ParallelDofs> paralleldofs;    
     shared_ptr<BaseVector> local_vec;
     
-    Array<NG_MPI_Request> sreqs;
-    Array<NG_MPI_Request> rreqs;
+    mutable NgMPI_Requests sreqs;
+    mutable NgMPI_Requests rreqs;
 
   public:
     ParallelBaseVector ()
@@ -86,10 +83,10 @@ namespace ngla
     virtual void Distribute() const override = 0;
     // { cerr << "ERROR -- Distribute called for BaseVector, is not parallel" << endl; }
     
-    virtual void ISend ( int dest, NG_MPI_Request & request ) const;
+    virtual NgMPI_Request ISend ( int dest ) const;
     // virtual void Send ( int dest ) const;
     
-    virtual void IRecvVec ( int dest, NG_MPI_Request & request ) = 0;
+    virtual NgMPI_Request IRecvVec ( int dest ) = 0;
     // { cerr << "ERROR -- IRecvVec called for BaseVector, is not parallel" << endl; }
 
     // virtual void RecvVec ( int dest )
@@ -105,7 +102,6 @@ namespace ngla
 
 
 
-
   inline ParallelBaseVector * dynamic_cast_ParallelBaseVector (BaseVector * x)
   {
     // cout << "my dynamic * cast" << endl;
@@ -126,7 +122,7 @@ namespace ngla
       }
     return dynamic_cast<const ParallelBaseVector*> (x);
   }
-  
+
   inline ParallelBaseVector & dynamic_cast_ParallelBaseVector (BaseVector & x)
   {
     // cout << "my dynamic cast" << endl;
@@ -135,6 +131,7 @@ namespace ngla
       return dynamic_cast<ParallelBaseVector&> (**ax);
     return dynamic_cast<ParallelBaseVector&> (x);
   }
+
   inline const ParallelBaseVector & dynamic_cast_ParallelBaseVector (const BaseVector & x)
   {
     // cout << "my dynamic cast" << endl;
@@ -175,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;
@@ -192,7 +189,7 @@ namespace ngla
     virtual AutoVector Range (T_Range<size_t> range) const override;
     virtual AutoVector Range (DofRange range) const override;
     
-    virtual void  IRecvVec ( int dest, NG_MPI_Request & request ) override;
+    virtual NgMPI_Request IRecvVec ( int dest ) override;
     // virtual void  RecvVec ( int dest );
     virtual void AddRecvValues( int sender ) override;
     virtual AutoVector CreateVector () const override;
@@ -269,5 +266,4 @@ namespace ngla
   
 }
 
-// #endif
 #endif

netgen/include/pardisoinverse.hpp

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

netgen/include/periodic.hpp

@@ -80,6 +80,7 @@ namespace ngcomp
     { space->VTransformVC(ei, vec, tt); }    
 
     auto & GetVertexMap() const { return vertex_map; }
+    auto & GetDofMap() const { return dofmap; }    
   protected:
     // overload in quasiperiodic space
     virtual void DofMapped(size_t from, size_t to, size_t idnr) { ; }

netgen/include/pmltrafo.hpp

@@ -298,13 +298,16 @@ namespace ngcomp
     Complex alpha;
     public:
 
-    CartesianPML_Transformation(FlatMatrix<double> _bounds, Complex _alpha) 
-      : PML_TransformationDim<DIM>(), alpha(_alpha) 
+    CartesianPML_Transformation(Mat<DIM,2> _bounds, Complex _alpha) 
+      : PML_TransformationDim<DIM>(), bounds(_bounds), alpha(_alpha)
     {
+      /*
       bounds = 0.;
       for (int i : Range(min(int(_bounds.Height()),DIM)))
         for (int j : Range(min(int(_bounds.Width()),2)))
           bounds(i,j)=_bounds(i,j);
+      */
+      ;
     }
     
     ~CartesianPML_Transformation() {;}

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/scalarfe.hpp

@@ -288,6 +288,9 @@ namespace ngfem
     { 
       for (int i = 0; i < avnums.Size(); i++) vnums[i] = avnums[i]; 
     }
+    DGFiniteElement * SetVertexNumbers (FlatArray<int> vnums) override
+    { VertexOrientedFE<ET>::SetVertexNumbers(vnums); return this; }
+    
 
     /// assign vertex number
     void SetVertexNumber (int nr, int vnum) { vnums[nr] = vnum; }
@@ -301,7 +304,7 @@ namespace ngfem
     NGS_DLL_HEADER void CalcTraceMatrix (int facet, FlatMatrix<> trace) const;
     NGS_DLL_HEADER void CalcGradientMatrix (FlatMatrix<> gmat) const;
 
-    HD NGS_DLL_HEADER virtual void GetDiagMassMatrix (FlatVector<> mass) const;
+    HD NGS_DLL_HEADER virtual void GetDiagMassMatrix (FlatVector<> mass) const override;
 
     NGS_DLL_HEADER virtual void GetGradient (FlatVector<> coefs, FlatMatrixFixWidth<D> grad) const;
     NGS_DLL_HEADER virtual void GetGradientTrans (FlatMatrixFixWidth<D> grad, FlatVector<> coefs) const;

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
 {
 
@@ -149,6 +152,9 @@ namespace ngla
     void CalcBalancing ();
     const Partitioning & GetBalancing() const { return balance; } 
 
+    void EmbedHeight (size_t starti, size_t newheight);
+    void EmbedWidth (size_t starti, size_t newwidth);
+    
     ostream & Print (ostream & ost) const;
 
     virtual Array<MemoryUsage> GetMemoryUsage () const;    
@@ -233,9 +239,9 @@ namespace ngla
       return *this;
     }
 
-    virtual shared_ptr<BaseMatrix> CreateSparseMatrix() const override 
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override 
     {
-      return const_cast<BaseSparseMatrix*>(this)->shared_from_this();
+      return dynamic_pointer_cast<BaseSparseMatrix>(const_cast<BaseSparseMatrix*>(this)->shared_from_this());
     }
 
     virtual shared_ptr<BaseJacobiPrecond> CreateJacobiPrecond (shared_ptr<BitArray> inner = nullptr) const 
@@ -338,6 +344,8 @@ namespace ngla
     { 
       return asvec; 
     }
+
+    // tuple<int,int> EntryShape() const { return { entry_height, entry_width }; }
     
     FlatVector<TSCAL> GetRowValue (int row, int j)
     {
@@ -345,9 +353,10 @@ namespace ngla
       return FlatVector<TSCAL> (entry_size, p);
     }
     
-    FlatMatrix<TSCAL> GetRowValueMat (int row, int j)
+    FlatMatrix<TSCAL> GetRowValueMat (int row, int j) const
     {
-      TSCAL * p = asvec(entry_size * (firsti[row] + j)).Data(0);
+      // TSCAL * p = asvec(entry_size * (firsti[row] + j)).Data(0);
+      TSCAL * p = &asvec(entry_size * (firsti[row] + j));
       return FlatMatrix<TSCAL> (entry_height, entry_width, p);
     }
   };
@@ -552,7 +561,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;
@@ -613,37 +622,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;
@@ -790,24 +775,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<BaseMatrix> 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<BaseMatrix> 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
   {
@@ -234,6 +99,7 @@ namespace ngla
 
     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 shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;    
   };
 
 
@@ -273,6 +139,9 @@ namespace ngla
     shared_ptr<BaseMatrix> GetMatrix() const { return mat; }
     IntRange GetRange() const { return range; }
 
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
+    
+    
     /*
     virtual shared_ptr<BaseMatrix> CreateDeviceMatrix() const override
     {

netgen/include/statushandler.hpp

@@ -19,6 +19,13 @@ namespace ngstd
     static void SetTerminate(void);
     static void UnSetTerminate(void);
     static bool ShouldTerminate(void);
+
+    class Region
+    {
+    public:
+      Region(const char * str) { PushStatus(str); }
+      ~Region() { PopStatus(); }
+    };
   };
 
 }

netgen/include/symbolicintegrator.hpp

@@ -72,7 +72,8 @@ public:
 
   NGS_DLL_HEADER shared_ptr<ProxyFunction> Deriv() const;
   NGS_DLL_HEADER shared_ptr<ProxyFunction> Trace() const;
-  NGS_DLL_HEADER shared_ptr<ProxyFunction> Primary() const { return primaryproxy; }
+  NGS_DLL_HEADER shared_ptr<CoefficientFunction> Primary() const override
+  { return primaryproxy; }
   
   NGS_DLL_HEADER shared_ptr<ProxyFunction> Dt() const;  
   NGS_DLL_HEADER shared_ptr<ProxyFunction> AntiDt() const;