Changeset 2389

Timestamp:

07/27/22 11:49:51 (23 months ago)

Author:

jderouillat

Message:

Move renames of the attributes name in the element classes

Location:

XIOS3/trunk/src

Files:

• io/nc4_data_output.cpp (modified) (7 diffs)
• io/nc4_data_output.hpp (modified) (1 diff)
• node/axis.cpp (modified) (1 diff)
• node/axis.hpp (modified) (1 diff)
• node/domain.cpp (modified) (1 diff)
• node/domain.hpp (modified) (1 diff)

XIOS3/trunk/src/io/nc4_data_output.cpp

@@ -20 +20 @@
             , SuperClassWriter(filename, exist)
             , filename(filename)
-            , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), relElements_()
+            , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), relAxis_(), relDomains_()
       {
         SuperClass::type = MULTI_FILE;
@@ -34 +34 @@
             , filename(filename)
             , isCollective(isCollective)
-            , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), relElements_()
+            , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), relAxis_(), relDomains_()
       {
         SuperClass::type = (multifile) ? MULTI_FILE : ONE_FILE;
@@ -79 +79 @@
               {
                 // if yes, associate the same ids to current element
-                domain->name = it->second.second->getDomainOutputName();
-                domain->lon_name = it->second.second->lon_name;
-                domain->lat_name = it->second.second->lat_name;
-                if (domain->type == CDomain::type_attr::unstructured)
-                {
-                  domain->dim_i_name = it->second.second->dim_i_name;
-                  domain->dim_j_name = it->second.second->dim_j_name;
-                }
+                domain->renameAttributesBeforeWriting( it->second.second );
                 elementIsInMap = true;
               }
@@ -93 +86 @@
             if (!elementIsInMap)  // ! in MAP
             {
-              domain->name =  domain->getId();
-              domain->lon_name = "lon_"+domain->getId();
-              domain->lat_name = "lat_"+domain->getId();
-              if (domain->type == CDomain::type_attr::unstructured)
-              {
-                domain->dim_i_name = "cell_"+domain->getId();
-                domain->dim_j_name = "nvertex_"+domain->getId();
-              }
+              domain->renameAttributesBeforeWriting();
               relDomains_.insert( make_pair( defaultNameKey, make_pair(globalHash, domain) ) ) ;         
             }
@@ -1056 +1042 @@
 
           StdString defaultNameKey = axis->getAxisOutputName();
-          if ( !relElements_.count ( defaultNameKey ) )
+          if ( !relAxis_.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) ) );
+            relAxis_.insert( make_pair( defaultNameKey, make_pair(globalHash, axis) ) );
           }
           else // look if a hash associated this key is equal
           {
             bool elementIsInMap(false);
-            auto defaultNameKeyElements = relElements_.equal_range( defaultNameKey );
+            auto defaultNameKeyElements = relAxis_.equal_range( defaultNameKey );
             for (auto it = defaultNameKeyElements.first; it != defaultNameKeyElements.second; it++)
             {
@@ -1070 +1056 @@
               {
                 // if yes, associate the same ids to current element
-                axis->name = it->second.second;
+                axis->renameAttributesBeforeWriting( it->second.second );
                 elementIsInMap = true;
               }
@@ -1077 +1063 @@
             if (!elementIsInMap)  // ! in MAP
             {
-              axis->name =  axis->getId();
-              relElements_.insert( make_pair( defaultNameKey, make_pair(globalHash, axis->getAxisOutputName()) ) ) ;// = axis->getId()          
+              axis->renameAttributesBeforeWriting();
+              relAxis_.insert( make_pair( defaultNameKey, make_pair(globalHash, axis) ) ) ;// = axis->getId()          
             }
           }

XIOS3/trunk/src/io/nc4_data_output.hpp

@@ -129 +129 @@
             bool hasTimeCentered ;
         
-            std::multimap< StdString, pair<size_t,StdString> > relElements_;
+            std::multimap< StdString, pair<size_t,CAxis*> > relAxis_;
             std::multimap< StdString, pair<size_t,CDomain*> > relDomains_;
 

XIOS3/trunk/src/node/axis.cpp

@@ -340 +340 @@
      return distributedHash + globalHash;
    }
-
+  
+   void CAxis::renameAttributesBeforeWriting(CAxis* writtenAxis)
+   {
+     if (writtenAxis!=NULL)
+     {
+       this->name = writtenAxis->getAxisOutputName();
+       // + label if necessary, other attributs concerned ?
+     }
+     else
+     {
+       this->name =  this->getId();
+       // + label if necessary, other attributs concerned ?
+     }
+   }
+  
    void CAxis::setGeometricAttributes(const CAxis& axisSrc)
    {

XIOS3/trunk/src/node/axis.hpp

@@ -131 +131 @@
 
          size_t computeAttributesHash( MPI_Comm comm );
+         void renameAttributesBeforeWriting(CAxis* writtenAxis=NULL);
 
          size_t getGlobalWrittenSize(void) ;

XIOS3/trunk/src/node/domain.cpp

@@ -1816 +1816 @@
      return distributedHash + globalHash;
    }
+  
+   void CDomain::renameAttributesBeforeWriting(CDomain* writtenDomain)
+   {
+     if (writtenDomain!=NULL)
+     {
+       this->name = writtenDomain->getDomainOutputName();
+       this->lon_name = writtenDomain->lon_name;
+       this->lat_name = writtenDomain->lat_name;
+       if (this->type == CDomain::type_attr::unstructured)
+       {
+         this->dim_i_name = writtenDomain->dim_i_name;
+         this->dim_j_name = writtenDomain->dim_j_name;
+       }
+     }
+     else
+     {
+       this->name =  this->getId();
+       this->lon_name = "lon_"+this->getId();
+       this->lat_name = "lat_"+this->getId();
+       if (this->type == CDomain::type_attr::unstructured)
+       {
+         this->dim_i_name = "cell_"+this->getId();
+         this->dim_j_name = "nvertex_"+this->getId();
+       }
+     }
+   }
 
    void CDomain::initializeLocalElement(void)

XIOS3/trunk/src/node/domain.hpp

@@ -92 +92 @@
 
          size_t computeAttributesHash( MPI_Comm comm );
+         void renameAttributesBeforeWriting(CDomain* writtenDomain=NULL);
          
       //////////////////////////