Changeset 2389 for XIOS3/trunk/src/node

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/node

Files:

• axis.cpp (modified) (1 diff)
• axis.hpp (modified) (1 diff)
• domain.cpp (modified) (1 diff)
• domain.hpp (modified) (1 diff)

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);
          
       //////////////////////////