Changeset 369 for XIOS/trunk/src/node/field.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/node/field.cpp (modified) (14 diffs)

XIOS/trunk/src/node/field.cpp

@@ -24 +24 @@
       , last_Write(), last_operation()
       , foperation()
-      , data(new CArray<double, 1>(boost::extents[0]))
-   { /* Ne rien faire de plus */ }
+      { /* Ne rien faire de plus */ }
 
    CField::CField(const StdString & id)
@@ -35 +34 @@
       , last_Write(), last_operation()
       , foperation()
-      , data(new CArray<double, 1>(boost::extents[0]))
    { /* Ne rien faire de plus */ }
 
@@ -43 +41 @@
 //      this->file.reset() ;
       this->foperation.reset() ;
-      this->data.reset() ;
    }
 
@@ -50 +47 @@
    bool CField::updateDataServer
       (const CDate & currDate,
-       const std::deque<ARRAY(double, 1)> storedClient)
+       const std::deque< CArray<double, 1>* > storedClient)
    {
       const CDate opeDate      = *last_operation + freq_operation;
@@ -57 +54 @@
       if (opeDate <= currDate)
       {
-         if (this->data->num_elements() != this->grid->storeIndex[0]->num_elements())
+         if (this->data.numElements() != this->grid->storeIndex[0]->numElements())
          {
-            this->data->resize(boost::extents[this->grid->storeIndex[0] ->num_elements()]);
+            this->data.resize(this->grid->storeIndex[0] ->numElements());
          }  
-         ARRAY_CREATE(input, double, 1, [this->data->num_elements()]);
+         CArray<double,1> input(data.numElements()) ;
          this->grid->inputFieldServer(storedClient, input);          
          (*this->foperation)(input);
@@ -103 +100 @@
     CEventClient event(getType(),EVENT_ID_UPDATE_DATA) ;
     
-    map<int,ARRAY(int, 1)>::iterator it ;
+    map<int,CArray<int, 1>* >::iterator it ;
     list<shared_ptr<CMessage> > list_msg ;
-    list<ARRAY(double,1) > list_data ;
+    list< CArray<double,1>* > list_data ;
     
     for(it=grid->storeIndex_toSrv.begin();it!=grid->storeIndex_toSrv.end();it++)
     {
       int rank=(*it).first ;
-      ARRAY(int,1) index=(*it).second ;
-      ARRAY_CREATE(data_tmp,double,1,[index->num_elements()]) ;
-      for(int n=0;n<data_tmp->num_elements();n++) (*data_tmp)[n]=(*data)[(*index)[n]] ;
+      CArray<int,1>& index = *(it->second) ;
+      CArray<double,1> data_tmp(index.numElements()) ;
+      
+      for(int n=0;n<data_tmp.numElements();n++) data_tmp(n)=data(index(n)) ;
       list_msg.push_back(shared_ptr<CMessage>(new CMessage)) ;
-      list_data.push_back(data_tmp) ;
-      *list_msg.back()<<getId()<<list_data.back() ;
+      list_data.push_back(new CArray<double,1>(data_tmp)) ;
+      *list_msg.back()<<getId()<<*list_data.back() ;
       event.push(rank,grid->nbSenders[rank],*list_msg.back()) ;
     }
     client->sendEvent(event) ;
+    
+    for(list< CArray<double,1>* >::iterator it=list_data.begin();it!=list_data.end();it++) delete *it ;
   }
   
@@ -145 +145 @@
     if (data_srv.empty())
     {
-      for(map<int,ARRAY(int, 1)>::iterator it=grid->out_i_fromClient.begin();it!=grid->out_i_fromClient.end();it++)
+      for(map<int, CArray<int, 1>* >::iterator it=grid->out_i_fromClient.begin();it!=grid->out_i_fromClient.end();it++)
       {
         int rank=it->first ;
-        ARRAY_CREATE(data_tmp,double,1,[it->second->num_elements()]) ;
-        data_srv.insert(pair<int, ARRAY(double,1)>(rank,data_tmp)) ;
-        foperation_srv.insert(pair<int,boost::shared_ptr<func::CFunctor> >(rank,boost::shared_ptr<func::CFunctor>(new func::CInstant(data_srv[rank])))) ;
+        CArray<double,1> data_tmp(it->second->numElements()) ;
+        data_srv.insert( pair<int, CArray<double,1>* >(rank, new CArray<double,1>(data_tmp) ) ) ;
+        foperation_srv.insert(pair<int,boost::shared_ptr<func::CFunctor> >(rank,boost::shared_ptr<func::CFunctor>(new func::CInstant(*data_srv[rank])))) ;
       }
     }
@@ -165 +165 @@
       for(int n=0;n<ranks.size();n++)
       {
-        ARRAY_CREATE(data_tmp,double,1,[0]) ;
+        CArray<double,1> data_tmp ;
         *buffers[n]>>data_tmp ;
         (*foperation_srv[ranks[n]])(data_tmp) ;
@@ -187 +187 @@
   void CField::writeField(void)
   {
-    if (! grid->domain->isEmpty() || getRelFile()->type.getValue()=="one_file")
+//    if (! grid->domain->isEmpty() || getRelFile()->type.getValue()=="one_file")
+    if (! grid->domain->isEmpty() || getRelFile()->type == CFile::type_attr::one_file)
     {
       getRelFile()->checkFile();
@@ -305 +306 @@
    //----------------------------------------------------------------
    
-   ARRAY(double, 1) CField::getData(void) const
+   CArray<double, 1> CField::getData(void) const
    {
       return(this->data);
@@ -410 +411 @@
          const CDuration toffset = this->freq_operation - freq_offset_ - context->getCalendar()->getTimeStep(); 
          *this->last_operation   = *this->last_operation - toffset;  
+         cout<<operation<<endl ;
          
 #define DECLARE_FUNCTOR(MType, mtype)              \
@@ -429 +431 @@
    
    //----------------------------------------------------------------
-   
+/*
    void CField::fromBinary(StdIStream & is)
    {
       SuperClass::fromBinary(is);
 #define CLEAR_ATT(name_)\
-      SuperClassAttribute::operator[](#name_)->clear()
+      SuperClassAttribute::operator[](#name_)->reset()
 
          CLEAR_ATT(domain_ref);
@@ -441 +443 @@
 
    }
-
+*/
    //----------------------------------------------------------------
 
@@ -537 +539 @@
    }
    
-   void CField::outputField(ARRAY(double,3) fieldOut)
-   {
-      map<int,ARRAY(double,1)>::iterator it;
+   void CField::outputField(CArray<double,3>& fieldOut)
+   {
+      map<int, CArray<double,1>* >::iterator it;
       for(it=data_srv.begin();it!=data_srv.end();it++)
-         grid->outputField(it->first,it->second, fieldOut) ;
-      
-   }
-   
-   void CField::outputField(ARRAY(double,2) fieldOut)
-   {
-      map<int,ARRAY(double,1)>::iterator it;
+         grid->outputField(it->first,*it->second, fieldOut) ;
+      
+   }
+   
+   void CField::outputField(CArray<double,2>& fieldOut)
+   {
+      map<int, CArray<double,1>* >::iterator it;
 
       for(it=data_srv.begin();it!=data_srv.end();it++)
       {
-         grid->outputField(it->first,it->second, fieldOut) ;
+         grid->outputField(it->first,*it->second, fieldOut) ;
       }
    }