Changeset 183

Timestamp:

04/26/11 09:38:40 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio

Files:

• array.hpp (modified) (1 diff)
• fake_client/fake_nemo.f90 (modified) (2 diffs)
• manager/tree_manager.hpp (modified) (1 diff)
• node/domain.cpp (modified) (11 diffs)
• node/domain.hpp (modified) (4 diffs)
• node/grid.cpp (modified) (3 diffs)
• node/grid.hpp (modified) (1 diff)
• output/nc4_data_output.cpp (modified) (1 diff)
• output/onetcdf4.cpp (modified) (2 diffs)
• output/onetcdf4.hpp (modified) (1 diff)

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

@@ -47 +47 @@
 
       public:
-      
+
          void toBinary  (StdOStream & os) const;
          void fromBinary(StdIStream & is);

XMLIO_V2/dev/dev_rv/src/xmlio/fake_client/fake_nemo.f90

@@ -19 +19 @@
                                                   comm_client_grp,   & ! communicateur du groupe de clients
                                                   comm_client_server   ! communicateur client-serveur
-      REAL(kind = 8), DIMENSION(10000)   :: real_array
+      REAL(kind = 8), DIMENSION(10000)  :: real_array
       INTEGER                           :: rankGrp, error
       INTEGER                           :: ibegin, iend, jbegin, jend, data_ni, data_ibegin
@@ -138 +138 @@
 
       CALL set_field_attributes(field_hdl  = temp_mod,  &
-                                ftype          = GFIELD,    &
-                                operation_     = "instant", &
+                                ftype      = GFIELD,    &
+                                operation_ = "instant", &
                                 enabled_   = .FALSE._1)
 

XMLIO_V2/dev/dev_rv/src/xmlio/manager/tree_manager.hpp

@@ -23 +23 @@
             static void SetCurrentContextId(const StdString & id);
             static boost::shared_ptr<CContext> CreateContext(const StdString & id = StdString(""));
+            
+            template<typename ObjType, typename AttType> // Pas encore implémenté
+               static void SetAttribute(ObjType & obj, const StdString & attname, const AttType & attvalue);
+            template<typename ObjType, typename AttType> // Pas encore implémenté
+               static void SetAttribute(const StdString & objname, const StdString & attname, const AttType & attvalue);
 
             /// Sortie ///

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

@@ -14 +14 @@
    CDomain::CDomain(void)
       : CObjectTemplate<CDomain>(), CDomainAttributes()
-      , isChecked(false), local_mask(new CMask()), relFiles()
+      , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[10][10])), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
       , lonvalue_sub(), latvalue_sub()
@@ -21 +21 @@
    CDomain::CDomain(const StdString & id)
       : CObjectTemplate<CDomain>(id), CDomainAttributes()
-      , isChecked(false), local_mask(new CMask()), relFiles()
+      , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[10][10])), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
       , lonvalue_sub(), latvalue_sub()
@@ -112 +112 @@
    }
 
-
    //----------------------------------------------------------------
 
@@ -162 +161 @@
          nj.setValue(jend.getValue() - jbegin.getValue() + 1) ;
 
