Changeset 187 for XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.cpp

Timestamp:

05/03/11 11:55:06 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.cpp (modified) (10 diffs)

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

@@ -5 +5 @@
 #include "group_template_impl.hpp"
 
+#include "mpi_manager.hpp"
+
 #include <algorithm>
 
@@ -14 +16 @@
    CDomain::CDomain(void)
       : CObjectTemplate<CDomain>(), CDomainAttributes()
-      , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[10][10])), relFiles()
+      , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[0][0])), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
       , lonvalue_sub(), latvalue_sub()
@@ -21 +23 @@
    CDomain::CDomain(const StdString & id)
       : CObjectTemplate<CDomain>(id), CDomainAttributes()
-      , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[10][10])), relFiles()
+      , isChecked(false), local_mask(new CArray<int, 2>(boost::extents[0][0])), relFiles()
       , ibegin_sub(), iend_sub(), jbegin_sub(), jend_sub()
       , lonvalue_sub(), latvalue_sub()
@@ -124 +126 @@
           (ni_glo.isEmpty() || nj_glo.getValue() <= 0 ))
          ERROR("CDomain::checkAttributes(void)",
+               << "[ Id = " << this->getId() << " ] "
                << "Le domaine global est mal défini,"
                << " vérifiez les valeurs de \'ni_glo\' et \'nj_glo\' !") ;
@@ -159 +162 @@
           ibegin.getValue() < 1 || iend.getValue() > ni_glo.getValue())
          ERROR("CDomain::checkAttributes(void)",
+               << "[ Id = " << this->getId() << " ] "
                << "Domaine local mal défini,"
                << " vérifiez les valeurs ni, ni_glo, ibegin, iend") ;
@@ -294 +298 @@
          data_ibegin.setValue(0) ;
       if (data_jbegin.isEmpty() && (data_dim.getValue() == 2))
-           data_jbegin.setValue(0) ;
+         data_jbegin.setValue(0) ;
 
       if (!data_ni.isEmpty() && (data_ni.getValue() <= 0))
@@ -398 +402 @@
    void CDomain::completeLonLat(void)
    {
-      //ARRAY_CREATE(value, valuetype, numdims, extent)// todo
-      //ARRAY_CREATE(value, valuetype, numdims, extent)
+      ARRAY_CREATE(lonvalue_temp, double, 1, [0]);
+      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();
+                      
+      /*std::cout << "Rang du serveur :" << comm::CMPIManager::GetCommRank()   << std::endl
+                << "Begin serv : "     << ibegin_serv << ", " << jbegin_serv <<  std::endl
+                << "End serv : "       << iend_serv   << ", " << jend_serv   <<  std::endl
+                << "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(),
@@ -406 +422 @@
       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]);
-
-         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]);
+         lonvalue_temp->resize(boost::extents[dm]);
+         latvalue_temp->resize(boost::extents[dm]);
          
          for (StdSize k = 0; k < lonvalue_sub.size(); k++)
@@ -442 +438 @@
                       jbegin_loc = jbegin_sub[k], jend_loc = jend_sub[k];
                       
-            for (int i = ibegin_loc-1; i <= (iend_loc-1); i++)
+            for (int i = ibegin_loc - ibegin_serv; i < (iend_loc - ibegin_serv + 1); i++)
+            {
+               for (int j = jbegin_loc - jbegin_serv; j < (jend_loc - jbegin_serv + 1); j++)
+               {
+                  (*lonvalue_)[i + j * this->ni.getValue()] = (*lonvalue_loc)[l];              
+                  (*latvalue_)[i + j * this->ni.getValue()] = (*latvalue_loc)[l++];
+               }
+            }
+         }
+         this->lonvalue.setValue(lonvalue_temp);
+         this->latvalue.setValue(latvalue_temp);
+      }
+      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]);
+         
+         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 - ibegin_serv; i < (iend_loc - ibegin_loc + 1); i++)
                (*lonvalue_)[i] = (*lonvalue_loc)[l++];
                
-            for (int j = jbegin_loc-1, l = 0; j <= (jend_loc-1); j++)
+            for (int j = jbegin_loc - jbegin_serv; j < (jend_loc - jbegin_loc + 1); j++)
                (*latvalue_)[j] = (*latvalue_loc)[l++];
-         }         
+         }       
+         this->lonvalue.setValue(lonvalue_temp);
+         this->latvalue.setValue(latvalue_temp);
       }
    }
@@ -551 +576 @@
       else
       { // CÎté serveur uniquement
-         this->completeLonLat();
+         if (!this->isEmpty())
+            this->completeLonLat();
       }
       this->completeMask();