Changeset 182

Timestamp:

04/20/11 18:34:34 (14 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (2 diffs)
• src/xmlio/array.hpp (modified) (2 diffs)
• src/xmlio/array_mac.hpp (modified) (1 diff)
• src/xmlio/attribute_template_impl.hpp (modified) (1 diff)
• src/xmlio/fortran/impi_interface.f90 (modified) (1 diff)
• src/xmlio/manager/mpi_manager.cpp (modified) (1 diff)
• src/xmlio/node/domain.cpp (modified) (10 diffs)
• src/xmlio/node/domain.hpp (modified) (2 diffs)
• src/xmlio/node/field.cpp (modified) (1 diff)
• src/xmlio/node/grid.cpp (modified) (3 diffs)
• src/xmlio/node/grid.hpp (modified) (2 diffs)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -15 +15 @@
 VTK       = no
 GUI       = no
-NPROC     = 12
+NPROC     = 3
 CSUITE    = intel
 PFORME    = fedora-wk
@@ -22 +22 @@
 
 ifeq ($(HOSTNAME), lsce4063.extra.cea.fr)
-        PFORME     = fedora-wk
+        PFORME = fedora-wk
 endif
 
 ifeq ($(HOST), mercure01)
-        CSUITE     = sx
-        PFORME     = sx8-mercure-wk
+        CSUITE = sx
+        PFORME = sx8-mercure-wk
 endif
 

XMLIO_V2/dev/dev_rv/src/xmlio/array.hpp

@@ -36 +36 @@
 
       public:
-
+      
          /// Flux ///
          template <typename U, StdSize V, typename W>
@@ -47 +47 @@
 
       public:
-
+      
          void toBinary  (StdOStream & os) const;
          void fromBinary(StdIStream & is);

XMLIO_V2/dev/dev_rv/src/xmlio/array_mac.hpp

@@ -8 +8 @@
 
 #define ARRAY_ASSIGN(value, valuetype, numdims, extent)\
-   value = ARRAY(valuetype, numdims)(new CArray<valuetype, numdims>(boost::extents extent))
+   value.reset(new CArray<valuetype, numdims>(boost::extents extent)) 
 
 #define ARRAY_CREATE(value, valuetype, numdims, extent)\
-   ARRAY_ASSIGN(ARRAY(valuetype, numdims) value, valuetype, numdims, extent)
+   ARRAY(valuetype, numdims) value =                   \
+   ARRAY(valuetype, numdims)(new CArray<valuetype, numdims>(boost::extents extent))
 
 // Type C

XMLIO_V2/dev/dev_rv/src/xmlio/attribute_template_impl.hpp

@@ -50 +50 @@
       template <class T>
          CAttributeTemplate<T>::~CAttributeTemplate(void)
-      { /* Ne rien faire de plus */ }
+      { 
+         this->clear();
+      }
 
       ///--------------------------------------------------------------

XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.f90

@@ -83 +83 @@
       INTEGER (kind = C_INT)                 :: datatype, count, err
       INTEGER (kind = C_INT) , DIMENSION(mpi_status_size) :: status
-      CALL MPI_GET_COUNT(status, datatype, count, err)
+      
+      ! ATTTENTION GROS BUG ICI  SOUS GNU MAIS PAS INTEL ???????? voir datatype
+      ! PRINT *, datatype, MPI_CHARACTER
+      CALL MPI_GET_COUNT(status, MPI_CHARACTER, count, err)
    END SUBROUTINE xios_mpi_get_count
 

XMLIO_V2/dev/dev_rv/src/xmlio/manager/mpi_manager.cpp

@@ -129 +129 @@
 
       void CMPIManager::FreeMem(void * data)
-      { MPI_Free_mem(data); }
+      { 
+         MPI_Free_mem(data);
+      }
 
       //--------------------------------------------------------------

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

@@ -16 +16 @@
       , isChecked(false), local_mask(new CMask()), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
+      , lonvalue_sub(), latvalue_sub()
    { /* Ne rien faire de plus */ }
 
@@ -22 +23 @@
       , isChecked(false), local_mask(new CMask()), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
+      , lonvalue_sub(), latvalue_sub()
    { /* Ne rien faire de plus */ }
 
    CDomain::~CDomain(void)
-   { /* Ne rien faire de plus */ }
+   { 
+      this->local_mask.reset();
+      for (StdSize i = 0; i < this->lonvalue_sub.size(); i++)
+      {
+         this->lonvalue_sub[i].reset();
+         this->latvalue_sub[i].reset();
+      }     
+   }
 
    ///---------------------------------------------------------------
@@ -57 +66 @@
       this->jbegin_sub.push_back(this->jbegin.getValue());
       this->iend_sub.push_back(this->iend.getValue());
-      this->jend_sub.push_back(this->jend.getValue());      
+      this->jend_sub.push_back(this->jend.getValue()); 
+      
+      this->latvalue_sub.push_back(this->latvalue.getValue());
+      this->lonvalue_sub.push_back(this->lonvalue.getValue());   
       
 #define CLEAR_ATT(name_)\
@@ -75 +87 @@
          CLEAR_ATT(nj);
          
-         CLEAR_ATT(latvalue);
-         CLEAR_ATT(lonvalue);
 #undef CLEAR_ATT
 
@@ -83 +93 @@
       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;
    }
 
