Changeset 1634

Timestamp:

01/14/19 10:47:44 (6 years ago)

Author:

oabramkina

Message:

Backporting r1618 to dev before merging it to trunk.

Location:

XIOS/dev/dev_olga/src

Files:

• config/domain_attribute.conf (modified) (1 diff)
• config/interpolate_domain_attribute.conf (modified) (1 diff)
• context_client.cpp (modified) (3 diffs)
• transformation/domain_algorithm_interpolate.cpp (modified) (6 diffs)

XIOS/dev/dev_olga/src/config/domain_attribute.conf

@@ -58 +58 @@
 
 DECLARE_ARRAY(double, 2, area)
+DECLARE_ATTRIBUTE(double, radius)
 
 DECLARE_ENUM4(type,rectilinear,curvilinear,unstructured, gaussian)

XIOS/dev/dev_olga/src/config/interpolate_domain_attribute.conf

@@ -10 +10 @@
 DECLARE_ATTRIBUTE(bool, write_weight)
 DECLARE_ENUM2(read_write_convention, c, fortran)
+DECLARE_ATTRIBUTE(bool, use_area)

XIOS/dev/dev_olga/src/context_client.cpp

@@ -95 +95 @@
     {
       list<int> ranks = event.getRanks();
-
+      info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<endl ;
       if (CXios::checkEventSync)
       {
@@ -124 +124 @@
         {
           event.send(timeLine, sizes, buffList);
+          info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
 
           checkBuffers(ranks);
@@ -142 +143 @@
           info(100)<<"DEBUG : temporaly event created : timeline "<<timeLine<<endl ;
           event.send(timeLine, tmpBufferedEvent.sizes, tmpBufferedEvent.buffers);
+          info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
         }
       }

XIOS/dev/dev_olga/src/transformation/domain_algorithm_interpolate.cpp

@@ -311 +311 @@
   CArray<double,2> boundsLonSrcUnmasked(nVertexSrc,nSrcLocalUnmasked);
   CArray<double,2> boundsLatSrcUnmasked(nVertexSrc,nSrcLocalUnmasked);
+  CArray<double,1> areaSrcUnmasked(nSrcLocalUnmasked);
+  
   long int * globalSrcUnmasked = new long int [nSrcLocalUnmasked];
 
   nSrcLocalUnmasked=0 ;
+  bool hasSrcArea=domainSrc_->hasArea && !domainSrc_->radius.isEmpty() && !interpDomain_->use_area.isEmpty() && interpDomain_->use_area==true  ;
+  double srcAreaFactor ;
+  if (hasSrcArea) srcAreaFactor=1./(domainSrc_->radius*domainSrc_->radius) ;
+  
   for (int idx=0 ; idx < nSrcLocal; idx++)
   {
@@ -323 +329 @@
         boundsLatSrcUnmasked(n,nSrcLocalUnmasked) = boundsLatSrc(n,idx) ;
       }
+      if (hasSrcArea) areaSrcUnmasked(nSrcLocalUnmasked) = domainSrc_->areavalue(idx)*srcAreaFactor ;
       globalSrcUnmasked[nSrcLocalUnmasked]=globalSrc[idx] ;
       ++nSrcLocalUnmasked ;
     }
   }
-
+ 
 
   int nDstLocalUnmasked = 0 ;
@@ -334 +341 @@
   CArray<double,2> boundsLonDestUnmasked(nVertexDest,nDstLocalUnmasked);
   CArray<double,2> boundsLatDestUnmasked(nVertexDest,nDstLocalUnmasked);
+  CArray<double,1>   areaDstUnmasked(nDstLocalUnmasked);
+
   long int * globalDstUnmasked = new long int [nDstLocalUnmasked];
 
   nDstLocalUnmasked=0 ;
+  bool hasDstArea=domainDest_->hasArea && !domainDest_->radius.isEmpty() && !interpDomain_->use_area.isEmpty() && interpDomain_->use_area==true ;
+  double dstAreaFactor ;
+  if (hasDstArea) dstAreaFactor=1./(domainDest_->radius*domainDest_->radius) ;
   for (int idx=0 ; idx < nDstLocal; idx++)
   {
@@ -346 +358 @@
         boundsLatDestUnmasked(n,nDstLocalUnmasked) = boundsLatDest(n,idx) ;
       }
+      if (hasDstArea) areaDstUnmasked(nDstLocalUnmasked) = domainDest_->areavalue(idx)*dstAreaFactor ;
       globalDstUnmasked[nDstLocalUnmasked]=globalDst[idx] ;
       ++nDstLocalUnmasked ;
@@ -351 +364 @@
   }
 
-  mapper.setSourceMesh(boundsLonSrcUnmasked.dataFirst(), boundsLatSrcUnmasked.dataFirst(), nVertexSrc, nSrcLocalUnmasked, &srcPole[0], globalSrcUnmasked);
-  mapper.setTargetMesh(boundsLonDestUnmasked.dataFirst(), boundsLatDestUnmasked.dataFirst(), nVertexDest, nDstLocalUnmasked, &dstPole[0], globalDstUnmasked);
+  double* ptAreaSrcUnmasked = NULL ;
+  if (hasSrcArea) ptAreaSrcUnmasked=areaSrcUnmasked.dataFirst() ;
+
+  double* ptAreaDstUnmasked = NULL ;
+  if (hasDstArea) ptAreaDstUnmasked=areaDstUnmasked.dataFirst() ;
+
+  mapper.setSourceMesh(boundsLonSrcUnmasked.dataFirst(), boundsLatSrcUnmasked.dataFirst(), ptAreaSrcUnmasked, nVertexSrc, nSrcLocalUnmasked, &srcPole[0], globalSrcUnmasked);
+  mapper.setTargetMesh(boundsLonDestUnmasked.dataFirst(), boundsLatDestUnmasked.dataFirst(), ptAreaDstUnmasked, nVertexDest, nDstLocalUnmasked, &dstPole[0], globalDstUnmasked);
 
   std::vector<double> timings = mapper.computeWeights(orderInterp,renormalize,quantity);
@@ -986 +1005 @@
     size_t nbIndex=dataOut.numElements() ; 
 
-    for (int idx = 0; idx < nbIndex; ++idx)
-    {
-      if (allMissing(idx)) dataOut(idx) = defaultValue; // If all data source are nan then data destination must be nan
+    if (allMissing.numElements()>0)
+    {
+      for (int idx = 0; idx < nbIndex; ++idx)
+      {
+        if (allMissing(idx)) dataOut(idx) = defaultValue; // If all data source are nan then data destination must be nan
+      }
     }