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

Timestamp:

07/13/16 17:56:22 (8 years ago)

Author:

oabramkina

Message:

Sequential version of new functionalities for mesh connectivity:

edge_faces
face_edges
face_face.

File:

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

XIOS/trunk/src/node/mesh.hpp

@@ -9 +9 @@
  
 #include "array_new.hpp"
-#include "client_client_dht_template.hpp"
+#include "client_client_dht_template_impl.hpp"
+#include "dht_auto_indexing.hpp"
 
 namespace xios {
@@ -35 +36 @@
       int nbFaces;
       int nvertex;  
-      
+
       bool nodesAreWritten;
       bool edgesAreWritten;
@@ -50 +51 @@
       CArray<double, 1> face_lat;
       CArray<int, 2> face_nodes;
+      CArray<int, 2> face_edges;
+      CArray<int, 2> edge_faces;
+      CArray<int, 2> face_faces;
 
       void createMesh(const CArray<double, 1>&, const CArray<double, 1>&, 
             const CArray<double, 2>&, const CArray<double, 2>& );
                         
-      void createMeshEpsilon(const CArray<double, 1>&, const CArray<double, 1>&,
+      void createMeshEpsilon(const MPI_Comm&, const CArray<double, 1>&, const CArray<double, 1>&,
             const CArray<double, 2>&, const CArray<double, 2>& );
             
@@ -62 +66 @@
 
       static std::map <StdString, CMesh> meshList;
+      vector<size_t> createHashes (double, double);
 
-      size_t nodeIndex (double, double);      
-      boost::unordered_map <size_t, size_t> hashed_map_nodes;
-      boost::unordered_map <pair<double,double>, int> map_nodes;
-      boost::unordered_map <pair<int,int>, int> map_edges;
+      size_t nodeIndex (double, double);                           // redundant in parallel version with epsilon precision
+      boost::unordered_map <size_t, size_t> hashed_map_nodes;      // redundant in parallel version with epsilon precision
+      boost::unordered_map <pair<double,double>, int> map_nodes;   // redundant in parallel version with epsilon precision
+      boost::unordered_map <pair<int,int>, int> map_edges;         // redundant in parallel version with epsilon precision
 
   };