Changeset 2384

Timestamp:

07/13/22 15:58:30 (2 years ago)

Author:

jderouillat

Message:

Replace OutputDomainName? by a CDomain pointer in the hash table which manage element names. Replace unordered_multimap by multimap

Location:

XIOS3/trunk/src/io

Files:

• nc4_data_output.cpp (modified) (3 diffs)
• nc4_data_output.hpp (modified) (1 diff)

XIOS3/trunk/src/io/nc4_data_output.cpp

@@ -124 +124 @@
          
            StdString defaultNameKey = domain->getDomainOutputName();
-           if ( !relElements_.count ( defaultNameKey ) )
+           if ( !relDomains_.count ( defaultNameKey ) )
            {
              // if defaultNameKey not in the map, write the element such as it is defined
-             relElements_.insert( make_pair( defaultNameKey, make_pair(globalHash, defaultNameKey) ) );
+             relDomains_.insert( make_pair( defaultNameKey, make_pair(globalHash, domain) ) );
            }
            else // look if a hash associated this key is equal
            {
              bool elementIsInMap(false);
-             auto defaultNameKeyElements = relElements_.equal_range( defaultNameKey );
+             auto defaultNameKeyElements = relDomains_.equal_range( defaultNameKey );
              for (auto it = defaultNameKeyElements.first; it != defaultNameKeyElements.second; it++)
              {
@@ -138 +138 @@
                {
                  // if yes, associate the same ids to current element
-                 domain->name = it->second.second;
-                 // lon/lat names must be updated too, check that its exist, if not "lon"/"lat" (default values) are used
-                 StdString lon_name = "lon_"+it->second.second;
-                 int ncid = SuperClassWriter::getCurrentGroup();
-                 int varId = 0;
-                 nc_inq_varid(ncid, lon_name.c_str(), &varId);
-                 if (!varId) //lon_name = "lon"
-                 {
-                   domain->lon_name = "lon";
-                   domain->lat_name = "lat";
-                 }
-                 else
-                 {
-                   domain->lon_name = "lon_"+it->second.second;
-                   domain->lat_name = "lat_"+it->second.second;
-                 }
+                 domain->name = it->second.second->getDomainOutputName();
+                 domain->lon_name = it->second.second->lon_name;
+                 domain->lat_name = it->second.second->lat_name;
                  elementIsInMap = true;
                }
@@ -163 +150 @@
                domain->lon_name = "lon_"+domain->getId();
                domain->lat_name = "lat_"+domain->getId();
-               relElements_.insert( make_pair( defaultNameKey, make_pair(globalHash, domain->getDomainOutputName()) ) ) ;// = domain->getId()          
+               relDomains_.insert( make_pair( defaultNameKey, make_pair(globalHash, domain) ) ) ;         
              }
            }

XIOS3/trunk/src/io/nc4_data_output.hpp

@@ -129 +129 @@
             bool hasTimeCentered ;
         
-            std::unordered_multimap< StdString, pair<int,StdString> > relElements_;
+            std::multimap< StdString, pair<int,StdString> > relElements_;
+            std::multimap< StdString, pair<int,CDomain*> > relDomains_;
 
       }; // class CNc4DataOutput