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

netgen/include/arnoldi.hpp

@@ -8,6 +8,9 @@
 /* Date:   5. Jul. 96                                                     */
 /**************************************************************************/
 
+
+#include "basematrix.hpp"
+
 namespace ngla
 {
   /**

netgen/include/basematrix.hpp

@@ -8,14 +8,21 @@
 /* Date:   25. Mar. 2000                                             */
 /*********************************************************************/
 
-namespace ngla
-{
 
+#include "basevector.hpp"
+#include "multivector.hpp"
+// #include "paralleldofs.hpp"
 
+namespace ngla
+{
+  class ParallelDofs;
+  
   // sets the solver which is used for InverseMatrix
   enum INVERSETYPE { PARDISO, PARDISOSPD, SPARSECHOLESKY, SUPERLU, SUPERLU_DIST, MUMPS, MASTERINVERSE, UMFPACK };
   extern string GetInverseName (INVERSETYPE type);
 
+  class BaseSparseMatrix;
+  
   /**
      The base for all matrices in the linalg.
   */
@@ -142,6 +149,16 @@ namespace ngla
     virtual INVERSETYPE SetInverseType ( INVERSETYPE ainversetype ) const;
     virtual INVERSETYPE SetInverseType ( string ainversetype ) const;
     virtual INVERSETYPE  GetInverseType () const;
+
+    typedef  std::function<shared_ptr<BaseMatrix>(shared_ptr<BaseMatrix>,
+                                                  shared_ptr<BitArray>,
+                                                  shared_ptr<const Array<int>>)> T_INVCREATOR;
+    mutable T_INVCREATOR invcreator;
+    void SetInverseCreator(T_INVCREATOR ainvcreator) const { invcreator = ainvcreator; }
+
+    static SymbolTable<T_INVCREATOR> invcreators;
+    static void RegisterInverseCreator(string name, T_INVCREATOR creator);
+    
     virtual void SetInverseFlags (const Flags & flags) { ; }
     virtual shared_ptr<BaseMatrix> DeleteZeroElements(double tol) const
     {
@@ -155,6 +172,8 @@ namespace ngla
     template <typename TSCAL>
       Matrix<TSCAL> ToDense() const;
 
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const;
+    
     // time per run
     double Timing (int runs = 10) const;
     
@@ -254,14 +273,6 @@ namespace ngla
     void AssignTo (TS s, BaseVector & v) const
     { 
       CheckSize (v);
-      /*
-      if (m.Height() != v.Size() || m.Width() != x.Size())
-	throw Exception (ToString ("matrix-vector: size does not fit\n") +
-                         "matrix-type = " + typeid(m).name() +
-			 "Matrix:     " + ToString(m.Height()) + " x " + ToString(m.Width()) + "\n"
-			 "Vector in : " + ToString(x.Size()) + "\n"
-			 "Vector res: " + ToString(v.Size()));
-      */
       m.Mult (x, v);
       v *= s;
     }
@@ -270,10 +281,6 @@ namespace ngla
     void AddTo (TS s, BaseVector & v) const
     { 
       CheckSize (v);
-      /*
-      if (m.Height() != v.Size() || m.Width() != x.Size())
-	throw Exception ("matrix-vector MultAdd: size does not fit");
-      */
       m.MultAdd (s, x, v);
     }
 
@@ -344,6 +351,8 @@ namespace ngla
     ///
     virtual bool IsComplex() const override { return bm.IsComplex(); }
     virtual BaseMatrix::OperatorInfo GetOperatorInfo () const override;
+
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
     
     virtual AutoVector CreateRowVector () const override { return bm.CreateColVector(); }
     virtual AutoVector CreateColVector () const override { return bm.CreateRowVector(); }
@@ -568,6 +577,8 @@ namespace ngla
       return ost;
     }
 
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
+    
     virtual shared_ptr<BaseMatrix> CreateDeviceMatrix() const override
     {
       return make_shared<ProductMatrix>(bma.CreateDeviceMatrix(), bmb.CreateDeviceMatrix());
@@ -689,7 +700,7 @@ namespace ngla
       bmb.MultAdd (Vector(b*alpha), x, y);
     }
 
-
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
     
     virtual int VHeight() const override
     {
@@ -810,6 +821,8 @@ namespace ngla
       info.childs += &bm;
       return info;
     }
+
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
     
     virtual shared_ptr<BaseMatrix> CreateDeviceMatrix() const override
     {
@@ -829,7 +842,6 @@ namespace ngla
   {
     bool has_format;
     size_t size;
-    // bool is_complex;
   public:
     ///
     IdentityMatrix ()
@@ -837,7 +849,6 @@ namespace ngla
     IdentityMatrix (size_t asize, bool ais_complex)
       : has_format(true), size(asize) { is_complex=ais_complex; }
     
-    // virtual bool IsComplex() const override { return is_complex; }
     virtual BaseMatrix::OperatorInfo GetOperatorInfo () const override;
     
     ///
@@ -908,7 +919,7 @@ namespace ngla
   };
 
   
-  /* *********************** operator<< ********************** */
+  /* *********************** operators  ********************** */
 
   // default is ProductMatrix, but optimizations for
   // ParallelMatrices
@@ -934,8 +945,8 @@ namespace ngla
 
   
   shared_ptr<BaseMatrix> TransposeOperator (shared_ptr<BaseMatrix> mat);
+
   
-  /// output operator for matrices
   inline ostream & operator<< (ostream & ost, const BaseMatrix & m)
   {
     return m.Print(ost);

netgen/include/basevector.hpp

@@ -7,13 +7,34 @@
 /* Date:   7. Feb. 2003                                              */
 /*********************************************************************/
 
-
+#include <bla.hpp>
+#include <core/mpi_wrapper.hpp>
+// #include "paralleldofs.hpp"
 
 namespace ngla
 {
+  using namespace ngbla;
+  
   class BaseVector;
   class AutoVector;
   class MultiVector;
+
+  class ParallelDofs;
+  
+  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) { ; }
+    DofRange (size_t end, shared_ptr<ParallelDofs> apardofs)
+      : T_Range<size_t>(0, end), pardofs(apardofs) { ; }
+    shared_ptr<ParallelDofs> GetParallelDofs() const { return pardofs; }
+  };
+  
+
+  
   
   template <class SCAL> class S_BaseVector;
 
@@ -91,9 +112,6 @@ namespace ngla
     size_t size;
     /// number of doubles per entry
     int entrysize = 1;
-    ///
-    // shared_ptr<ParallelDofs> paralleldofs;
-    
     ///
     BaseVector () { ; }
     
@@ -265,6 +283,7 @@ namespace ngla
     virtual void SetRandom ();
 
     inline AutoVector Range (size_t begin, size_t end) const;
+    inline AutoVector Range (size_t end) const;
     // { return Range(T_Range(begin, end)); }
     virtual AutoVector Range (T_Range<size_t> range) const;
     virtual AutoVector Range (DofRange range) const;
@@ -434,6 +453,7 @@ namespace ngla
     operator const BaseVector & () const { return *vec; }
 
     AutoVector Range (size_t begin, size_t end) const { return vec->Range(begin,end); }
+    AutoVector Range (size_t end) const { return vec->Range(0,end); }
     AutoVector Range (T_Range<size_t> range) const { return vec->Range(range); }
     
     template <typename T>
@@ -571,6 +591,11 @@ namespace ngla
     return Range(T_Range(begin, end));
   }
 
+  AutoVector BaseVector::Range (size_t end) const
+  {
+    return Range (0, end);
+  }
+  
 
   template <>
   inline FlatVector<double> BaseVector::FV<double> () const
@@ -651,72 +676,6 @@ namespace ngla
   extern template class S_BaseVector<Complex>;
 #endif
 
-  /*
-  template <class SCAL>
-  class NGS_DLL_HEADER S_BaseVector;
-
-
-  template <>
-  class NGS_DLL_HEADER S_BaseVector<double> : virtual public BaseVector
-  {
-  public:
-    S_BaseVector () throw () { ; }
-    virtual ~S_BaseVector() { ; }
-
-    S_BaseVector & operator= (double s);
-
-    virtual double InnerProduct (const BaseVector & v2) const;
-
-    virtual FlatVector<double> FVDouble () const;
-    virtual FlatVector<Complex> FVComplex () const;
-
-    virtual FlatVector<double> FVScal () const
-    {
-      return FlatVector<double> (size * entrysize, Memory());
-    }
-
-
-    virtual void GetIndirect (const FlatArray<int> & ind, 
-			      const FlatVector<double> & v) const;
-    virtual void GetIndirect (const FlatArray<int> & ind, 
-			      const FlatVector<Complex> & v) const;
-
-  };
-
-
-
-
-  template <>
-  class NGS_DLL_HEADER S_BaseVector<Complex> : virtual public BaseVector
-  {
-  public:
-    S_BaseVector () throw() { ; }
-    ~S_BaseVector () { ; }
-
-    virtual Complex InnerProduct (const BaseVector & v2) const;
-
-    virtual FlatVector<double> FVDouble () const throw();
-    virtual FlatVector<Complex> FVComplex () const throw();
-    virtual FlatVector<Complex> FVScal () const throw() 
-    {
-      return FlatVector<Complex> (size * entrysize/2, Memory());
-    }
-
-    virtual void GetIndirect (const FlatArray<int> & ind, 
-			      const FlatVector<double> & v) const;
-    virtual void GetIndirect (const FlatArray<int> & ind, 
-			      const FlatVector<Complex> & v) const;
-  };
-
-  */
-
-
-
-
-
-
-
-
 
 
 
@@ -821,14 +780,20 @@ namespace ngla
   };
 
 
-
+  /*
   inline VVecExpr<VSumExpr<VVecExpr<BaseVector>, VVecExpr<BaseVector> > >
   operator+ (const BaseVector & a, const BaseVector & b)
   {
     typedef VSumExpr<VVecExpr<BaseVector>, VVecExpr<BaseVector> > TRES;
     return TRES (a, b);
   }
+  */
+  inline auto operator+ (const BaseVector & a, const BaseVector & b)
+  {
+    return VVecExpr<VSumExpr<VVecExpr<BaseVector>,VVecExpr<BaseVector>>>{{a,b}};
+  }
 
+  /*
   template <class TA>
   inline VVecExpr<VSumExpr<VVecExpr<TA>, VVecExpr<BaseVector> > >
   operator+ (const VVecExpr<TA> & a, const BaseVector & b)
@@ -836,6 +801,13 @@ namespace ngla
     typedef VSumExpr<VVecExpr<TA>, VVecExpr<BaseVector> > TRES;
     return TRES (a, b);
   }
+  */
+  template <class TA>
+  inline auto operator+ (const VVecExpr<TA> & a, const BaseVector & b)
+  {
+    return VSumExpr<VVecExpr<TA>,VVecExpr<BaseVector>> (a,b);
+  }
+  
 
   template <class TB>
   inline VVecExpr<VSumExpr<VVecExpr<BaseVector>, VVecExpr<TB> > >

netgen/include/bdbequations.hpp

@@ -747,6 +747,11 @@ namespace ngfem
     {
       Cast(fel).CalcMappedDDShape(mip, Trans(mat));
     }
+
+    static shared_ptr<CoefficientFunction>
+    DiffShape (shared_ptr<CoefficientFunction> proxy,
+               shared_ptr<CoefficientFunction> dir,
+               bool eulerian);
   };
 
 
@@ -933,6 +938,11 @@ namespace ngfem
     using DiffOp<DiffOpHesseBoundary<D,FEL>>::AddTransSIMDIR;    
     static void AddTransSIMDIR (const FiniteElement & fel, const SIMD_BaseMappedIntegrationRule & bmir,
                                 BareSliceMatrix<SIMD<double>> x, BareSliceVector<double> y);
+
+    static shared_ptr<CoefficientFunction>
+    DiffShape (shared_ptr<CoefficientFunction> proxy,
+               shared_ptr<CoefficientFunction> dir,
+               bool eulerian);
   };
 
 
