Changeset 811 for XIOS/trunk

Timestamp:

01/07/16 09:21:51 (8 years ago)

Author:

ymipsl

Message:

Bug fix when time dimension is not the unlimited dimension

YM

Location:

XIOS/trunk/src

Files:

• io/inetcdf4.cpp (modified) (1 diff)
• io/nc4_data_input.cpp (modified) (1 diff)
• io/netCdfInterface.cpp (modified) (1 diff)
• io/netCdfInterface.hpp (modified) (1 diff)
• node/file.cpp (modified) (1 diff)

XIOS/trunk/src/io/inetcdf4.cpp

@@ -27 +27 @@
 
     this->timeCounterName = timeCounterName;
+    if (!CNetCdfInterface::isDimExisted(this->ncidp, this->timeCounterName)) this->timeCounterName=this->getUnlimitedDimensionName() ;
+    
   }
 

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -30 +30 @@
     if (SuperClassWriter::isTemporal(fieldId))
     {
-      return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getUnlimitedDimensionName()];
+//      return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getUnlimitedDimensionName()];
+      return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getTimeCounterName()];
     }
 

XIOS/trunk/src/io/netCdfInterface.cpp

@@ -995 +995 @@
    int varId = 0;
    return (NC_NOERR == (nc_inq_varid(ncId, varName.c_str(), &varId)));
+}
+
+bool CNetCdfInterface::isDimExisted(int ncId, const StdString& dimName)
+{
+   int dimId = 0;
+   return (NC_NOERR == (nc_inq_dimid(ncId, dimName.c_str(), &dimId)));
 }
 

XIOS/trunk/src/io/netCdfInterface.hpp

@@ -172 +172 @@
     //! Query the existence of a variable
     static bool isVarExisted(int ncId, const StdString& varName);
-
+    static bool isDimExisted(int ncId, const StdString& dimName);
   };
 }

XIOS/trunk/src/node/file.cpp

@@ -525 +525 @@
 
       if (isOpen) data_out->closeFile();
-
-      data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
+      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
+      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
       isOpen = true;
     }