Changeset 833 for XIOS/trunk/src/io/netCdfInterface_impl.hpp

Timestamp:

04/08/16 15:00:15 (8 years ago)

Author:

mhnguyen

Message:

Improvements for dht

+) Implement adaptive hierarchy for dht, level of hierarchy depends on number of processes
+) Remove some redundant codes

Test
+) On Curie
+) All tests are correct

File:

• XIOS/trunk/src/io/netCdfInterface_impl.hpp (modified) (4 diffs)

XIOS/trunk/src/io/netCdfInterface_impl.hpp

@@ -32 +32 @@
     {
       StdStringStream sstr;
+      StdString varName;
       sstr << "Error when calling function ncGetAttType(ncid, varId, attrName.c_str(), data)" << std::endl;
       sstr << nc_strerror(status) << std::endl;
-      sstr << "Unable to read attribute " << attrName << " given the location id: " << ncid << " and the variable id: " << varId << std::endl;
+      inqVarName(ncid, varId, varName);
+      sstr << "Unable to read attribute " << attrName << " given the location id: " << ncid << " and the variable whose id: " << varId << " and name: " << varName << std::endl;
       throw CNetCdfException(sstr.str());
     }
@@ -59 +61 @@
     {
       StdStringStream sstr;
+      StdString varName;
       sstr << "Error when calling function ncPutAttType(ncid, varId, attrName.c_str(), numVal, data)" << std::endl;
       sstr << nc_strerror(status) << std::endl;
-      sstr << "Unable to set attribute " << attrName << " given the location id: " << ncid << " and the variable id: " << varId
+      inqVarName(ncid, varId, varName);
+      sstr << "Unable to set attribute " << attrName << " given the location id: " << ncid << " and the variable whose id: " << varId << " and name: " << varName << std::endl
            << " with " << numVal << " elements." << std::endl;
       throw CNetCdfException(sstr.str());
@@ -85 +89 @@
     {
       StdStringStream sstr;
+      StdString varName;
       sstr << "Error when calling function ncGetVaraType(ncid, varId, start, count, data)" << std::endl;
       sstr << nc_strerror(status) << std::endl;
-      sstr << "Unable to read data given the location id: " << ncid << " and the variable id: " << varId << std::endl;
+      inqVarName(ncid, varId, varName);
+      sstr << "Unable to read data given the location id: " << ncid << " and the variable whose id: " << varId << " and name: " << varName << std::endl;
       throw CNetCdfException(sstr.str());
     }
@@ -110 +116 @@
     {
       StdStringStream sstr;
+      StdString varName;
       sstr << "Error when calling function ncPutVaraType(ncid, varId, start, count, data)" << std::endl;
       sstr << nc_strerror(status) << std::endl;
-      sstr << "Unable to write data given the location id: " << ncid << " and the variable id: " << varId << std::endl;
+      inqVarName(ncid, varId, varName);
+      sstr << "Unable to write data given the location id: " << ncid << " and the variable whose id: " << varId << " and name: " << varName << std::endl;
       throw CNetCdfException(sstr.str());
     }