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

netgen/include/finiteelement.hpp

@@ -71,7 +71,7 @@ namespace ngfem
     /// the name of the element family
     virtual string ClassName() const;
 
-    virtual void SetVertexNumbers (FlatArray<int> vnums);
+    virtual FiniteElement * SetVertexNumbers (FlatArray<int> vnums);
     
     virtual IntegrationRule GetIR (int order) const;
 
@@ -103,13 +103,12 @@ namespace ngfem
   {
   protected:
     /// pointers to the components
-    // ArrayMem<const FiniteElement*,10> fea;
-    FlatArray<const FiniteElement*> fea;
+    FlatArray<FiniteElement*> fea;
     bool all_the_same{true};
 
   public:
     /// initialize with pointers to components, copy pointers
-    CompoundFiniteElement (FlatArray<const FiniteElement*> afea);
+    CompoundFiniteElement (FlatArray<FiniteElement*> afea);
 
     HD virtual ELEMENT_TYPE ElementType() const override { return fea[0]->ElementType(); }
     /// number of components
@@ -130,10 +129,11 @@ namespace ngfem
     /// the name of the element family
     virtual string ClassName() const override { return "CompoundFiniteElement"; }
     
-    virtual void SetVertexNumbers (FlatArray<int> vnums) override
+    virtual CompoundFiniteElement * SetVertexNumbers (FlatArray<int> vnums) override
     {
       for (auto pfel : fea)
-        const_cast<FiniteElement*>(pfel) -> SetVertexNumbers(vnums);
+        pfel -> SetVertexNumbers(vnums);
+      return this;
     }
 
     HD virtual bool ComplexShapes() const override;
@@ -174,7 +174,7 @@ namespace ngfem
     /// the name of the element family
     virtual string ClassName() const override { return "VectorFiniteElement"; }
 
-    virtual void SetVertexNumbers (FlatArray<int> vnums) override;
+    virtual VectorFiniteElement * SetVertexNumbers (FlatArray<int> vnums) override;
 
     virtual void Print (ostream & ost) const override;
 

netgen/include/h1amg.hpp

@@ -1,7 +1,9 @@
 #ifndef H1AMG_HPP_
 #define H1AMG_HPP_
 
-#include <la.hpp>
+// #include <la.hpp>
+#include <basematrix.hpp>
+#include <sparsematrix.hpp>
 
 namespace ngcomp
 {

netgen/include/hcurlhdivfes.hpp

@@ -9,6 +9,8 @@
 
 
 #include "fespace.hpp"
+#include <sparsematrix.hpp>
+
 
 namespace ngcomp
 {

netgen/include/hcurlhofespace.hpp

@@ -9,6 +9,7 @@
 
 #include "fespace.hpp"
 #include "h1hofespace.hpp"
+#include <sparsematrix.hpp>
 
 namespace ngcomp
 {
@@ -23,7 +24,7 @@ namespace ngcomp
   protected:
 
     typedef short TORDER;
-
+    
     // Level
     int level;
     Array<DofId> first_edge_dof;

netgen/include/intrule.hpp

@@ -436,7 +436,7 @@ namespace ngfem
     INLINE SCAL operator() (int i) const { return point(i); }
 
     ///
-    INLINE const Vec<R,SCAL> GetNV () const { return normalvec; }
+    INLINE const Vec<R,SCAL> & GetNV () const { return normalvec; }
     /// 
     INLINE void SetNV ( Vec<R,SCAL> vec) { normalvec = vec; }
     ///
@@ -1481,6 +1481,7 @@ namespace ngfem
     int DimSpace() const;
     
     virtual SliceMatrix<> GetPoints() const = 0;
+    virtual SliceMatrix<> GetNormals() const = 0;    
     virtual SliceMatrix<Complex> GetPointsComplex() const
     { throw Exception("don't have complex ir"); }
     virtual void ComputeNormalsAndMeasure (ELEMENT_TYPE et) { throw Exception ("ComputeNormalsAndMeasure(ET) not overloaded"); }
@@ -1551,6 +1552,13 @@ namespace ngfem
                             const_cast<double*> (&mips[0].GetPoint()(0)));
     }
 
+    virtual SliceMatrix<> GetNormals() const
+    {
+      return SliceMatrix<> (mips.Size(), DIM_SPACE*sizeof(SCAL)/sizeof(double),
+                            sizeof(MappedIntegrationPoint<DIM_ELEMENT, DIM_SPACE, SCAL>) / sizeof(double),
+                            const_cast<double*> (&mips[0].GetNV()(0)));
+    }
+
     virtual void ComputeNormalsAndMeasure (ELEMENT_TYPE et);
     virtual void ComputeNormalsAndMeasure (ELEMENT_TYPE et, int facetnr);
     virtual bool IsComplex() const { return false; } 
@@ -1616,6 +1624,12 @@ namespace ngfem
                                    const_cast<Complex*> (&mips[0].GetPointComplex()(0)));
     }
 
+    virtual SliceMatrix<> GetNormals() const
+    {
+      throw Exception("never tested");
+    }
+    
+
     virtual void ComputeNormalsAndMeasure (ELEMENT_TYPE et, int facetnr);
     virtual bool IsComplex() const { return true; }     
   };

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;
   
@@ -1357,21 +1354,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/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)
+      : es(dim), complex(iscomplex), ndof(adist_procs.Size())
     { ; }
     
     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"

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