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

netgen/include/matrix.hpp

@@ -243,11 +243,21 @@ namespace ngbla
       return FlatMatrix (next-first, w, data+first*w);
     }
 
+    INLINE FlatMatrix Rows (size_t next) const
+    {
+      return FlatMatrix (next, w, data);
+    }
+
     INLINE SliceMatrix<T> Cols (size_t first, size_t next) const
     {
       return SliceMatrix<T> (h, next-first, w, data+first);
     }
 
+    INLINE SliceMatrix<T> Cols (size_t next) const
+    {
+      return SliceMatrix<T> (h, next, w, data);
+    }
+
     INLINE FlatMatrix Rows (IntRange range) const
     {
       return FlatMatrix (range.Next()-range.First(), w, data+range.First()*w);
@@ -1356,6 +1366,12 @@ namespace ngbla
         return MatrixView<T,ORD,TH,size_t,TDIST>  (h, next-first, Dist(), Addr(0,first));
     }
 
+    INLINE auto Cols (size_t next) const
+    {
+      return Cols(0, next);
+    }
+
+    
     INLINE auto Rows (size_t first, size_t next) const
     {
       if constexpr (ORD==RowMajor)
@@ -1369,6 +1385,11 @@ namespace ngbla
       return Rows (range.First(), range.Next());
     }
 
+    INLINE auto Rows (size_t next) const
+    {
+      return Rows (0, next);
+    }
+
     template <int R>
     INLINE auto Rows() const
     {

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;
   
@@ -158,30 +155,6 @@ namespace ngcomp
     INLINE auto end () const { return DimElementIterator<VB,DIM>(ma, r.Next()); }
   };
 
-  /*
-  class NodeIterator
-  {
-    NodeId ni;
-  public:
-    NodeIterator (NodeId ani) : ni(ani) { ; }
-    NodeIterator operator++ () { return NodeIterator(++ni); }
-    INLINE NodeId operator*() const { return ni; }
-    bool operator!=(NodeIterator id2) const { return ni != id2.ni; }
-    bool operator==(NodeIterator id2) const { return ni == id2.ni; }
-  };
-
-  class NodeRange : public IntRange
-  {
-    NODE_TYPE nt;
-  public:
-    NodeRange (NODE_TYPE ant, IntRange ar) 
-      : IntRange(ar), nt(ant) { ; } 
-    NodeIterator begin () const { return NodeIterator(NodeId(nt,IntRange::First())); }
-    NodeIterator end () const { return NodeIterator(NodeId(nt,IntRange::Next())); }
-    NodeId operator[] (size_t nr) { return NodeId(nt, IntRange::First()+nr); }
-  };
-  */
-
   /** 
       Access to mesh topology and geometry.
 
@@ -240,14 +213,18 @@ namespace ngcomp
 
     /// store periodic vertex mapping for each identification number
     // shared ptr because Meshaccess is copy constructible
+    /*
     shared_ptr<Array<Array<IVec<2>>>> periodic_node_pairs[3] = {make_shared<Array<Array<IVec<2>>>>(),
                                                                make_shared<Array<Array<IVec<2>>>>(),
                                                                make_shared<Array<Array<IVec<2>>>>()};
+    */
+    Array<Array<IVec<2>>> periodic_node_pairs[3];
 
     DynamicTable<size_t> neighbours[4][4];
     friend class Region;
   public:
     SimpleSignal updateSignal;
+    static std::true_type shallow_archive;
 
     /// for achiving ...
     MeshAccess ();
@@ -661,7 +638,7 @@ namespace ngcomp
     
     void SetDeformation (shared_ptr<GridFunction> def = nullptr);
 
-    const shared_ptr<GridFunction> & GetDeformation () const
+    shared_ptr<GridFunction> GetDeformation () const
     {
       return deformation;
     }
@@ -816,15 +793,6 @@ namespace ngcomp
     void GetFaceEdges (int fnr, Array<int> & edges) const;
     INLINE auto GetFaceEdges (size_t fnr) const
     { return ArrayObject(mesh.GetFaceEdges(fnr)); }
