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

Timestamp:

09/02/16 09:41:27 (8 years ago)

Author:

oabramkina

Message:

Parallel version of UGRID norms.

The following connectivity parameters have been implemented:

edge_nodes
face_nodes
face_edges
edge_faces
face_faces.

Test with a regular(structured) quadrilateral mesh (test_regular) has been added.

File:

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

XIOS/trunk/src/node/mesh.hpp

@@ -9 +9 @@
  
 #include "array_new.hpp"
-#include "client_client_dht_template_impl.hpp"
 #include "dht_auto_indexing.hpp"
 
@@ -32 +31 @@
       ~CMesh(void);
     
-      int nbNodes;
-      int nbEdges;
-      int nbFaces;
-      int nvertex;  
+      int nbNodesGlo;
+      int nbEdgesGlo;
+
+      int node_start;
+      int node_count;
+      int edge_start;
+      int edge_count;
 
       bool nodesAreWritten;
@@ -56 +58 @@
 
       void createMesh(const CArray<double, 1>&, const CArray<double, 1>&, 
-            const CArray<double, 2>&, const CArray<double, 2>& );
+                      const CArray<double, 2>&, const CArray<double, 2>& );
                         
-      void createMeshEpsilon(const MPI_Comm&, const CArray<double, 1>&, const CArray<double, 1>&,
-            const CArray<double, 2>&, const CArray<double, 2>& );
+      void createMeshEpsilon(const MPI_Comm&,
+                             const CArray<double, 1>&, const CArray<double, 1>&,
+                             const CArray<double, 2>&, const CArray<double, 2>& );
             
-      static CMesh* getMesh(StdString);
+      static CMesh* getMesh(StdString, int);
 
     private:
 
+      int nbNodes;
+      int nbEdges;
+      int nbFaces;
+
       static std::map <StdString, CMesh> meshList;
-      vector<size_t> createHashes (double, double);
+      static std::map <StdString, vector<int> > domainList;
+      CClientClientDHTSizet* pNodeGlobalIndex;                    // pointer to a map <nodeHash, nodeIdxGlo>
+      CClientClientDHTSizet* pEdgeGlobalIndex;                    // pointer to a map <edgeHash, edgeIdxGlo>
+
+      vector<size_t> createHashes (const double, const double);
 
       size_t nodeIndex (double, double);                           // redundant in parallel version with epsilon precision