Changeset 2200 for XIOS/trunk/src/node/mesh.cpp

Timestamp:

08/19/21 13:28:53 (3 years ago)

Author:

ymipsl

Message:

Bugs fix for UGRID convention output

• global indexation was not taking into account
• coherence problem in connectivity for node, edge and face mesh
• add UGRID testcase based on sphere cube

YM

File:

• XIOS/trunk/src/node/mesh.cpp (modified) (5 diffs)

XIOS/trunk/src/node/mesh.cpp

@@ -433 +433 @@
       node_lat = latvalue;
 
+      unsigned long nodeCount = nbNodes_;
+      unsigned long nodeStart, nbNodes;
+      MPI_Scan(&nodeCount, &nodeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm);
+      int nNodes = nodeStart;
+      MPI_Bcast(&nNodes, 1, MPI_UNSIGNED_LONG, mpiSize-1, comm);
+      nbNodesGlo = nNodes;
+
+      nodeStart -= nodeCount;
+      node_start = nodeStart;
+      node_count = nodeCount;
+
       // Global node indexes
       vector<size_t> hashValues(4);
@@ -441 +452 @@
         for (size_t nh = 0; nh < 4; ++nh)
         {
-          nodeHash2IdxGlo[hashValues[nh]].push_back(mpiRank*nbNodes_ + nn);
+          nodeHash2IdxGlo[hashValues[nh]].push_back(nodeStart + nn); 
         }
       }
       pNodeGlobalIndex = new CClientClientDHTSizet (nodeHash2IdxGlo, comm);
+
       nodesAreWritten = true;
     }
@@ -460 +472 @@
       unsigned long nbEdgesOnProc = nbEdges_;
       unsigned long nbEdgesAccum;
+      unsigned long nbEdgesGlo;
       MPI_Scan(&nbEdgesOnProc, &nbEdgesAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm);
+      nbEdgesGlo = nbEdgesAccum ;
+      MPI_Bcast(&nbEdgesGlo, 1, MPI_UNSIGNED_LONG, mpiSize-1, comm);
       nbEdgesAccum -= nbEdges_;
+      edge_start = nbEdgesAccum ;
+      edge_count = nbEdgesOnProc ;
 
       CClientClientDHTSizet::Index2VectorInfoTypeMap edgeHash2IdxGlo;
@@ -670 +687 @@
     } //nvertex = 2
 
-    else
+    else // nvertex > 2
     {
       nbFaces_ = bounds_lon.shape()[1];
@@ -1601 +1618 @@
   } // createMeshEpsilon
 
+
   ///----------------------------------------------------------------
   /*!