@@ -1884,7 +1894,7 @@ namespace ngfem
 
 
   template <int DIM_SPC, VorB VB = VOL>
-  class DiffOpIdVectorH1 : public DiffOp<DiffOpIdVectorH1<DIM_SPC> >
+  class DiffOpIdVectorH1 : public DiffOp<DiffOpIdVectorH1<DIM_SPC, VB> >
   {
   public:
     enum { DIM = 1 };
@@ -1949,7 +1959,7 @@ namespace ngfem
         }
     }
 
-    using DiffOp<DiffOpIdVectorH1<DIM_SPC>>::ApplySIMDIR;    
+    using DiffOp<DiffOpIdVectorH1<DIM_SPC, VB>>::ApplySIMDIR;
     static void ApplySIMDIR (const FiniteElement & bfel, const SIMD_BaseMappedIntegrationRule & mir,
                              BareSliceVector<double> x, BareSliceMatrix<SIMD<double>> y)
     {
@@ -1961,7 +1971,7 @@ namespace ngfem
         }
     }
 
-    using DiffOp<DiffOpIdVectorH1<DIM_SPC>>::AddTransSIMDIR;        
+    using DiffOp<DiffOpIdVectorH1<DIM_SPC, VB>>::AddTransSIMDIR;
     static void AddTransSIMDIR (const FiniteElement & bfel, const SIMD_BaseMappedIntegrationRule & mir,
                                 BareSliceMatrix<SIMD<double>> y, BareSliceVector<double> x)
     {
@@ -2703,6 +2713,7 @@ namespace ngfem
   extern template class NGS_DLL_HEADER T_DifferentialOperator<DiffOpIdVectorH1<1,BND> >;
   extern template class NGS_DLL_HEADER T_DifferentialOperator<DiffOpIdVectorH1<2,BND> >;
   extern template class NGS_DLL_HEADER T_DifferentialOperator<DiffOpIdVectorH1<3,BND> >;
+  extern template class NGS_DLL_HEADER T_DifferentialOperator<DiffOpIdVectorH1<3,BBND> >;
 
 
 

netgen/include/bilinearform.hpp

@@ -10,6 +10,9 @@
 
 #include "fespace.hpp"
 #include <specialelement.hpp>
+#include <sparsematrix.hpp>
+#include <elementbyelement.hpp>
+
 
 namespace ngcomp
 {
@@ -746,40 +749,6 @@ namespace ngcomp
 
 
 
-  template <class TM>
-  class NGS_DLL_HEADER T_BilinearFormDiagonal : public S_BilinearForm<typename mat_traits<TM>::TSCAL>
-  {
-
-  public:
-    typedef typename mat_traits<TM>::TSCAL TSCAL;
-    typedef typename mat_traits<TM>::TV_COL TV_COL;
-    typedef DiagonalMatrix<TM> TMATRIX;
-    shared_ptr<TMATRIX> mymatrix;
-    
-  protected:
-
-  public:
-    T_BilinearFormDiagonal (shared_ptr<FESpace> afespace, const string & aname,
-			    const Flags & flags);
-    virtual ~T_BilinearFormDiagonal ();
-
-    virtual void AllocateMatrix () override;
-
-    virtual void AddElementMatrix (FlatArray<int> dnums1,
-				   FlatArray<int> dnums2,
-				   BareSliceMatrix<TSCAL> elmat,
-				   ElementId id, bool addatomic, 
-				   LocalHeap & lh) override;
-
-    virtual void AddDiagElementMatrix (FlatArray<int> dnums1,
-				       FlatVector<TSCAL> diag,
-				       bool inner_element, int elnr,
-				       LocalHeap & lh) override;
-  };
-
-
-
-
 
   class ComponentBilinearForm : public BilinearForm
   {
@@ -953,17 +922,21 @@ namespace ngcomp
     Array<ProxyFunction*> trialproxies;
     
     typedef void (*lib_function)(size_t nip, double * input, size_t dist_input,
-                                 double * output, size_t dist_output);
+                                 double * output, size_t dist_output,
+                                 size_t dist, double * points, double * normals);
 
     unique_ptr<SharedLibrary> library;
     lib_function compiled_function = nullptr;
     
     size_t dimx, dimy;
     size_t nip;
+    Matrix<double> points;
+    Matrix<double> normals;
     
   public:
     ApplyIntegrationPoints (Array<shared_ptr<CoefficientFunction>> acoefs,
                             const Array<ProxyFunction*> & atrialproxies,
+                            Matrix<double> apoints, Matrix<double> anormals,
                             size_t adimx, size_t adimy, size_t anip);
     
     AutoVector CreateColVector() const override;
@@ -983,30 +956,6 @@ namespace ngcomp
   
 
   
-
-  /**
-     This bilinearform stores the element-matrices
-   */
-  template<class SCAL>
-  class ElementByElement_BilinearForm : public S_BilinearForm<SCAL>
-  {
-  public:
-    ElementByElement_BilinearForm (shared_ptr<FESpace> afespace, 
-                                   const string & aname,
-                                   const Flags & flags);
-    virtual ~ElementByElement_BilinearForm () override;
-    
-    virtual void AllocateMatrix () override;
-    // virtual AutoVector CreateRowVector() const override;
-    // virtual AutoVector CreateColVector() const override;
-    
-    virtual void AddElementMatrix (FlatArray<int> dnums1,
-                                   FlatArray<int> dnums2,
-                                   BareSliceMatrix<SCAL> elmat,
-                                   ElementId id, bool addatomic,
-                                   LocalHeap & lh) override;    
-  };
-  
   
   
 }

netgen/include/blockjacobi.hpp

@@ -7,6 +7,9 @@
 /* Date:   06. Oct. 96                                                     */
 /* *************************************************************************/
 
+
+#include "sparsematrix.hpp"
+
 namespace ngla
 {
 
@@ -172,6 +175,7 @@ namespace ngla
       return { MemoryUsage ("BlockJac", nels*sizeof(TM), blocktable->Size()) };
     }
 
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;
     const Array<FlatMatrix<TM>> & GetInverses() const { return invdiag; }
     const Array<TM> & MatrixData() const { return bigmem; } 
   };

