Changeset 1343

Timestamp:

11/22/17 13:19:51 (7 years ago)

Author:

oabramkina

Message:

Correcting grid name in the error message.

Location:

XIOS

Files:

• dev/XIOS_DEV_CMIP6/src/node/grid.hpp (modified) (4 diffs)
• trunk/src/node/grid.hpp (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp

@@ -376 +376 @@
                 << "Received data size = "      << field.numElements() << " ] "
                 << "The data array does not have the right size! "
-                << "Grid = " << this->GetName())
+                << "Grid = " << this->getId())
 //#endif
       this->storeField_arr(field.dataFirst(), stored);
@@ -390 +390 @@
                 << "Output data size = "   << field.numElements() << " ] "
                 << "The ouput array does not have the right size! "
-                << "Grid = " << this->GetName())
+                << "Grid = " << this->getId())
 //#endif
       this->restoreField_arr(stored, field.dataFirst());
@@ -446 +446 @@
                 << "Local size of dimension " << i << " is " << eachDimSize[i] << "." << std::endl
                 << "Mask size for dimension " << i << " is " << gridMask.extent(i) << "." << std::endl
-                << "Grid = " << this->GetName())
+                << "Grid = " << this->getId())
       }
     }
@@ -512 +512 @@
         //       << "Mask dimension is " << N << "." << std::endl
         //       << "Input dimension is " << eachDimSize.size() << "." << std::endl
-        //       << "Grid = " << this->GetName())
+        //       << "Grid = " << this->getId())
       }
       CArrayBoolTraits<CArray<bool,N> >::resizeArray(gridMask,eachDimSize);

XIOS/trunk/src/node/grid.hpp

@@ -305 +305 @@
                 << "Received data size = "      << field.numElements() << " ] "
                 << "The data array does not have the right size! "
-                << "Grid = " << this->GetName())
+                << "Grid = " << this->getId())
       this->storeField_arr(field.dataFirst(), stored);
    }
@@ -317 +317 @@
                 << "Output data size = "   << field.numElements() << " ] "
                 << "The ouput array does not have the right size! "
-                << "Grid = " << this->GetName())
+                << "Grid = " << this->getId())
       this->restoreField_arr(stored, field.dataFirst());
    }
@@ -360 +360 @@
                 << "Local size of dimension " << i << " is " << eachDimSize[i] << "." << std::endl
                 << "Mask size for dimension " << i << " is " << gridMask.extent(i) << "." << std::endl
-                << "Grid = " << this->GetName())
+                << "Grid = " << this->getId())
       }
     }