-      else if (!jbegin.isEmpty() && !jend.isEmpty() &&
-               !nj.isEmpty() && (jend.getValue() != jbegin.getValue() + nj.getValue() - 1))
+      else if (!jbegin.isEmpty() && !jend.isEmpty() && !nj.isEmpty() &&
+               (jend.getValue() != jbegin.getValue() + nj.getValue() - 1))
       {
          ERROR("CDomain::checkAttributes(void)",
@@ -188 +187 @@
    void CDomain::checkMask(void)
    {
+      using namespace std;
+      
+      int ibegin_mask = 0,
+          jbegin_mask = 0,
+          iend_mask = iend.getValue() - ibegin.getValue(),
+          jend_mask = jend.getValue() - jbegin.getValue();
+      
+      if (!zoom_ibegin.isEmpty())
+      {
+         int zoom_iend = zoom_jbegin.getValue() + zoom_nj.getValue() - 1;
+         int zoom_jend = zoom_jbegin.getValue() + zoom_nj.getValue() - 1;
+         
+         ibegin_mask = max (ibegin.getValue(), zoom_ibegin.getValue());
+         jbegin_mask = max (jbegin.getValue(), zoom_jbegin.getValue());
+         iend_mask   = min (iend.getValue(), zoom_iend);
+         jend_mask   = min (jend.getValue(), zoom_jend);
+         
+         ibegin_mask -= ibegin.getValue();
+         jbegin_mask -= jbegin.getValue();
+         iend_mask   -= ibegin.getValue();
+         jend_mask   -= jbegin.getValue();
+      }
+      
+      //~ std::cout << "-------------------" << std::endl
+      //~           << "zoom : " << std::boolalpha << (!zoom_ibegin.isEmpty()) << std::endl
+      //~           << "size : " << ni.getValue()  << " X " << nj.getValue()   << std::endl
+      //~           << "i : " << ibegin_mask << ", " << iend_mask << std::endl
+      //~           << "j : " << jbegin_mask << ", " << jend_mask << std::endl
+      //~           << "-------------------" << std::endl;
+
       if (!mask.isEmpty())
       {
+         ARRAY(bool, 2) mask_ = mask.getValue();
          unsigned int niu = ni.getValue(), nju = nj.getValue();
-         if ((mask.getValue()->shape()[0] != niu) ||
-             (mask.getValue()->shape()[1] != nju))
+         if ((mask_->shape()[0] != niu) ||
+             (mask_->shape()[1] != nju))
             ERROR("CDomain::checkAttributes(void)",
                   <<"Le masque n'a pas la même taille que le domaine local") ;
+                  
+         for (int i = 0; i < ni.getValue(); i++)
+         {
+            for (int j = 0; j < nj.getValue(); j++)
+            {
+               if (i < ibegin_mask && i > iend_mask &&
+                   j < jbegin_mask && j > jend_mask )
+                     (*mask_)[i][j] = false;
+            }
+         }
       }
       else // (!mask.hasValue())
@@ -201 +241 @@
          ARRAY_CREATE(__arr, bool, 2, [ni.getValue()][nj.getValue()]);
          for (int i = 0; i < ni.getValue(); i++)
+         {
             for (int j = 0; j < nj.getValue(); j++)
-               (*__arr)[i][j] = true;
+            {
+               if (i >= ibegin_mask && i <= iend_mask &&
+                   j >= jbegin_mask && j <= jend_mask )
+                     (*__arr)[i][j] = true;
+               else  (*__arr)[i][j] = false;
+            }
+         }
+               
+               
          mask.setValue(__arr);
          __arr.reset();
@@ -315 +364 @@
             {
                for(int j = 0; j < data_nj.getValue(); j++, count++)
-               { 
+               {
                   (*__arri)[count] = i+1 ;
                   (*__arrj)[count] = j+1 ;
@@ -385 +434 @@
    //----------------------------------------------------------------
 
+   void CDomain::checkZoom(void)
+   {
+      if (!this->zoom_ni.isEmpty() || !this->zoom_nj.isEmpty() ||
+          !this->zoom_ibegin.isEmpty() || !this->zoom_jbegin.isEmpty())
+      {
+         if (this->zoom_ni.isEmpty()     && this->zoom_nj.isEmpty() &&
+             this->zoom_ibegin.isEmpty() && this->zoom_jbegin.isEmpty())
+         {
+            ERROR("CDomain::checkZoom(void)",
+                  <<"Les attributs définissant un zoom doivent tous être définis") ;
+         }
+         else
+         {
+            int zoom_iend = zoom_jbegin.getValue() + zoom_nj.getValue() - 1;
+            int zoom_jend = zoom_jbegin.getValue() + zoom_nj.getValue() - 1;
+                
+            if (zoom_ibegin.getValue() < 1  || zoom_jbegin.getValue() < 1 ||
+                zoom_iend > iend.getValue() || zoom_jend > jend.getValue())
+               ERROR("CDomain::checkZoom(void)",
+                     << "Zoom mal défini,"
+                     << " vérifiez les valeurs zoom_ni, zoom_nj, zoom_ibegin, zoom_ibegin") ;
+         }
+      }   
+   }
+
+   //----------------------------------------------------------------
+
    void CDomain::checkAttributes(void)
    {
@@ -392 +468 @@
       this->checkLocalIDomain();
       this->checkLocalJDomain();
+      
+      this->checkZoom();
 
       if (this->latvalue_sub.size() == 0)
-      {
+      { // CÎté client uniquement
          this->checkMask();
          this->checkDomainData();
@@ -400 +478 @@
       }
       else
-      {
+      { // CÎté serveur uniquement
          this->completeLonLat();
       }
@@ -412 +490 @@
    void CDomain::completeMask(void)
    {
-      this->local_mask->resize(ni.getValue(), nj.getValue());
-      /*this->local_mask->setDataPosition
-         (data_dim.getValue(), data_ni.getValue(), data_nj.getValue(),
-          data_ibegin.getValue(), data_jbegin.getValue(), data_n_index.getValue(),
-          data_i_index.getValue(), data_j_index.getValue());*/
-   }
-
-   //----------------------------------------------------------------
-
-   boost::shared_ptr<CMask> CDomain::getLocalMask(void) const
+      this->local_mask->resize(boost::extents[ni.getValue()][nj.getValue()]);
+   }
+
+   //----------------------------------------------------------------
+
+   ARRAY(int, 2) CDomain::getLocalMask(void) const
    {
       return (this->local_mask);

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

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "group_factory.hpp"
-#include "mask.hpp"
 
 #include "declare_group.hpp"
@@ -51 +50 @@
       private :
 
-         virtual void checkGlobalDomain(void);
+         void checkGlobalDomain(void);
 
-         virtual void checkLocalIDomain(void);
-         virtual void checkLocalJDomain(void);
+         void checkLocalIDomain(void);
+         void checkLocalJDomain(void);
 
-         virtual void checkMask(void);
-         virtual void checkDomainData(void);
-         virtual void checkCompression(void);
+         void checkMask(void);
+         void checkDomainData(void);
+         void checkCompression(void);
+         
+         void checkZoom(void);
 
-         virtual void completeMask(void);
+         void completeMask(void);
 
       public :
@@ -68 +69 @@
 
          /// Accesseurs ///
-         boost::shared_ptr<CMask> getLocalMask(void) const;
+         ARRAY(int, 2) getLocalMask(void) const;
          
          const std::set<StdString> & getRelFiles(void) const;
@@ -102 +103 @@
          /// Proriétés protégées ///
          bool isChecked;
-         boost::shared_ptr<CMask> local_mask;
+         ARRAY(int, 2) local_mask;
          std::set<StdString> relFiles;
 

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

@@ -332 +332 @@
       const std::vector<int> & ibegin = this->domain->getIBeginSub();
       const std::vector<int> & jbegin = this->domain->getJBeginSub();
+      
+      const int ibegin_srv = this->domain->ibegin.getValue();
+      const int jbegin_srv = this->domain->jbegin.getValue();
       
       StdSize dn = 0;      
@@ -355 +358 @@
          {
             (*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_i_index_srv)[n] = (*out_i_index_cl)[m] + (ibegin_cl - 1) - (ibegin_srv - 1);
+            (*out_j_index_srv)[n] = (*out_j_index_cl)[m] + (jbegin_cl - 1) - (jbegin_srv - 1);
             (*out_l_index_srv)[n] = (*out_l_index_cl)[m];
          }
@@ -375 +378 @@
       
    }
+   
+   //----------------------------------------------------------------
+   
+   void CGrid::inputFieldServer
+         (const std::deque<ARRAY(double, 1)> storedClient,
+                           ARRAY(double, 1)  storedServer) const
+   {
+      if (this->storeIndex.size()-1 != storedClient.size())
+         ERROR("CGrid::inputFieldServer(...)",
+                << "[ Nombre de tableau attendu = " << (this->storeIndex.size()-1) << ", "
+                << "[ Nombre de tableau reçu = "    << storedClient.size() << "] "
+                << "Les données d'un client sont manquantes !") ;
+      if (storedServer.get() != NULL)
+         storedServer->resize(boost::extents[this->storeIndex.size()-1]);
+      else 
+         ARRAY_ASSIGN(storedServer, double, 1, [this->storeIndex.size()-1]);
+         
+      for (StdSize i = 0, n = 0; i < storedClient.size(); i++)
+         for (StdSize j = 0; j < storedClient[i]->num_elements(); j++)
+            (*storedServer)[n++] = (*storedClient[i])[j];
+   }
 
    ///---------------------------------------------------------------

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

@@ -69 +69 @@
          /// Entrées-sorties de champs ///
          template <StdSize n>
-            void inputField(const  ARRAY(double, n) field, ARRAY(double, 1) stored) const;
+            void inputField(const ARRAY(double, n) field, ARRAY(double, 1) stored) const;
             
          void inputFieldServer(const std::deque<ARRAY(double, 1)> storedClient,

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp

@@ -74 +74 @@
          StdString maskid    = StdString("mask_").append(domid).append("_local");
 
-         boost::shared_ptr<CMask> mask = domain->getLocalMask();
+         ARRAY(int, 2) mask = domain->getLocalMask();
 
          unsigned int ssize = domain->ni.getValue() * domain->nj.getValue();

XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.cpp

@@ -341 +341 @@
       }
 
-      void CONetCDF4::writeData(const boost::shared_ptr<CMask> data, const StdString & name)
+      void CONetCDF4::writeData(const ARRAY(int, 2) data, const StdString & name)
       {
          int grpid = this->getCurrentGroup();
@@ -349 +349 @@
 
          this->getWriteDataInfos(name, 0, array_size,  sstart, scount, NULL, NULL);
-          CheckError(nc_put_vara_int(grpid, varid, &(sstart[0]), &(scount[0]), data->getData()));
+          CheckError(nc_put_vara_int(grpid, varid, &(sstart[0]), &(scount[0]), data->data()));
       }
 

XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.hpp

@@ -62 +62 @@
                               const std::vector<StdSize> * count = NULL);
 
-            void writeData(const boost::shared_ptr<CMask> data, const StdString & name);
+            void writeData(const ARRAY(int, 2) data, const StdString & name);
 
             /// Accesseur ///