Changeset 369 for XIOS/trunk/src/interface/c/icdata.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/interface/c/icdata.cpp (modified) (7 diffs)

XIOS/trunk/src/interface/c/icdata.cpp

@@ -23 +23 @@
 #include <mpi.h>
 #include "timer.hpp"
+#include "array_new.hpp"
 
 extern "C"
@@ -111 +112 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
-//      boost::const_multi_array_ref<double, 1> array_(data_k8,
-//          boost::extents [data_Xsize],
-//          boost::fortran_storage_order());
-      ARRAY(double, 1) data(new CArray<double, 1>(boost::extents [data_Xsize]));
-      std::copy(data_k8, &(data_k8[data->num_elements()]), data->data());
-      
-//      dtreat->write_data(fieldid_str, data);
-      CField::get(fieldid_str)->setData(data) ;
+
+      CArray<double,(StdSize)1> data(data_k8,shape(data_Xsize),neverDeleteData) ;
+      CField::get(fieldid_str)->setData(data) ;
+      CField toto ;
+      toto.setData(data) ;
       CTimer::get("XIOS send field").suspend() ;
       CTimer::get("XIOS").suspend() ;
@@ -132 +130 @@
       CContext* context = CContext::getCurrent() ;
       
-//      boost::const_multi_array_ref<double, 2> array_(data_k8,
-//          boost::extents [data_Xsize][data_Ysize],
-//          boost::fortran_storage_order());
-      ARRAY(double, 2) data(new CArray<double, 2>(boost::extents [data_Xsize][data_Ysize]));
-      std::copy(data_k8, &(data_k8[data->num_elements()]), data->data());
-//      dtreat->write_data(fieldid_str, data);
+      CArray<double,2>data(data_k8,shape(data_Xsize,data_Ysize),neverDeleteData) ;
       CField::get(fieldid_str)->setData(data) ;
       CTimer::get("XIOS send field").suspend() ;
@@ -151 +144 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
-//      boost::const_multi_array_ref<double, 3> array_(data_k8,
-//          boost::extents [data_Xsize][data_Ysize][data_Zsize],
-//          boost::fortran_storage_order());
-      ARRAY(double, 3) data(new CArray<double, 3>(boost::extents [data_Xsize][data_Ysize][data_Zsize]));
-      std::copy(data_k8, &(data_k8[data->num_elements()]), data->data());
-//      dtreat->write_data(fieldid_str, data);
+
+      CArray<double,3>data(data_k8,shape(data_Xsize,data_Ysize,data_Zsize),neverDeleteData) ;
       CField::get(fieldid_str)->setData(data) ;
       CTimer::get("XIOS send field").suspend() ;
@@ -170 +159 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
-//      boost::const_multi_array_ref<float, 1> array_(data_k4,
-//          boost::extents [data_Xsize],
-//          boost::fortran_storage_order());
-//      ARRAY(float, 1) data(new CArray<float, 1>(boost::extents [data_Xsize]));
-//      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
-//      dtreat->write_data(fieldid_str, data);
-      ARRAY(double, 1) data(new CArray<double, 1>(boost::extents [data_Xsize]));
-      double* ptr_data=data->data() ; 
-      for(int i=0;i<data->num_elements();i++) ptr_data[i]=data_k4[i];
+      CArray<float,1> data_tmp(data_k4,shape(data_Xsize),neverDeleteData) ;
+      CArray<double,1> data(data_Xsize) ;
+      data=data_tmp ;
       CField::get(fieldid_str)->setData(data) ;
       CTimer::get("XIOS send field").suspend() ;
@@ -192 +175 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
-//      boost::const_multi_array_ref<float, 2> array_(data_k4,
-//          boost::extents [data_Xsize][data_Ysize],
-//          boost::fortran_storage_order());
-//      ARRAY(float, 2) data(new CArray<float, 2>(boost::extents [data_Xsize][data_Ysize]));
-//      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
-//      dtreat->write_data(fieldid_str, data);
-      ARRAY(double, 2) data(new CArray<double, 2>(boost::extents [data_Xsize][data_Ysize]));
-      double* ptr_data=data->data() ; 
-      for(int i=0;i<data->num_elements();i++) ptr_data[i]=data_k4[i];
+      CArray<float,2> data_tmp(data_k4,shape(data_Xsize,data_Ysize),neverDeleteData) ;
+      CArray<double,2> data(data_Xsize,data_Ysize) ;
+      data=data_tmp ;
       CField::get(fieldid_str)->setData(data) ;
       CTimer::get("XIOS send field").suspend() ;
@@ -215 +192 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
-     
-//      boost::const_multi_array_ref<float, 3> array_(data_k4,
-//          boost::extents [data_Xsize][data_Ysize][data_Zsize],
-//          boost::fortran_storage_order());
-//      ARRAY(float, 3) data(new CArray<float, 3>(boost::extents [data_Xsize][data_Ysize][data_Zsize]));
-//      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
-//      dtreat->write_data(fieldid_str, data);
-      ARRAY(double, 3) data(new CArray<double, 3>(boost::extents [data_Xsize][data_Ysize][data_Zsize]));
-      double* ptr_data=data->data() ; 
-      for(int i=0;i<data->num_elements();i++) ptr_data[i]=data_k4[i];
+
+      CArray<float,3> data_tmp(data_k4,shape(data_Xsize,data_Ysize,data_Zsize),neverDeleteData) ;
+      CArray<double,3> data(data_Xsize,data_Ysize,data_Zsize) ;
+      data=data_tmp ;
+ 
       CField::get(fieldid_str)->setData(data) ;
       CTimer::get("XIOS send field").suspend() ;