Changeset 180 for XMLIO_V2/dev/dev_rv/src/xmlio/node

Timestamp:

04/19/11 15:06:51 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio/node

Files:

• domain.cpp (modified) (9 diffs)
• domain.hpp (modified) (2 diffs)
• grid.cpp (modified) (8 diffs)
• grid.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.cpp

@@ -4 +4 @@
 #include "object_template_impl.hpp"
 #include "group_template_impl.hpp"
+
+#include <algorithm>
 
 namespace xmlioserver {
@@ -13 +15 @@
       : CObjectTemplate<CDomain>(), CDomainAttributes()
       , isChecked(false), local_mask(new CMask()), relFiles()
+      , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
    { /* Ne rien faire de plus */ }
 
@@ -18 +21 @@
       : CObjectTemplate<CDomain>(id), CDomainAttributes()
       , isChecked(false), local_mask(new CMask()), relFiles()
+      , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
    { /* Ne rien faire de plus */ }
 
@@ -30 +34 @@
    }
 
+   //----------------------------------------------------------------
+
    bool CDomain::IsWritten(const StdString & filename) const
    {
@@ -35 +41 @@
    }
 
+   //----------------------------------------------------------------
+
    void CDomain::addRelFile(const StdString & filename)
    {
       this->relFiles.insert(filename);
+   }
+
+   //----------------------------------------------------------------
+
+   void CDomain::fromBinary(StdIStream & is)
+   {
+      SuperClass::fromBinary(is);
+      
+      this->ibegin_sub.push_back(this->ibegin.getValue());
+      this->jbegin_sub.push_back(this->jbegin.getValue());
+      this->iend_sub.push_back(this->iend.getValue());
+      this->jend_sub.push_back(this->jend.getValue());      
+      
+#define CLEAR_ATT(name_)\
+      SuperClassAttribute::operator[](#name_)->clear()
+
+         CLEAR_ATT(mask);
+         CLEAR_ATT(data_n_index);
+         CLEAR_ATT(data_i_index);
+         CLEAR_ATT(data_j_index);
+         
+         CLEAR_ATT(data_ni);
+         CLEAR_ATT(data_nj);
+         CLEAR_ATT(data_ibegin);
+         CLEAR_ATT(data_jbegin);
+         
+         CLEAR_ATT(ni);
+         CLEAR_ATT(nj);
+         
+         CLEAR_ATT(latvalue);
+         CLEAR_ATT(lonvalue);
+#undef CLEAR_ATT
+
+      this->ibegin.setValue(*std::min_element(this->ibegin_sub.begin(),this->ibegin_sub.end()));
+      this->jbegin.setValue(*std::min_element(this->jbegin_sub.begin(),this->jbegin_sub.end()));
+      this->iend.setValue(*std::max_element(this->iend_sub.begin(),this->iend_sub.end()));
+      this->jend.setValue(*std::max_element(this->jend_sub.begin(),this->jend_sub.end()));
+      
+      this->checkGlobalDomain();
+      this->checkLocalIDomain();
+      this->checkLocalJDomain();
+      this->completeMask();
+      
+      this->isChecked = true;
    }
 
@@ -150 +202 @@
          mask.setValue(__arr);
       }
-
    }
 
@@ -157 +208 @@
 
    void CDomain::checkDomainData(void)
