Changeset 2250 for XIOS/trunk/src/node/file.cpp

Timestamp:

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

Author:

ymipsl

Message:

Fix issue for Ugrid convention output.

YM

File:

• XIOS/trunk/src/node/file.cpp (modified) (3 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)