Changeset 1114 for XIOS/trunk/src

Timestamp:

05/03/17 15:07:53 (7 years ago)

Author:

ymipsl

Message:

Add conservative remapping option for quantity, ie, the integrated value over a cell area.

YM

Location:

XIOS/trunk/src

Files:

• config/interpolate_domain_attribute.conf (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (2 diffs)

XIOS/trunk/src/config/interpolate_domain_attribute.conf

@@ -2 +2 @@
 DECLARE_ATTRIBUTE(int, order)
 DECLARE_ATTRIBUTE(bool, renormalize)
+DECLARE_ATTRIBUTE(bool, quantity)
 
 /* Write interpolation weights into file */

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -100 +100 @@
   int orderInterp = interpDomain_->order.getValue();
   bool renormalize ;
+  bool quantity ;
 
   if (interpDomain_->renormalize.isEmpty()) renormalize=true;
   else renormalize = interpDomain_->renormalize;
+
+  if (interpDomain_->quantity.isEmpty()) quantity=false;
+  else quantity = interpDomain_->quantity;
 
   const double poleValue = 90.0;
@@ -342 +346 @@
   mapper.setTargetMesh(boundsLonDestUnmasked.dataFirst(), boundsLatDestUnmasked.dataFirst(), nVertexDest, nDstLocalUnmasked, &dstPole[0], globalDstUnmasked);
 
-  std::vector<double> timings = mapper.computeWeights(orderInterp,renormalize);
+  std::vector<double> timings = mapper.computeWeights(orderInterp,renormalize,quantity);
 
   std::map<int,std::vector<std::pair<int,double> > > interpMapValue;