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

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/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()));
@@ -1281,6 +1254,12 @@ namespace ngcomp
   MakeTrafoCF(shared_ptr<CoefficientFunction> func,
               shared_ptr<CoefficientFunction> trafo,
               Region region);
+
+
+  NGS_DLL_HEADER
+  shared_ptr<CoefficientFunction> NumElsOnFacetCF ();
+  
+
   
   /**
      Controls the progress - output.
@@ -1348,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
 {