Changeset 611 for XIOS/trunk/src/node/domain.cpp

Timestamp:

06/10/15 10:39:11 (9 years ago)

Author:

rlacroix

Message:

Improve CF compliance: Add a new domain attribute "area".

Fixes ticket #68.

File:

• XIOS/trunk/src/node/domain.cpp (modified) (18 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -24 +24 @@
       : CObjectTemplate<CDomain>(), CDomainAttributes()
       , isChecked(false), relFiles(), isClientChecked(false), nbConnectedClients_(), indSrv_(), connectedServerRank_()
-      , isDistributed_(false)
+      , hasBounds(false), hasArea(false), isDistributed_(false)
    { /* Ne rien faire de plus */ }
 
@@ -30 +30 @@
       : CObjectTemplate<CDomain>(id), CDomainAttributes()
       , isChecked(false), relFiles(), isClientChecked(false), nbConnectedClients_(), indSrv_(), connectedServerRank_()
-      , isDistributed_(false)
+      , hasBounds(false), hasArea(false), isDistributed_(false)
          { /* Ne rien faire de plus */ }
 
@@ -119 +119 @@
           for(int j=0;j<nj;j++) mask(0,j)=mask_tmp(j,0) ;
          }
+
+         if (!area.isEmpty())
+           area.transposeSelf(1, 0);
+
          ni=1 ;
          ibegin=0 ;
@@ -553 +557 @@
      {
        hasBounds=true ;
-
      }
      else
@@ -562 +565 @@
    }
 
+   void CDomain::checkArea(void)
+   {
+     hasArea = !area.isEmpty();
+     if (hasArea)
+     {
+       if (area.extent(0) != ni || area.extent(1) != nj)
+       {
+         ERROR("void CDomain::checkArea(void)",
+               "The area attribute must be of size ni x nj.");
+       }
+     }
+   }
+
    //----------------------------------------------------------------
    // Divide function checkAttributes into 2 seperate ones
@@ -573 +589 @@
       this->checkZoom();
       this->checkBounds();
+      this->checkArea();
 
       if (context->hasClient)
@@ -601 +618 @@
      {
        sendServerAttribut() ;
-       sendLonLat() ;
+       sendLonLatArea() ;
      }
 
@@ -615 +632 @@
       this->checkZoom();
       this->checkBounds();
+      this->checkArea();
 
       if (context->hasClient)
@@ -633 +651 @@
         computeConnectedServer() ;
         sendServerAttribut() ;
-        sendLonLat() ;
+        sendLonLatArea() ;
       }
 
@@ -790 +808 @@
   }
 
-  void CDomain::sendLonLat(void)
+  void CDomain::sendLonLatArea(void)
   {
     int ns, n, i, j, ind, nv, idx;
@@ -800 +818 @@
     CEventClient eventLon(getType(), EVENT_ID_LON);
     CEventClient eventLat(getType(), EVENT_ID_LAT);
-
-    list<CMessage> list_msgsIndex, list_msgsLon, list_msgsLat;
+    CEventClient eventArea(getType(), EVENT_ID_AREA);
+
+    list<CMessage> list_msgsIndex, list_msgsLon, list_msgsLat, list_msgsArea;
     list<CArray<int,1> > list_indi, list_indj;
     list<CArray<double,1> > list_lon, list_lat;
     list<CArray<double,2> > list_boundslon, list_boundslat;
+    list<CArray<double,1> > list_area;
 
     std::map<int, std::vector<size_t> >::const_iterator it, iteMap;
@@ -826 +846 @@
         list_boundslat.push_back(CArray<double,2>(nvertex, nbData));
       }
+      if (hasArea)
+        list_area.push_back(CArray<double,1>(nbData));
 
       CArray<int,1>& indi = list_indi.back();
@@ -856 +878 @@
         indi(n) = ibegin + i_index(i - ibegin, j - jbegin);
         indj(n) = jbegin + j_index(i - ibegin, j - jbegin);
+
+        if (hasArea)
+          list_area.back()(n) = area(i - ibegin, j - jbegin);
       }
 
@@ -879 +904 @@
       eventLon.push(rank, nbConnectedClients_[rank], list_msgsLon.back());
       eventLat.push(rank, nbConnectedClients_[rank], list_msgsLat.back());
+
+      if (hasArea)
+      {
+        list_msgsArea.push_back(CMessage());
+        list_msgsArea.back() << this->getId() << list_area.back();
+        eventArea.push(rank, nbConnectedClients_[rank], list_msgsArea.back());
+      }
     }
 
@@ -884 +916 @@
     client->sendEvent(eventLon);
     client->sendEvent(eventLat);
+    if (hasArea)
+      client->sendEvent(eventArea);
   }
 
@@ -909 +943 @@
           return true;
           break;
+        case EVENT_ID_AREA:
+          recvArea(event);
+          return true;
+          break;
         default:
           ERROR("bool CContext::dispatchEvent(CEventServer& event)",
@@ -956 +994 @@
       bounds_lat_srv = 0. ;
     }
+
+    if (hasArea)
+      area_srv.resize(zoom_ni_srv * zoom_nj_srv);
   }
 
@@ -1047 +1088 @@
   }
 
+  void CDomain::recvArea(CEventServer& event)
+  {
+    list<CEventServer::SSubEvent>::iterator it;
+    for (it = event.subEvents.begin(); it != event.subEvents.end(); ++it)
+    {
+      CBufferIn* buffer = it->buffer;
+      string domainId;
+      *buffer >> domainId;
+      get(domainId)->recvArea(it->rank, *buffer);
+    }
+  }
+
+  void CDomain::recvArea(int rank, CBufferIn& buffer)
+  {
+    CArray<int,1> &indi = indiSrv[rank], &indj = indjSrv[rank];
+    CArray<double,1> clientArea;
+
+    buffer >> clientArea;
+
+    int i, j, ind_srv;
+    for (int ind = 0; ind < indi.numElements(); ind++)
+    {
+      i = indi(ind); j = indj(ind);
+      ind_srv = (i - zoom_ibegin_srv) + (j - zoom_jbegin_srv) * zoom_ni_srv;
+      area_srv(ind_srv) = clientArea(ind);
+    }
+  }
+
    //----------------------------------------------------------------