Changeset 2250 for XIOS/trunk

Timestamp:

10/25/21 14:34:40 (3 years ago)

Author:

ymipsl

Message:

Fix issue for Ugrid convention output.

YM

Location:

XIOS/trunk/src/node

Files:

• file.cpp (modified) (3 diffs)
• mesh.cpp (modified) (12 diffs)

XIOS/trunk/src/node/file.cpp

@@ -876 +876 @@
      std::vector<int> domainNvertices;
      std::vector<StdString> domainNames;
-     std::map<string, tuple<CDomain*,CDomain*,CDomain*>> registeredDomains ;
+     std::map<string, tuple<set<CDomain*>,set<CDomain*>,set<CDomain*>>> registeredDomains ;
 
      for (int i = 0; i < size; ++i)
@@ -920 +920 @@
        }
 
-       if (nvertex==1)  std::get<0>(registeredDomains[domainName])=domain[0] ;
-       else if (nvertex==2) std::get<1>(registeredDomains[domainName])=domain[0] ;
-       else  std::get<2>(registeredDomains[domainName])=domain[0] ;
+       if (nvertex==1)  std::get<0>(registeredDomains[domainName]).insert(domain[0]) ;
+       else if (nvertex==2) std::get<1>(registeredDomains[domainName]).insert(domain[0]) ;
+       else  std::get<2>(registeredDomains[domainName]).insert(domain[0]) ;
      }
 
@@ -930 +930 @@
        string domainName=it.first ;
 
-       if (std::get<0>(it.second)!=nullptr) domains.push_back(std::get<0>(it.second)) ;
-       if (std::get<1>(it.second)!=nullptr) domains.push_back(std::get<1>(it.second)) ; 
-       if (std::get<2>(it.second)!=nullptr) domains.push_back(std::get<2>(it.second)) ; 
+       for(auto& domain : std::get<0>(it.second) ) domains.push_back(domain) ;
+       for(auto& domain : std::get<1>(it.second) ) domains.push_back(domain) ;
+       for(auto& domain : std::get<2>(it.second) ) domains.push_back(domain) ;
        
        // for each component of a given mesh (i.e. domains with same name but different number of vertices)

XIOS/trunk/src/node/mesh.cpp

@@ -427 +427 @@
     if (nvertex == 1)
     {
+      if (nodesAreWritten) return ;
+
       nbNodes_ = lonvalue.numElements();
       node_lon.resize(nbNodes_);
@@ -449 +451 @@
       for (size_t nn = 0; nn < nbNodes_; ++nn)
       {
+        cout<<"MESH : "<<"node inserted : ("<< lonvalue(nn)<<","<< latvalue(nn)<<") index glo "<<nodeStart + nn<<" : hash =>   " ;
         hashValues = CMesh::createHashes(lonvalue(nn), latvalue(nn));
         for (size_t nh = 0; nh < 4; ++nh)
         {
-          nodeHash2IdxGlo[hashValues[nh]].push_back(nodeStart + nn); 
-        }
+          nodeHash2IdxGlo[hashValues[nh]].push_back(nodeStart + nn);
+          cout<<hashValues[nh]<<"    ";
+        }
+        cout<<endl ;
       }
       pNodeGlobalIndex = new CClientClientDHTSizet (nodeHash2IdxGlo, comm);
@@ -462 +467 @@
     else if (nvertex == 2)
     {
+      if (edgesAreWritten) return ;
+
       nbEdges_ = bounds_lon.shape()[1];
       edge_lon.resize(nbEdges_);
@@ -508 +515 @@
         for (int ne = 0; ne < nbEdges_; ++ne)
         {
+          cout<<"MESH : "<<"insert edge " ;
           for (int nv = 0; nv < nvertex; ++nv)
           {
@@ -524 +532 @@
             else
               nodeIdxGlo2 = it->second[0];
+           
+            cout<<"("<<bounds_lon(nv, ne)<<","<<bounds_lat(nv, ne)<<")" ;
           }
           size_t edgeIdxGlo = nbEdgesAccum + ne;
           edgeHash2IdxGlo[ hashPairOrdered(nodeIdxGlo1, nodeIdxGlo2) ].push_back(edgeIdxGlo);
+          cout<<"  nodes Id : "<<nodeIdxGlo1<<"&"<<nodeIdxGlo2<<" ; edge Id : "<<edgeIdxGlo<<" with hash : "<<hashPairOrdered(nodeIdxGlo1, nodeIdxGlo2)<<endl ;
         }
       } // nodesAreWritten
