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

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.hpp (modified) (3 diffs)

XIOS/trunk/src/input/inetcdf4.hpp

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "exception.hpp"
-#include "array.hpp"
+#include "array_new.hpp"
 
 #include <mpi.h>
@@ -92 +92 @@
 
             template <class T>
-               void getData(ARRAY(T, 1) data,
+               void getData(CArray<T, 1>& data,
                             const StdString & var,
                             const CVarPath  * const path = NULL,
@@ -220 +220 @@
       //---------------------------------------------------------------
       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);
 
       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);
 
       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);
       ///--------------------------------------------------------------