@@ -201 +204 @@
                (*__arr)[i][j] = true;
          mask.setValue(__arr);
+         __arr.reset();
       }
    }
@@ -309 +313 @@
             
             for(int count = 0, i = 0; i  < data_ni.getValue(); i++)
+            {
                for(int j = 0; j < data_nj.getValue(); j++, count++)
                { 
@@ -314 +319 @@
                   (*__arrj)[count] = j+1 ;
                }
+            }
+            data_i_index.setValue(__arri) ;
+            data_j_index.setValue(__arrj) ;            
+            __arri.reset();
+            __arrj.reset();
+         }
+      }
+   }
+
+   //----------------------------------------------------------------
+   
+   void CDomain::completeLonLat(void)
+   {
+      ARRAY(double, 1) lonvalue_ = this->lonvalue.getValue(),
+                       latvalue_ = this->latvalue.getValue();
+                       
+      if (this->data_dim.getValue() == 2)
+      {
+         StdSize dn = this->ni.getValue()*this->nj.getValue();
+         lonvalue_->resize(boost::extents[dn]);
+         latvalue_->resize(boost::extents[dn]);
+
+         for (StdSize k = 0; k < lonvalue_sub.size(); k++)
+         {
+            int l = 0;
+            ARRAY(double, 1) lonvalue_loc = this->lonvalue_sub[k],
+                             latvalue_loc = this->latvalue_sub[k];
+            const int ibegin_loc = ibegin_sub[k], iend_loc = iend_sub[k],
+                      jbegin_loc = jbegin_sub[k], jend_loc = jend_sub[k];
+                                                                 
+            for (int i = ibegin_loc-1; i <= (iend_loc-1); i++)
+            {
+               for (int j = jbegin_loc-1; j <= (jend_loc-1); j++)
+               {
+                  (*lonvalue_)[i+j*this->ni.getValue()] = (*lonvalue_loc)[l];              
+                  (*latvalue_)[i+j*this->ni.getValue()] = (*latvalue_loc)[l++];
+               }
+            }
+         }   
+         
+      }
+      else
+      {
+         StdSize dn = this->ni.getValue();
+         lonvalue_->resize(boost::extents[dn]);
+         latvalue_->resize(boost::extents[dn]);
+         
+         for (StdSize k = 0; k < lonvalue_sub.size(); k++)
+         {
+            int l = 0;
+            ARRAY(double, 1) lonvalue_loc = this->lonvalue_sub[k],
+                             latvalue_loc = this->latvalue_sub[k];
+            const int ibegin_loc = ibegin_sub[k], iend_loc = iend_sub[k],
+                      jbegin_loc = jbegin_sub[k], jend_loc = jend_sub[k];
+                      
+            for (int i = ibegin_loc-1; i <= (iend_loc-1); i++)
+               (*lonvalue_)[i] = (*lonvalue_loc)[l++];
                
-            data_i_index.setValue(__arri) ;
-            data_j_index.setValue(__arrj) ;
-         }
+            for (int j = jbegin_loc-1, l = 0; j <= (jend_loc-1); j++)
+               (*latvalue_)[j] = (*latvalue_loc)[l++];
+         }         
       }
    }
