ngsolve 6.2.2406__cp310-cp310-win_amd64.whl → 6.2.2406.post111.dev1__cp310-cp310-win_amd64.whl

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

@@ -25,6 +25,7 @@ namespace ngfem
     virtual IntRange UsedDofs(const FiniteElement & fel) const override { return IntRange(0, fel.GetNDof()); }
 
     virtual bool operator== (const TPDifferentialOperator & diffop2) const { return false; }
+    virtual bool operator== (const DifferentialOperator & diffop2) const override { return false; }
     
     shared_ptr<DifferentialOperator> & GetEvaluators( int num)
     {

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
 {
 

netgen/include/vector.hpp

@@ -338,7 +338,12 @@ namespace ngbla
     {
       NETGEN_CHECK_RANGE(next,first,Size()+1);
       return VectorView<T,size_t,TDIST> (next-first, dist, data+first*dist);
-    }    
+    }
+
+    INLINE auto Range (size_t next) const
+    {
+      return Range(0, next);
+    }
     
     INLINE auto Range (IntRange range) const
     {

netgen/include/vvector.hpp

@@ -1,3 +1,8 @@
+#ifndef FILE_VVECTOR
+#define FILE_VVECTOR
+
+#include "basevector.hpp"
+
 namespace ngla
 {
 
@@ -13,7 +18,7 @@ namespace ngla
   {
   protected:
     TSCAL * pdata;
-    int es;
+    int es;    // entry size in in term of TSCALs
     bool ownmem;
     
   public:
@@ -197,3 +202,7 @@ namespace ngla
   extern template class VVector<double>;
   extern template class VVector<Complex>;
 }
+
+
+
+#endif

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2406")
+set(PACKAGE_VERSION "6.2.2406-111-g5c9ac9808")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..

ngsolve/config/config.py

@@ -30,15 +30,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE  = "netgen/include"
 NGSOLVE_INSTALL_DIR_CMAKE    = "ngsolve/cmake"
 NGSOLVE_INSTALL_DIR_RES      = "share"
 
-NGSOLVE_VERSION = "6.2.2406"
-NGSOLVE_VERSION_GIT = "v6.2.2406-0-g6f16aa5a2"
-NGSOLVE_VERSION_PYTHON = "6.2.2406"
+NGSOLVE_VERSION = "6.2.2406-111-g5c9ac9808"
+NGSOLVE_VERSION_GIT = "v6.2.2406-111-g5c9ac9808"
+NGSOLVE_VERSION_PYTHON = "6.2.2406.post111.dev1"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "0"
+NGSOLVE_VERSION_TWEAK = "111"
 NGSOLVE_VERSION_PATCH = "2406"
-NGSOLVE_VERSION_HASH = "g6f16aa5a2"
+NGSOLVE_VERSION_HASH = "g5c9ac9808"
 
 CMAKE_CXX_COMPILER           = "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/config.py

@@ -30,15 +30,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE  = "netgen/include"
 NGSOLVE_INSTALL_DIR_CMAKE    = "ngsolve/cmake"
 NGSOLVE_INSTALL_DIR_RES      = "share"
 
-NGSOLVE_VERSION = "6.2.2406"
-NGSOLVE_VERSION_GIT = "v6.2.2406-0-g6f16aa5a2"
-NGSOLVE_VERSION_PYTHON = "6.2.2406"
+NGSOLVE_VERSION = "6.2.2406-111-g5c9ac9808"
+NGSOLVE_VERSION_GIT = "v6.2.2406-111-g5c9ac9808"
+NGSOLVE_VERSION_PYTHON = "6.2.2406.post111.dev1"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "0"
+NGSOLVE_VERSION_TWEAK = "111"
 NGSOLVE_VERSION_PATCH = "2406"
-NGSOLVE_VERSION_HASH = "g6f16aa5a2"
+NGSOLVE_VERSION_HASH = "g5c9ac9808"
 
 CMAKE_CXX_COMPILER           = "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/demos/intro/poisson.py

@@ -2,7 +2,7 @@
 # with Dirichlet boundary condition u = 0
 
 from ngsolve import *
-from netgen.geom2d import unit_square
+# from netgen.geom2d import unit_square
 
 ngsglobals.msg_level = 1
 

ngsolve/demos/mpi/mpi_navierstokes.py

@@ -4,6 +4,8 @@ from netgen.geom2d import SplineGeometry
 
 from ngsolve import *
 
+SetNumThreads(1)  
+
 from mpi4py.MPI import COMM_WORLD as comm
 rank = comm.rank
 np = comm.size

ngsolve/demos/mpi/mpi_timeDG.py

@@ -7,12 +7,15 @@
 
 # circular convection; time-DG with skeleton-formulation
 
+
 from netgen.geom2d import unit_square
 import netgen.meshing
 
 
 from ngsolve import *
 
+SetNumThreads(1)
+
 from mpi4py.MPI import COMM_WORLD as comm
 rank = comm.rank
 np = comm.size

{ngsolve-6.2.2406.dist-info → ngsolve-6.2.2406.post111.dev1.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: ngsolve
-Version: 6.2.2406
+Version: 6.2.2406.post111.dev1
 Summary: NGSolve
 Author: The NGSolve team
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: netgen-mesher==6.2.2406
+Requires-Dist: netgen-mesher==6.2.2406.post118.dev0
 Requires-Dist: mkl