netgen/include/cg.hpp

@@ -8,6 +8,9 @@
 /* Date:   5. Jul. 96                                                     */
 /**************************************************************************/
 
+
+#include "basematrix.hpp"
+
 namespace ngla
 {
 

netgen/include/chebyshev.hpp

@@ -7,6 +7,9 @@
 /* Date:   30. Jun. 01                                                    */
 /**************************************************************************/
 
+
+#include "basematrix.hpp"
+
 namespace ngla
 {
 

netgen/include/coefficient.hpp

@@ -291,7 +291,9 @@ namespace ngfem
     virtual shared_ptr<CoefficientFunction>
       DiffJacobi (const CoefficientFunction * var, T_DJC & cache) const;
 
-    
+
+    // returns primary operator
+    virtual shared_ptr<CoefficientFunction> Primary () const;
     virtual shared_ptr<CoefficientFunction> Operator (const string & name) const;
     virtual shared_ptr<CoefficientFunction> Operator (shared_ptr<class DifferentialOperator> diffop) const;
     
@@ -1186,6 +1188,7 @@ public:
     if(transformation.replace.count(thisptr))
       return transformation.replace[thisptr];
     auto newcf = make_shared<cl_UnaryOpCF>(c1->Transform(transformation), lam, name);
+    newcf->SetDimensions(BASE::Dimensions());
     transformation.cache[thisptr] = newcf;
     return newcf;
   }
@@ -1782,7 +1785,8 @@ INLINE shared_ptr<CoefficientFunction> BinaryOpCF(shared_ptr<CoefficientFunction
 
   
   NGS_DLL_HEADER shared_ptr<CoefficientFunction>
-  MakeDomainWiseCoefficientFunction (Array<shared_ptr<CoefficientFunction>> aci);
+  MakeDomainWiseCoefficientFunction (Array<shared_ptr<CoefficientFunction>> aci,
+                                     optional<VorB> vb=nullopt);
   
 
 

netgen/include/comp.hpp

@@ -39,10 +39,6 @@ namespace ngmg
 
 
 #include <parallelngs.hpp>
-namespace ngcomp
-{
-  using namespace ngparallel;
-}
 
 
 // #include "pmltrafo.hpp"