@@ -331 +393 @@
       this->checkLocalJDomain();
 
-      this->checkMask();
-      this->checkDomainData();
-      this->checkCompression();
+      if (this->latvalue_sub.size() == 0)
+      {
+         this->checkMask();
+         this->checkDomainData();
+         this->checkCompression();
+      }
+      else
+      {
+         this->completeLonLat();
+      }
       this->completeMask();
 
       this->isChecked = true;
    }
-
+   
+   //----------------------------------------------------------------
+   
    void CDomain::completeMask(void)
    {
@@ -348 +419 @@
    }
 
+   //----------------------------------------------------------------
+
    boost::shared_ptr<CMask> CDomain::getLocalMask(void) const
    {
       return (this->local_mask);
    }
+   
+   //----------------------------------------------------------------
+   
+   const std::vector<int> & CDomain::getIBeginSub(void) const
+   {
+      return (this->ibegin_sub);
+   }
+   
+   //----------------------------------------------------------------
+   
+   const std::vector<int> & CDomain::getIEndSub(void) const
+   {
+      return (this->iend_sub);
+   }
+   
+   //----------------------------------------------------------------
+   
+   const std::vector<int> & CDomain::getJBeginSub(void) const
+   {
+      return (this->jbegin_sub);
+   }
+   
+   //----------------------------------------------------------------
+   
+   const std::vector<int> & CDomain::getJEndSub(void) const
+   {
+      return (this->iend_sub);
+   }
+   
+   //----------------------------------------------------------------
+   
+   const std::vector<ARRAY(double, 1)> & CDomain::getLonValueSub(void) const
+   {
+      return (this->lonvalue_sub);
+   }
+   
+   //----------------------------------------------------------------
+   
+   const std::vector<ARRAY(double, 1)> & CDomain::getLatValueSub(void) const
+   {
+      return (this->latvalue_sub);
+   }   
+   
    ///---------------------------------------------------------------
 

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

@@ -69 +69 @@
          /// Accesseurs ///
          boost::shared_ptr<CMask> getLocalMask(void) const;
+         
          const std::set<StdString> & getRelFiles(void) const;
+
+         const std::vector<int> & getIBeginSub(void) const;
+         const std::vector<int> & getIEndSub(void) const;
+         const std::vector<int> & getJBeginSub(void) const;
+         const std::vector<int> & getJEndSub(void) const;
+         
+         const std::vector<ARRAY(double, 1)> & getLonValueSub(void) const;
+         const std::vector<ARRAY(double, 1)> & getLatValueSub(void) const;
 
          /// Test ///
          bool IsWritten(const StdString & filename) const;
-
+         
+      public :
+      
          /// Mutateur ///
          void addRelFile(const StdString & filename);
-
+         void completeLonLat(void);
+         
          /// Destructeur ///
          virtual ~CDomain(void);
@@ -94 +106 @@
 
          std::vector<int> ibegin_sub, iend_sub, jbegin_sub, jend_sub;
+         std::vector<ARRAY(double, 1)> lonvalue_sub, latvalue_sub;
 
    }; // class CDomain

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