-    /*
-    {
-      ArrayMem<int,4> f2ed;
-      GetFaceEdges (fnr, f2ed);
-      f2ed.NothingToDelete(); // dynamic allocation never needed
-      return f2ed;
-    }
-    */
-    
     void GetEdgeFaces (int enr, Array<int> & faces) const;
     /// returns elements connected to a face
     void GetFaceElements (int fnr, Array<int> & elnums) const;
@@ -910,7 +878,6 @@ namespace ngcomp
     }
 
 
-    // void GetVertexElements (int vnr, Array<int> & elnrs) const;
     /// element order stored in Netgen
     int GetElOrder (int enr) const
     { return mesh.GetElementOrder (enr+1); } 
@@ -1052,11 +1019,11 @@ namespace ngcomp
 	}
     }
     
-
+    /*
     // (old style optimization)
     [[deprecated("functionality not useful anymore, just remove function call!")]]            
     void SetPointSearchStartElement(const int el) const;
-
+    */
 
     
     ElementId FindElementOfPoint (FlatVector<double> point,
@@ -1082,6 +1049,7 @@ namespace ngcomp
     { return GetElement(ElementId(VOL,elnr)).is_curved; }
       // { return bool (Ng_IsElementCurved (elnr+1)); }
 
+    /*
     [[deprecated("Use GetPeriodicNodes(NT_VERTEX, pairs) instead!")]]
     void GetPeriodicVertices ( Array<IVec<2> > & pairs) const;
     [[deprecated("Use GetNPeriodicNodes(NT_VERTEX) instead!")]]
@@ -1099,10 +1067,11 @@ namespace ngcomp
     void GetPeriodicEdges (int idnr, Array<IVec<2> > & pairs) const;
     [[deprecated("Use GetPeriodicNodes(NT_EDGE, idnr).Size() instead")]]
     int GetNPairsPeriodicEdges (int idnr) const;
-
+    */
+    
     int GetNPeriodicIdentifications() const
     {
-      return periodic_node_pairs[NT_VERTEX]->Size();
+      return periodic_node_pairs[NT_VERTEX].Size();
     }
     // get number of all periodic nodes of nodetype nt
     size_t GetNPeriodicNodes(NODE_TYPE nt) const;
@@ -1146,9 +1115,10 @@ namespace ngcomp
 
     // void PrecomputeGeometryData(int intorder);
 
+    /*
     void InitPointCurve(double red = 1, double green = 0, double blue = 0) const;
     void AddPointCurvePoint(const Vec<3> & point) const;
-
+    */
 
     
     template <int DIMS, int DIMR> friend class Ng_ElementTransformation;
@@ -1168,10 +1138,11 @@ namespace ngcomp
        Returns the global number of the node.
        Currently, this function works only for vertex-nodes.
      */
-
+    /*
     [[deprecated("should not need global numbers")]]                    
     size_t GetGlobalNodeNum (NodeId node) const;
-
+    */
+    
     size_t GetGlobalVertexNum (int locnum) const;
     
     FlatArray<int> GetDistantProcs (NodeId node) const
@@ -1228,6 +1199,8 @@ namespace ngcomp
     operator const BitArray & () const { return *mask; }
     shared_ptr<BitArray> MaskPtr() { return mask; }
     const shared_ptr<MeshAccess> & Mesh() const { return mesh; }
+    void DoArchive(Archive& ar)
+    { ar & mesh & vb & mask; }
     Region operator+ (const Region & r2) const
     {
       return Region (mesh, vb, BitArray(*mask).Or(r2.Mask()));
@@ -1354,21 +1327,21 @@ namespace ngcomp
       for (auto p : GetDistantProcs(Node(nt, i)))
         dist_data[p][cnt[p]++] = data[i];
 
-    Array<NG_MPI_Request> requests;
+    NgMPI_Requests requests;
     for (auto i : cnt.Range())
       if (cnt[i])
 	{
-	  requests.Append (comm.ISend(dist_data[i], i, NG_MPI_TAG_SOLVE));
-	  requests.Append (comm.IRecv(recv_data[i], i, NG_MPI_TAG_SOLVE));
+	  requests += comm.ISend(dist_data[i], i, NG_MPI_TAG_SOLVE);
+	  requests += comm.IRecv(recv_data[i], i, NG_MPI_TAG_SOLVE);
 	}
-    MyMPI_WaitAll (requests);
+    requests.WaitAll();
     
     cnt = 0;
-    NG_MPI_Datatype type = GetMPIType<T>();
+    auto type = GetMPIType<T>();
     for (auto i : Range(GetNNodes(nt)))
       for (auto p : GetDistantProcs(Node(nt, i)))
         NG_MPI_Reduce_local (&recv_data[p][cnt[p]++],
-                          &data[i], 1, type, op);
+                             &data[i], 1, type, op);
   }
 
 

