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

Timestamp:

09/09/16 16:57:43 (8 years ago)

Author:

oabramkina

Message:

Mesh connectivity:

Fixing a bug for UGRID in case meshes containing cells with different number of vertexes.

Function for determining face neighbors of a local domain added.

File:

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

XIOS/trunk/src/node/mesh.hpp

@@ -57 +57 @@
       CArray<int, 2> face_faces;
 
-      void createMesh(const CArray<double, 1>&, const CArray<double, 1>&, 
+      void createMesh(const CArray<double, 1>&, const CArray<double, 1>&,
                       const CArray<double, 2>&, const CArray<double, 2>& );
                         
@@ -63 +63 @@
                              const CArray<double, 1>&, const CArray<double, 1>&,
                              const CArray<double, 2>&, const CArray<double, 2>& );
+
+      void getDomainExtended(const int, const MPI_Comm&,
+                              const CArray<double, 2>&, const CArray<double, 2>&,
+                              CArray<int, 2>&);
             
       static CMesh* getMesh(StdString, int);
@@ -68 +72 @@
     private:
 
-      int nbNodes;
-      int nbEdges;
-      int nbFaces;
+      int nbNodes_;
+      int nbEdges_;
+      int nbFaces_;
 
       static std::map <StdString, CMesh> meshList;
@@ -76 +80 @@
       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>&);
 
       vector<size_t> createHashes (const double, const double);