Changeset 369 for XIOS/trunk/src/input/inetcdf4.cpp

Timestamp:

10/16/12 13:04:44 (12 years ago)

Author:

ymipsl

Message:

Major Update

• redesign Type and attribute manipulation
• add enumerate type and attribute
• use blitz class array instead of boost class array

YM

File:

• XIOS/trunk/src/input/inetcdf4.cpp (modified) (4 diffs)

XIOS/trunk/src/input/inetcdf4.cpp

@@ -710 +710 @@
 
       template <>
-         void CINetCDF4::getData(ARRAY(int, 1) data, const StdString & var,
+         void CINetCDF4::getData(CArray<int, 1>& data, const StdString & var,
                                  const CVarPath  * const path, StdSize record)
       {
@@ -719 +719 @@
          StdSize array_size = 1;
          this->getDataInfo(var, path, record, start, count, array_size);
-         data->resize(boost::extents[array_size]);
-         CheckError(nc_get_vara_int (grpid, varid, &(start[0]), &(count[0]), data->data()));
+         data.resize(array_size);
+         CheckError(nc_get_vara_int (grpid, varid, &(start[0]), &(count[0]), data.dataFirst()));
       }
 
       template <>
-         void CINetCDF4::getData(ARRAY(double, 1) data, const StdString & var,
+         void CINetCDF4::getData(CArray<double, 1>& data, const StdString & var,
                                  const CVarPath  * const path, StdSize record)
       {
@@ -732 +732 @@
          StdSize array_size = 1;
          this->getDataInfo(var, path, record, start, count, array_size);
-         data->resize(boost::extents[array_size]);
-         CheckError(nc_get_vara_double (grpid, varid, &(start[0]), &(count[0]), data->data()));
+         data.resize(array_size);
+         CheckError(nc_get_vara_double (grpid, varid, &(start[0]), &(count[0]), data.dataFirst()));
       }
 
       template <>
-         void CINetCDF4::getData(ARRAY(float, 1) data, const StdString & var,
+         void CINetCDF4::getData(CArray<float, 1>& data, const StdString & var,
                                  const CVarPath  * const path, StdSize record)
       {
@@ -745 +745 @@
          StdSize array_size = 1;
          this->getDataInfo(var, path, record, start, count, array_size);
-         data->resize(boost::extents[array_size]);
-         CheckError(nc_get_vara_float (grpid, varid, &(start[0]), &(count[0]), data->data()));
+         data.resize(array_size);
+         CheckError(nc_get_vara_float (grpid, varid, &(start[0]), &(count[0]), data.dataFirst()));
       }