Changeset 931 for XIOS/trunk/src/node/mesh.hpp

Timestamp:

09/20/16 16:48:07 (8 years ago)

Author:

oabramkina

Message:

Mesh connectivity:

Functions for determining local and global face-to-face connectivity added. Both types of neighboring cells (those that share a node or those that share an edge) are considered.

File:

• XIOS/trunk/src/node/mesh.hpp (modified) (2 diffs)

XIOS/trunk/src/node/mesh.hpp

@@ -64 +64 @@
                              const CArray<double, 2>&, const CArray<double, 2>& );
 
-      void getDomainExtended(const int, const MPI_Comm&,
+      void getGlobalNghbFaces(const int, const MPI_Comm&, const CArray<int, 1>&,
                               const CArray<double, 2>&, const CArray<double, 2>&,
                               CArray<int, 2>&);
+
+      void getLocalNghbFaces(const int, const CArray<int, 1>&,
+                             const CArray<double, 2>&, const CArray<double, 2>&,
+                             CArray<int, 2>&, CArray<int, 1>&);
             
       static CMesh* getMesh(StdString, int);
@@ -80 +84 @@
       CClientClientDHTSizet* pNodeGlobalIndex;                    // pointer to a map <nodeHash, nodeIdxGlo>
       CClientClientDHTSizet* pEdgeGlobalIndex;                    // pointer to a map <edgeHash, edgeIdxGlo>
-      void getNghbFacesNodeType(const MPI_Comm&, const CArray<double, 2>&, const CArray<double, 2>&, CArray<int, 2>&);
-      void getNghbFacesEdgeType(const MPI_Comm&, const CArray<double, 2>&, const CArray<double, 2>&, CArray<int, 2>&);
+      void getGloNghbFacesNodeType(const MPI_Comm&, const CArray<int, 1>&, const CArray<double, 2>&, const CArray<double, 2>&, CArray<int, 2>&);
+      void getGloNghbFacesEdgeType(const MPI_Comm&, const CArray<int, 1>&, const CArray<double, 2>&, const CArray<double, 2>&, CArray<int, 2>&);
+      void getLocNghbFacesNodeType(const CArray<int, 1>&, const CArray<double, 2>&, const CArray<double, 2>&, CArray<int, 2>&, CArray<int, 1>&);
+      void getLocNghbFacesEdgeType(const CArray<int, 1>&, const CArray<double, 2>&, const CArray<double, 2>&, CArray<int, 2>&, CArray<int, 1>&);
 
       vector<size_t> createHashes (const double, const double);