@@ -689 +700 @@
     else // nvertex > 2
     {
+      if (facesAreWritten) return ;
+
       nbFaces_ = bounds_lon.shape()[1];
       face_lon.resize(nbFaces_);
@@ -702 +715 @@
       MPI_Scan(&nbFacesOnProc, &nbFacesAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm);
       nbFacesAccum -= nbFaces_;
+      cout<<bounds_lon<<endl ;
+      cout<<bounds_lat<<endl ;
 
       // Case (1): edges have been previously generated
@@ -722 +737 @@
         CClientClientDHTSizet::Index2VectorInfoTypeMap::iterator it1, it2;
         CArray<size_t,1> edgeHashList(nbFaces_*nvertex);
+
         size_t nEdge = 0;
         for (int nf = 0; nf < nbFaces_; ++nf)
@@ -784 +800 @@
               size_t faceIdxGlo = nbFacesAccum + nf;
               size_t edgeHash = hashPairOrdered(it1->second[0], it2->second[0]);
+              cout<<"MESH : "<<"find edge : ("<<bounds_lon(nv1,nf)<<","<<bounds_lat(nv1,nf)<<")&("<<bounds_lon(nv2,nf)<<","<<bounds_lat(nv2,nf)
+                  <<") ;  edgeHash "<<edgeHash<<" with node index : "<<it1->second[0]<<" & "<<it2->second[0]<<endl ;
               itEdgeHash = edgeHash2IdxGlo.find(edgeHash);
               size_t edgeIdxGlo = itEdgeHash->second[0];
@@ -1308 +1326 @@
         }
 
-//        CDHTAutoIndexing dhtNodeIdxGlo = CDHTAutoIndexing(nodeIdx2Idx, comm);
+        //        CDHTAutoIndexing dhtNodeIdxGlo = CDHTAutoIndexing(nodeIdx2Idx, comm);
         // CDHTAutoIndexing will not give consistent node numbering for varying number of procs. =>
         // Solution: global node indexing by hand.
@@ -1351 +1369 @@
         // (3.3) Saving node data: node_lon, node_lat, and face_nodes
         // Generating edgeHash2Info = <hash, <idx, rank>> and edgeHashList
-//        nbNodesGlo = dhtNodeIdxGlo.getNbIndexesGlobal();
-//        node_count = dhtNodeIdxGlo.getIndexCount();
-//        node_start = dhtNodeIdxGlo.getIndexStart();
+        
+        //        nbNodesGlo = dhtNodeIdxGlo.getNbIndexesGlobal();
+        //        node_count = dhtNodeIdxGlo.getIndexCount();
+        //        node_start = dhtNodeIdxGlo.getIndexStart();
         node_lon.resize(node_count);
         node_lat.resize(node_count);
@@ -1482 +1501 @@
         // (3.5) Saving variables: edge_lon, edge_lat, face_edges
         // Creating map edgeIdxGlo2Face <idxGlo, face>
-//        nbEdgesGlo = dhtEdgeIdxGlo.getNbIndexesGlobal();
-//        edge_count = dhtEdgeIdxGlo.getIndexCount();
-//        edge_start = dhtEdgeIdxGlo.getIndexStart();
+        //        nbEdgesGlo = dhtEdgeIdxGlo.getNbIndexesGlobal();
+        //        edge_count = dhtEdgeIdxGlo.getIndexCount();
+        //        edge_start = dhtEdgeIdxGlo.getIndexStart();
 
         edge_lon.resize(edge_count);