netgen/include/mgpre.hpp

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

netgen/include/mptools.hpp

@@ -813,7 +813,6 @@ c
       scale = newscale;
     }
 
-    
     template <typename TARGET>
     void Transform (MultiPole<TARGET> & target, Vec<3> dist) const
     {
@@ -2095,12 +2094,12 @@ c
     template <typename TARGET>
     void ShiftZ (double z, MultiPole<TARGET> & target) { mp.ShiftZ(z, target); }
 
+    using CoefficientFunction::Transform;        
     template <typename TARGET>
     void Transform (MultiPoleCF<TARGET> & target)
     {
       mp.Transform (target.MP(), target.Center()-center);
     }
-    
   };
 
   

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

@@ -29,8 +29,11 @@ namespace ngfem
     using ET_trait<ET>::PolDimension;
     using ET_trait<ET>::PolBubbleDimension;
 
+    
   public:
     using VertexOrientedFE<ET>::SetVertexNumbers;    
+    NodalHOFE * SetVertexNumbers (FlatArray<int> vnums) override
+    { VertexOrientedFE<ELEMENT_TYPE(ET)>::SetVertexNumbers(vnums); return this; }   // cast for msvc ?
     using ET_trait<ET>::ElementType;
 
     /// builds a functional element of order aorder.

netgen/include/normalfacetfespace.hpp

@@ -25,8 +25,8 @@ namespace ngcomp
     Array<IVec<2> > order_facet;
     Array<bool> fine_facet;
 
-    int ndof;
-    Array<int> ndlevel;
+    // int ndof;
+    // Array<int> ndlevel;
     bool var_order;
     bool print;
 
@@ -51,9 +51,8 @@ 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 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;
 

netgen/include/normalfacetsurfacefespace.hpp

@@ -25,7 +25,7 @@ namespace ngcomp
     int ndof;
     Array<int> ndlevel;
     bool var_order;
-    bool print;
+    bool print = false;
 
     
   public:

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
 
   /**
@@ -54,7 +58,7 @@ namespace ngla
        Table adist_procs must provide the distant processes for each dof.
        table 
      */
