Changeset 2388 for XIOS3/trunk/src/node

Timestamp:

07/27/22 09:47:30 (2 years ago)

Author:

jderouillat

Message:

Manage hash values with size_t in hash tables of elements associated to output files

Location:

XIOS3/trunk/src/node

Files:

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

XIOS3/trunk/src/node/axis.cpp

@@ -304 +304 @@
    }
 
-   int CAxis::computeAttributesHash( MPI_Comm comm )
-   {
-     int axis_hash = 0;
-     
+   size_t CAxis::computeAttributesHash( MPI_Comm comm )
+   {
      // Compute the hash of distributed attributs (value ...)
      int globalSize = this->n_glo.getValue();
@@ -319 +317 @@
      gridTransformConnector->transfer(this->value, distributedValue );
         
-     int localHash = 0;
+     size_t localHash = 0;
      for (int iloc=0; iloc<localSize ; iloc++ ) localHash+=globalIndex(iloc)*distributedValue(iloc);
-     int distributedHash = 0;
-     MPI_Allreduce( &localHash, &distributedHash, 1, MPI_INT, MPI_SUM, comm  );
+     size_t distributedHash = 0;
+     MPI_Allreduce( &localHash, &distributedHash, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm  );
 
      // Compute the hash of global attributs (unit, prec ...)
@@ -338 +336 @@
      excludedAttr.push_back("mask"); // ???
 
-     int globalHash = this->computeGlobalAttributesHash( excludedAttr );
+     size_t globalHash = this->computeGlobalAttributesHash( excludedAttr );
 
      return distributedHash + globalHash;

XIOS3/trunk/src/node/axis.hpp

@@ -130 +130 @@
          void resetGeometricAttributes(void) ;
 
-         int computeAttributesHash( MPI_Comm comm );
+         size_t computeAttributesHash( MPI_Comm comm );
 
          size_t getGlobalWrittenSize(void) ;

XIOS3/trunk/src/node/domain.cpp

@@ -1770 +1770 @@
    CATCH_DUMP_ATTR
 
-   int CDomain::computeAttributesHash( MPI_Comm comm )
-   {
-     int domain_hash = 0;
-     
+   size_t CDomain::computeAttributesHash( MPI_Comm comm )
+   {
      // Compute the hash of distributed attributs (value ...)
      int globalSize = this->ni_glo.getValue()*this->nj_glo.getValue();
@@ -1788 +1786 @@
      // Compute the distributed hash (v0) of the element
      // it will be associated to the default element name (= map key), and to the name really written
-     int localHash = 0;
+     size_t localHash = 0;
      for (int iloc=0; iloc<localSize ; iloc++ ) localHash+=globalIndex(iloc)*lon_distributedValue(iloc)*lat_distributedValue(iloc);
-     int distributedHash = 0;
-     MPI_Allreduce( &localHash, &distributedHash, 1, MPI_INT, MPI_SUM, comm  );
+     size_t distributedHash = 0;
+     MPI_Allreduce( &localHash, &distributedHash, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm  );
      
      // Compute the hash of global attributs (unit, prec ...)
@@ -1814 +1812 @@
      excludedAttr.insert(excludedAttr.end(), { "bounds_lonvalue_unstructured_read_from_file", "bounds_latvalue_unstructured_read_from_file" });
      
-     int globalHash = this->computeGlobalAttributesHash( excludedAttr );
+     size_t globalHash = this->computeGlobalAttributesHash( excludedAttr );
 
      return distributedHash + globalHash;

XIOS3/trunk/src/node/domain.hpp

@@ -91 +91 @@
          bool checkAttributes_done_ = false ;
 
-         int computeAttributesHash( MPI_Comm comm );
+         size_t computeAttributesHash( MPI_Comm comm );
          
       //////////////////////////