@@ -24 +24 @@
    CField::~CField(void)
    {
+      this->grid.reset() ;
+      this->file.reset() ;
       if (this->foperation == NULL)
          delete this->foperation;

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

@@ -23 +23 @@
 
    CGrid::~CGrid(void)
-   { /* Ne rien faire de plus */ }
+   { 
+      this->axis.reset() ;
+      this->domain.reset() ;
+      
+      for (StdSize i = 0; i < this->storeIndex.size(); i++)
+      {
+         this->storeIndex[i].reset();
+         this->out_i_index[i].reset();
+         this->out_j_index[i].reset();
+         this->out_l_index[i].reset();
+      }
+   }
 
    ///---------------------------------------------------------------
@@ -88 +99 @@
       this->solveAxisRef() ;
       if (this->storeIndex.size() == 1)
+      {
          this->computeIndex() ;
+      }
+      else
+      {
+         this->computeIndexServer();
+      }
       this->isChecked = true;
    }
@@ -303 +320 @@
       this->out_l_index.push_back(out_l_index_);
    }
+   
+   //---------------------------------------------------------------
+   
+   void CGrid::computeIndexServer(void)
+   {
+      ARRAY(int, 1) storeIndex_srv   =  this->storeIndex[0];
+      ARRAY(int, 1) out_i_index_srv  =  this->out_i_index[0];
+      ARRAY(int, 1) out_j_index_srv  =  this->out_j_index[0];
+      ARRAY(int, 1) out_l_index_srv  =  this->out_l_index[0];      
+      
+      const std::vector<int> & ibegin = this->domain->getIBeginSub();
+      const std::vector<int> & jbegin = this->domain->getJBeginSub();
+      
+      StdSize dn = 0;      
+      for (StdSize j = 1; j < this->out_i_index.size(); j++)
+         dn += this->out_i_index[j]->size();
+         
+      ARRAY_ASSIGN(storeIndex_srv, int, 1, [dn]);
+      ARRAY_ASSIGN(out_i_index_srv, int, 1, [dn]);
+      ARRAY_ASSIGN(out_j_index_srv, int, 1, [dn]);
+      ARRAY_ASSIGN(out_l_index_srv, int, 1, [dn]);
+      
+      for (StdSize i = 0, dn = 0; i < ibegin.size(); i++)
+      {
+         ARRAY(int, 1) storeIndex_cl   =  this->storeIndex[i+1];
+         ARRAY(int, 1) out_i_index_cl  =  this->out_i_index[i+1];
+         ARRAY(int, 1) out_j_index_cl  =  this->out_j_index[i+1];
+         ARRAY(int, 1) out_l_index_cl  =  this->out_l_index[i+1];
+         
+         const int ibegin_cl = ibegin[i];
+         const int jbegin_cl = jbegin[i];
+         
+         for (StdSize n = dn, m = 0; n < (dn + storeIndex_cl->size()); n++, m++)
+         {
+            (*storeIndex_srv)[n]  = (*storeIndex_cl)[m]  + dn;
+            (*out_i_index_srv)[n] = (*out_i_index_cl)[m] + ibegin_cl - 1;
+            (*out_j_index_srv)[n] = (*out_j_index_cl)[m] + jbegin_cl - 1;
+            (*out_l_index_srv)[n] = (*out_l_index_cl)[m];
+         }
+                  
+         dn += storeIndex_cl->size();
+                 
+      }
+      
+      //~ StdOFStream ofs(this->getId().c_str());
+      //~ for (StdSize h = 0; h < storeIndex_srv->size(); h++)
+      //~ {
+      //~   ofs << "(" << (*storeIndex_srv)[h]  << ";"
+      //~       << (*out_i_index_srv)[h] << ","
+      //~       << (*out_j_index_srv)[h] << ","
+      //~       << (*out_l_index_srv)[h] << ")" << std::endl;
+      //~ }
+      //~ ofs.close();
+      
+   }
 
    ///---------------------------------------------------------------

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

@@ -70 +70 @@
          template <StdSize n>
             void inputField(const  ARRAY(double, n) field, ARRAY(double, 1) stored) const;
+            
+         void inputFieldServer(const std::deque<ARRAY(double, 1)> storedClient,
+                                                ARRAY(double, 1)  storedServer) const;
 
          template <StdSize n>
@@ -97 +100 @@
 
          /// Traitements protégés ///
+         void computeIndexServer(void);
          void computeIndex(void);
          void solveDomainRef(void);