-    ParallelDofs (NG_MPI_Comm acomm, Table<int> && adist_procs, 
+    ParallelDofs (NgMPI_Comm acomm, Table<int> && adist_procs, 
 		  int dim = 1, bool iscomplex = false);
 
     shared_ptr<ParallelDofs> SubSet (shared_ptr<BitArray> take_dofs) const;
@@ -131,9 +135,9 @@ namespace ngla
     bool complex;
     BitArray masterdofs;
   public:
-    ParallelDofs (NG_MPI_Comm acomm, Table<int> && adist_procs, 
+    ParallelDofs (NgMPI_Comm acomm, Table<int> && adist_procs, 
 		  int dim = 1, bool iscomplex = false)
-      : es(dim), complex(iscomplex)
+      : ndof(adist_procs.Size()), es(dim), complex(iscomplex)
     { ; }
     
     int GetNDofLocal () const { return ndof; }
@@ -174,42 +178,41 @@ namespace ngla
   };
   
 #endif
+  
 
-
-
+  
   template <typename T>
+  [[deprecated("use pardofs.ReduceDofData")]]
   void ReduceDofData (FlatArray<T> data, NG_MPI_Op op, const shared_ptr<ParallelDofs> & pardofs)
   {
     if (pardofs)
       pardofs->ReduceDofData(data, op);
   }
-
+  
   template <typename T>
+  [[deprecated("use pardofs.ScatterDofData")]]   
   void ScatterDofData (FlatArray<T> data, const shared_ptr<ParallelDofs> & pardofs)
   {
     if (pardofs)
       pardofs->ScatterDofData (data);
   }
-
+  
   template <typename T>
+  [[deprecated("use pardofs.AllReduceDofData")]]
   void AllReduceDofData (FlatArray<T> data, NG_MPI_Op op, 
 			 const shared_ptr<ParallelDofs> & pardofs)
   {
     if (pardofs)
       pardofs->AllReduceDofData (data, op);
   }
-
-
+  
 
 
 #ifdef PARALLEL
 
   template <typename T>
-  void ParallelDofs::ReduceDofData (FlatArray<T> data, NG_MPI_Op op) const
+  void ParallelDofs :: ReduceDofData (FlatArray<T> data, NG_MPI_Op op) const
   {
-    // if (this == NULL)  // illformed C++, shall get rid of this
-    // throw Exception("ReduceDofData for null-object");
-    
     static Timer t0("ParallelDofs :: ReduceDofData");
     RegionTimer rt(t0);
 
@@ -224,53 +227,48 @@ 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())
+        {
+          if (rank < dps[0])
+            for (auto p : dps)
+              nrecv[p]++;
+          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];
 
-    Array<NG_MPI_Request> requests; 
+    NgMPI_Requests send_requests; 
+    NgMPI_Requests recv_requests; 
     for (int i = 0; i < ntasks; i++)
       {
 	if (nsend[i])
-	  requests.Append (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.Append (comm.IRecv(recv_data[i], i, NG_MPI_TAG_SOLVE));
+	  recv_requests += comm.IRecv(recv_data[i], i, NG_MPI_TAG_SOLVE);
       }
 
-    MyMPI_WaitAll (requests);
-
     Array<int> cnt(ntasks);
     cnt = 0;
     
     NG_MPI_Datatype type = GetMPIType<T>();
+
+    recv_requests.WaitAll();
     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);
-	}
+        for (auto p : GetDistantProcs (i))
+          NG_MPI_Reduce_local (&recv_data[p][cnt[p]++], &data[i], 1, type, op);
+
+    send_requests.WaitAll();    
   }    
 
 
@@ -293,18 +291,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)
-	  nsend[p]++;
-      else
-	nrecv[master]++;
-    }
-    */
     for (int i = 0; i < GetNDofLocal(); i++) 
       if (auto dps = GetDistantProcs(i); dps.Size() > 0)
         {
@@ -320,48 +306,25 @@ namespace ngla
 
     /** 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(rank==master)
-	for(auto p:dps)
-	  send_data[p][nsend[p]++] = data[i];
-    }
-    */
     for (int i = 0; i < GetNDofLocal(); i++) 
       if (auto dps = GetDistantProcs(i); dps.Size() > 0)
         if (rank < dps[0])
           for (auto p : dps)
             send_data[p][nsend[p]++] = data[i];
     
-    Array<NG_MPI_Request> requests;
+    NgMPI_Requests requests;
     for (int i = 0; i < ntasks; i++)
       {
 	if (nsend[i])
-	  requests.Append (comm.ISend (send_data[i], i, NG_MPI_TAG_SOLVE));
+	  requests += comm.ISend (send_data[i], i, NG_MPI_TAG_SOLVE);
 	if (nrecv[i])
-	  requests.Append (comm.IRecv (recv_data[i], i, NG_MPI_TAG_SOLVE));
+	  requests += comm.IRecv (recv_data[i], i, NG_MPI_TAG_SOLVE);
       }
-
-    MyMPI_WaitAll (requests);
+    requests.WaitAll();
 
     Array<int> cnt(ntasks);
     cnt = 0;
 
-    /*
-    for (int i = 0; i < GetNDofLocal(); i++)
-      if (!IsMasterDof(i))
-	{
-	  FlatArray<int> distprocs = GetDistantProcs (i);
-	  
-	  int master = ntasks;
-	  for (int j = 0; j < distprocs.Size(); j++)
-	    master = min (master, distprocs[j]);
-	  data[i] = recv_data[master][cnt[master]++];
-	}
-    */
     for (int i = 0; i < GetNDofLocal(); i++)
       if (!IsMasterDof(i))
 	{
@@ -372,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"