-   {
+   {     
       if (!data_dim.isEmpty() &&
          !(data_dim.getValue() == 1 || data_dim.getValue() == 2))
@@ -252 +303 @@
          {
             const int dni = data_ni.getValue() * data_nj.getValue();
+            
             ARRAY_CREATE(__arri, int, 1, [dni]);
             ARRAY_CREATE(__arrj, int, 1, [dni]);               
@@ -289 +341 @@
    void CDomain::completeMask(void)
    {
-      this->local_mask->resize(data_ni.getValue(), data_nj.getValue());
+      this->local_mask->resize(ni.getValue(), nj.getValue());
       /*this->local_mask->setDataPosition
          (data_dim.getValue(), data_ni.getValue(), data_nj.getValue(),

XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.hpp

@@ -63 +63 @@
 
       public :
+      
+         /// Autres ///
+         virtual void fromBinary(StdIStream & is);
 
          /// Accesseurs ///
@@ -90 +93 @@
          std::set<StdString> relFiles;
 
+         std::vector<int> ibegin_sub, iend_sub, jbegin_sub, jend_sub;
+
    }; // class CDomain
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.cpp

@@ -34 +34 @@
 
    const ARRAY(int, 1) & CGrid::getStoreIndex(void) const
-   { return (this->storeIndex ); }
+   { 
+      return (this->storeIndex );
+   }
+
+   //---------------------------------------------------------------
+
    const ARRAY(int, 1) & CGrid::getOutIIndex(void)  const
-   { return (this->out_i_index ); }
+   { 
+      return (this->out_i_index ); 
+   }
+
+   //---------------------------------------------------------------
+
    const ARRAY(int, 1) & CGrid::getOutJIndex(void)  const
-   { return (this->out_j_index ); }
+   { 
+      return (this->out_j_index ); 
+   }
+
+   //---------------------------------------------------------------
+
    const ARRAY(int, 1) & CGrid::getOutLIndex(void)  const
-   { return (this->out_l_index ); }
+   { 
+      return (this->out_l_index ); 
+   }
+
+   //---------------------------------------------------------------
 
    const boost::shared_ptr<CAxis>   CGrid::getRelAxis  (void) const
-   { return (this->axis ); }
+   { 
+      return (this->axis ); 
+   }
+
+   //---------------------------------------------------------------
+
    const boost::shared_ptr<CDomain> CGrid::getRelDomain(void) const
-   { return (this->domain ); }
-
-   bool CGrid::hasAxis(void) const { return (this->withAxis); }
+   { 
+      return (this->domain ); 
+   }
+
+   //---------------------------------------------------------------
+
+   bool CGrid::hasAxis(void) const 
+   { 
+      return (this->withAxis); 
+   }
 
    //---------------------------------------------------------------
@@ -59 +90 @@
       this->isChecked = true;
    }
+
+   //---------------------------------------------------------------
 
    void CGrid::solveDomainRef(void)
@@ -76 +109 @@
    }
 
+   //---------------------------------------------------------------
+
    void CGrid::solveAxisRef(void)
    {
@@ -95 +130 @@
 
    void CGrid::computeIndex(void)
-   {
+   {    
       const int ni   = domain->ni.getValue() ,
                 nj   = domain->nj.getValue() ,
@@ -113 +148 @@
                     data_j_index = domain->data_j_index.getValue() ;
 
-      /*std::cout << data_n_index        << " : "
-                  << data_i_index.size() << " : "
-                  << data_j_index.size() << std::endl;*/
+      /*std::cout << data_n_index  << " : "
+                  << data_i_index  << " : "
+                  << data_j_index  << std::endl; */
 
       ARRAY(bool, 2) mask = domain->mask.getValue() ;
@@ -204 +239 @@
    }
 
+   //---------------------------------------------------------------
+
    template <>
       void CGrid::outputField
@@ -211 +248 @@
          (*field)[(*out_i_index)[n]][(*out_j_index)[n]] = (*stored)[n] ;
    }
+
+   //---------------------------------------------------------------
 
    template <>
@@ -230 +269 @@
          (*stored)[i] = data[(*storeIndex)[i]] ;
    }
+   
+   //---------------------------------------------------------------
+   
+   void CGrid::toBinary  (StdOStream & os) const
+   {
+      SuperClass::toBinary(os);
+      this->storeIndex->toBinary(os);
+      this->out_i_index->toBinary(os);
+      this->out_j_index->toBinary(os);
+      this->out_l_index->toBinary(os);
+   }
+
+   //---------------------------------------------------------------
+   
+   void CGrid::fromBinary(StdIStream & is)
+   {
+      SuperClass::fromBinary(is);
+      
+      ARRAY_CREATE(storeIndex_ , int, 1, [1]);
+      ARRAY_CREATE(out_l_index_, int, 1, [1]);
+      ARRAY_CREATE(out_i_index_, int, 1, [1]);
+      ARRAY_CREATE(out_j_index_, int, 1, [1]);
+      
+      storeIndex_ ->fromBinary(is);
+      out_i_index_->fromBinary(is);
+      out_j_index_->fromBinary(is);
+      out_l_index_->fromBinary(is);
+      
+   }
 
    ///---------------------------------------------------------------

XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.hpp

@@ -49 +49 @@
          /// Traitements ///
          void solveReference(void);
+
+         virtual void toBinary  (StdOStream & os) const;
+         virtual void fromBinary(StdIStream & is);
 
          /// Tests ///