Changeset 278 for XMLIO_V2/dev/common/src/xmlio/node

Timestamp:

09/21/11 09:42:30 (13 years ago)

Author:

hozdoba

Message:

Corrections

Location:

XMLIO_V2/dev/common/src/xmlio/node

Files:

• context.cpp (modified) (3 diffs)
• domain.cpp (modified) (10 diffs)
• domain.hpp (modified) (1 diff)
• field.cpp (modified) (4 diffs)
• field.hpp (modified) (1 diff)
• grid.cpp (modified) (4 diffs)

XMLIO_V2/dev/common/src/xmlio/node/context.cpp

@@ -8 +8 @@
 
 #include "calendar_type.hpp"
+#include "duration.hpp"
 
 #include "data_treatment.hpp"
@@ -82 +83 @@
                << "Impossible de définir un calendrier (un attribut est manquant).");
 
-#define DECLARE_CALENDAR(MType  , mtype)                        \
-   if (calendar_type.getValue().compare(#mtype) == 0)           \
-   {                                                            \
-      this->calendar =  boost::shared_ptr<date::CCalendar>      \
-         (new date::C##MType##Calendar(start_date.getValue())); \
-      return;                                                   \
+#define DECLARE_CALENDAR(MType  , mtype)                            \
+   if (calendar_type.getValue().compare(#mtype) == 0)               \
+   {                                                                \
+      this->calendar =  boost::shared_ptr<date::CCalendar>          \
+         (new date::C##MType##Calendar(start_date.getValue()));     \
+      if (!this->timestep.isEmpty())                                \
+       this->calendar->setTimeStep                                  \
+          (date::CDuration::FromString(this->timestep.getValue())); \
+      return;                                                       \
    }
 #include "calendar_type.conf"
@@ -103 +107 @@
 
       // PARSING POUR GESTION DES ENFANTS
-      xml::THashAttributes attributes;
+      xml::THashAttributes attributes = node.getAttributes();
+
+      if (attributes.end() != attributes.find("src"))
+      {
+         StdIFStream ifs ( attributes["src"].c_str() , StdIFStream::in );
+         if (!ifs.good())
+            ERROR("CContext::parse(xml::CXMLNode & node)",
+                  << "[ filename = " << attributes["src"] << " ] Bad xml stream !");
+         xml::CXMLParser::ParseInclude(ifs, *this);
+      }
 
       if (node.getElementName().compare(CContext::GetName()))

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

@@ -20 +20 @@
       , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[0][0])), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
-      , ibegin_zoom_sub(), jbegin_zoom_sub()
+      , ibegin_zoom_sub(), jbegin_zoom_sub(), ni_zoom_sub(), nj_zoom_sub()
       , lonvalue_sub(), latvalue_sub()
    { /* Ne rien faire de plus */ }
@@ -28 +28 @@
       , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[0][0])), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
-      , ibegin_zoom_sub(), jbegin_zoom_sub()
+      , ibegin_zoom_sub(), jbegin_zoom_sub(),ni_zoom_sub(), nj_zoom_sub()
       , lonvalue_sub(), latvalue_sub()
    { /* Ne rien faire de plus */ }
@@ -100 +100 @@
          this->ibegin_zoom_sub.push_back(this->zoom_ibegin_loc.getValue());
          this->jbegin_zoom_sub.push_back(this->zoom_jbegin_loc.getValue());
+         this->ni_zoom_sub.push_back(this->zoom_ni_loc.getValue());
+         this->nj_zoom_sub.push_back(this->zoom_nj_loc.getValue());
       
          this->latvalue_sub.push_back(this->latvalue.getValue());
@@ -151 +153 @@
           (nj_glo.isEmpty() || nj_glo.getValue() <= 0 ))
       {
-         abort();
          ERROR("CDomain::checkAttributes(void)",
                << "[ Id = " << this->getId() << " ] "
@@ -454 +455 @@
             for (int j = 0; j < zoom_nj_client; j++)
             {
-               (*lonvalue_temp)[i + j * zoom_ni_client] = (*lonvalue_)[(i + zoom_ibegin_client -1)+(j + zoom_jbegin_client -1)*ni.getValue()];              
-               (*latvalue_temp)[i + j * zoom_ni_client] = (*latvalue_)[(i + zoom_ibegin_client -1)+(j + zoom_jbegin_client -1)*ni.getValue()];
+               (*lonvalue_temp)[i + j * zoom_ni_client] =
+               (*lonvalue_)[(i + zoom_ibegin_client -1)+(j + zoom_jbegin_client -1)*ni.getValue()];              
+               (*latvalue_temp)[i + j * zoom_ni_client] =
+               (*latvalue_)[(i + zoom_ibegin_client -1)+(j + zoom_jbegin_client -1)*ni.getValue()];
             }
          }
@@ -488 +491 @@
       ARRAY_CREATE(latvalue_temp, double, 1, [0]);
       
-      const int ibegin_serv  = ibegin.getValue(),
-                jbegin_serv  = jbegin.getValue(),
-                zoom_ni_serv = zoom_ni_loc.getValue(),
-                zoom_nj_serv = zoom_nj_loc.getValue();
+      const int ibegin_serv     = ibegin.getValue(),
+                jbegin_serv     = jbegin.getValue(),
+                zoom_ni_serv    = zoom_ni_loc.getValue(),
+                zoom_nj_serv    = zoom_nj_loc.getValue(),
+                ibegin_zoom_srv = zoom_ibegin_loc.getValue(),
+                jbegin_zoom_srv = zoom_jbegin_loc.getValue();
                       
       /*std::cout << "Rang du serveur :" << comm::CMPIManager::GetCommRank()   << std::endl
@@ -498 +503 @@
                 << "Zoom_loc begin : " << zoom_ibegin_loc << ", " << zoom_jbegin_loc <<  std::endl
                 << "Zoom_loc size : "  << zoom_ni_loc << ", " << zoom_nj_loc <<  std::endl;*/
-      
-      
-      ARRAY(double, 1) lonvalue_ = this->lonvalue.getValue(),
-                       latvalue_ = this->latvalue.getValue();
                        
       if (this->data_dim.getValue() == 2)
       {
-         StdSize dm = zoom_ni_serv * zoom_nj_serv;
-         StdSize dn = this->ni.getValue() * this->nj.getValue();
-         
-         lonvalue_->resize(boost::extents[dn]);
-         latvalue_->resize(boost::extents[dn]);
+         StdSize dm = zoom_ni_serv * zoom_nj_serv;      
+         
          lonvalue_temp->resize(boost::extents[dm]);
          latvalue_temp->resize(boost::extents[dm]);
@@ -515 +513 @@
          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];
+            const int zoom_ibegin_cl = ibegin_zoom_sub[k], zoom_ni_cl = ni_zoom_sub[k],
+                      zoom_jbegin_cl = jbegin_zoom_sub[k], zoom_nj_cl = nj_zoom_sub[k],
+                      ni_cl = iend_sub[k] - ibegin_sub[k] + 1;
                       
-            for (int i = ibegin_loc - ibegin_serv; i < (iend_loc - ibegin_serv + 1); i++)
+            for (int i = 0; i < zoom_ni_cl; i++)
             {
-               for (int j = jbegin_loc - jbegin_serv; j < (jend_loc - jbegin_serv + 1); j++)
+               for (int j = 0; j < zoom_nj_cl; j++)
                {
-                  (*lonvalue_)[i + j * this->ni.getValue()] = (*lonvalue_loc)[l];      // erreur        
-                  (*latvalue_)[i + j * this->ni.getValue()] = (*latvalue_loc)[l++];    // erreur
+                  int ii = i /*- (ibegin_serv - 1)*/ + (zoom_ibegin_cl - 1) - (ibegin_zoom_srv - 1);
+                  int jj = j /*- (jbegin_serv - 1)*/ + (zoom_jbegin_cl - 1) - (jbegin_zoom_srv - 1);
+                  (*lonvalue_temp)[ii + jj * zoom_ni_serv] =
+                  (*lonvalue_loc)[i + j * zoom_ni_cl];
+                  (*latvalue_temp)[ii + jj * zoom_ni_serv] = 
+                  (*latvalue_loc)[i + j * zoom_ni_cl];
                }
             }
@@ -535 +537 @@
       else
       {
-         lonvalue_->resize(boost::extents[this->ni.getValue()]);
-         latvalue_->resize(boost::extents[this->nj.getValue()]);
          lonvalue_temp->resize(boost::extents[zoom_ni_serv]);
          latvalue_temp->resize(boost::extents[zoom_nj_serv]);
@@ -542 +542 @@
          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];
+            const int zoom_ibegin_cl = ibegin_zoom_sub[k], zoom_ni_cl = ni_zoom_sub[k],
+                      zoom_jbegin_cl = jbegin_zoom_sub[k], zoom_nj_cl = nj_zoom_sub[k];
                       
-            for (int i = ibegin_loc - ibegin_serv; i < (iend_loc - ibegin_loc + 1); i++)
-               (*lonvalue_)[i] = (*lonvalue_loc)[l++];
+            for (int i = 0; i < zoom_ni_cl; i++)
+               (*lonvalue_temp)[i /*- (ibegin_serv - 1)*/ + (zoom_ibegin_cl - 1) - (ibegin_zoom_srv - 1)] =
+               (*lonvalue_loc)[i];
                
-            for (int j = jbegin_loc - jbegin_serv; j < (jend_loc - jbegin_loc + 1); j++)
-               (*latvalue_)[j] = (*latvalue_loc)[l++];
+            for (int j = 0; j < zoom_nj_cl; j++)
+               (*latvalue_temp)[j /*- (jbegin_serv - 1)*/ + (zoom_jbegin_cl - 1) - (jbegin_zoom_srv - 1)] =
+               (*latvalue_loc)[j];
          }       
          this->lonvalue.setValue(lonvalue_temp);

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

@@ -113 +113 @@
 
          std::vector<int> ibegin_sub, iend_sub, jbegin_sub, jend_sub;
-         std::vector<int> ibegin_zoom_sub, jbegin_zoom_sub;
+         std::vector<int> ibegin_zoom_sub, jbegin_zoom_sub, ni_zoom_sub, nj_zoom_sub;
          std::vector<ARRAY(double, 1)> lonvalue_sub, latvalue_sub;
 

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

@@ -47 +47 @@
 
    bool CField::updateDataServer
-      (const date::CDate & currDate, const std::deque<ARRAY(double, 1)> storedClient)
-   {
-      if ((*last_operation + freq_operation) >= currDate)
-      {
-         ARRAY_CREATE(input, double, 1, [0]);
-         this->grid->inputFieldServer(storedClient, input);
+      (const date::CDate & currDate,
+       const std::deque<ARRAY(double, 1)> storedClient)
+   {
+      const date::CDate opeDate      = *last_operation + freq_operation;
+      const date::CDate writeDate    = *last_Write     + freq_write; 
+      
+      if (opeDate <= currDate)
+      {
+         if (this->data->num_elements() != this->grid->storeIndex[0]->num_elements())
+         {
+            this->data->resize(boost::extents[this->grid->storeIndex[0] ->num_elements()]);
+         }  
+         ARRAY_CREATE(input, double, 1, [this->data->num_elements()]);
+         this->grid->inputFieldServer(storedClient, input);          
          (*this->foperation)(input);
          *last_operation = currDate;
       }
-
-      if ((*last_Write + freq_write) >= currDate)
-      {
-         *last_Write = currDate;
-         return (true);
+      if (writeDate < (currDate + freq_operation))
+      {
+         this->foperation->final();
+         this->incrementNStep();
+         *last_Write = writeDate;
+         return (true);        
       }
       return (false);
@@ -232 +241 @@
                << "Impossible de définir une opération pour le champ !");
       }
+      
+      CDuration freq_offset_ = NoneDu;
+      if (!freq_offset.isEmpty())
+      {
+         freq_offset_ = CDuration::FromString(freq_offset.getValue());
+      }
+      else
+      {
+         freq_offset.setValue(NoneDu.toString());
+      }  
 
       if (CXIOSManager::GetStatus() == CXIOSManager::LOC_SERVER)
@@ -245 +264 @@
          this->foperation     =
              boost::shared_ptr<func::CFunctor>(new CInstant(this->data));
+             
+         const CDuration toffset = this->freq_operation - freq_offset_ - _context->getCalendar()->getTimeStep(); 
+         *this->last_operation   = *this->last_operation - toffset; 
       }
       else
-      {
-         CDuration freq_offset_ = NoneDu;
-         if (!freq_offset.isEmpty())
-         {
-            freq_offset_ = CDuration::FromString(freq_offset.getValue());
-         }
-         else
-         {
-            freq_offset.setValue(NoneDu.toString());
-         }   
-                  
+      {                  
          this->freq_operation = CDuration::FromString(freq_op.getValue());
          this->freq_write     = CDuration::FromString(this->file->output_freq.getValue());
@@ -264 +276 @@
          this->last_operation = boost::shared_ptr<xmlioserver::date::CDate>
                         (new date::CDate(_context->getCalendar()->getInitDate()));
+                        
          const CDuration toffset = this->freq_operation - freq_offset_ - _context->getCalendar()->getTimeStep(); 
-         *this->last_operation  = *this->last_operation - toffset;  
+         *this->last_operation   = *this->last_operation - toffset;  
          
 #define DECLARE_FUNCTOR(MType, mtype)              \

XMLIO_V2/dev/common/src/xmlio/node/field.hpp

@@ -170 +170 @@
       {
          //std::cout << "> " << currDate << ": Operation du champs" << this->getBaseFieldId() << std::endl;
-         
          if (this->data->num_elements() != this->grid->storeIndex[0]->num_elements())
          {

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

@@ -463 +463 @@
          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];
-         
+                 
          int ibegin_zoom_cl = ibegin[i]; //ibegin_zoom[i];
          int jbegin_zoom_cl = jbegin[i]; //jbegin_zoom[i];
@@ -480 +477 @@
             (*storeIndex_srv)[n]  = (*storeIndex_cl)[m]; // Faux mais inutile dans le cas serveur.
             (*out_i_index_srv)[n] = (*out_i_index_cl)[m] 
-                                  /*+ (ibegin_cl - 1)*/ - (ibegin_srv - 1) + (ibegin_zoom_cl - 1) - (ibegin_zoom_srv - 1); 
+                                  /*+ (ibegin_cl - 1) - (ibegin_srv - 1)*/ + (ibegin_zoom_cl - 1) - (ibegin_zoom_srv - 1);
             (*out_j_index_srv)[n] = (*out_j_index_cl)[m]
-                                  /*+ (jbegin_cl - 1)*/ - (jbegin_srv - 1) + (jbegin_zoom_cl - 1) - (jbegin_zoom_srv - 1);
+                                  /*+ (jbegin_cl - 1) - (jbegin_srv - 1)*/ + (jbegin_zoom_cl - 1) - (jbegin_zoom_srv - 1);
             (*out_l_index_srv)[n] = (*out_l_index_cl)[m];
          }
@@ -532 +529 @@
       this->out_i_index[0] = out_i_index_srv;
       this->out_j_index[0] = out_j_index_srv;
-      this->out_l_index[0] = out_l_index_srv;
-      
-      this->storeIndex.resize(1);
-      this->out_i_index.resize(1);
-      this->out_j_index.resize(1);
-      this->out_l_index.resize(1);
-      
+      this->out_l_index[0] = out_l_index_srv;      
    }
    
@@ -552 +543 @@
                 << "Les données d'un client sont manquantes !") ;
       if (storedServer.get() != NULL)
-         storedServer->resize(boost::extents[this->storeIndex.size()-1]);
+         storedServer->resize(boost::extents[this->storeIndex[0]->num_elements()]);
       else 
-         ARRAY_ASSIGN(storedServer, double, 1, [this->storeIndex.size()-1]);
+         ARRAY_ASSIGN(storedServer, double, 1, [this->storeIndex[0]->num_elements()]);
          
       for (StdSize i = 0, n = 0; i < storedClient.size(); i++)