Changeset 1937 for XIOS/trunk

Timestamp:

09/22/20 11:49:32 (4 years ago)

Author:

ymipsl

Message:

Fix problem when using area for domain interpolation.

YM

File:

• XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp (modified) (6 diffs)

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -128 +128 @@
   CArray<double,2> boundsLonSrc(nVertexSrc,localDomainSrcSize);
   CArray<double,2> boundsLatSrc(nVertexSrc,localDomainSrcSize);
+  CArray<double,1> areaSrc;
 
   if (domainSrc_->hasPole) srcPole[2] = 1;
@@ -178 +179 @@
     domainSrc_->fillInRectilinearBoundLonLat(lon_g,lat_g, boundsLonSrc, boundsLatSrc);
   }
-
+  
+  if (domainSrc_->hasArea) 
+  {
+    areaSrc.resize(niSrc*njSrc);
+    for (int j = 0; j < njSrc; ++j)
+      for (int i = 0; i < niSrc; ++i)
+      {
+        int k = j * niSrc + i;
+        areaSrc(k) = domainSrc_->area(i,j);
+      }
+  }
+  
   std::map<int,std::vector<std::pair<int,double> > > interpMapValueNorthPole;
   std::map<int,std::vector<std::pair<int,double> > > interpMapValueSouthPole;
@@ -188 +200 @@
   CArray<double,2> boundsLonDest(nVertexDest,localDomainDestSize);
   CArray<double,2> boundsLatDest(nVertexDest,localDomainDestSize);
+  CArray<double,1> areaDest;
 
   if (domainDest_->hasPole) dstPole[2] = 1;
@@ -269 +282 @@
     domainDest_->fillInRectilinearBoundLonLat(lon_g,lat_g, boundsLonDest, boundsLatDest);
   }
-
+ 
+  if (domainDest_->hasArea) 
+  {
+    areaDest.resize(niDest*njDest);
+    for (int j = 0; j < njDest; ++j)
+      for (int i = 0; i < niDest; ++i)
+      {
+        int k = j * niDest + i;
+        areaDest(k) = domainDest_->area(i,j);
+      }
+  }
+ 
 
 
@@ -329 +353 @@
         boundsLatSrcUnmasked(n,nSrcLocalUnmasked) = boundsLatSrc(n,idx) ;
       }
-      if (hasSrcArea) areaSrcUnmasked(nSrcLocalUnmasked) = domainSrc_->areavalue(idx)*srcAreaFactor ;
+      if (hasSrcArea) areaSrcUnmasked(nSrcLocalUnmasked) = areaSrc(idx)*srcAreaFactor ;
       globalSrcUnmasked[nSrcLocalUnmasked]=globalSrc[idx] ;
       ++nSrcLocalUnmasked ;
@@ -358 +382 @@
         boundsLatDestUnmasked(n,nDstLocalUnmasked) = boundsLatDest(n,idx) ;
       }
-      if (hasDstArea) areaDstUnmasked(nDstLocalUnmasked) = domainDest_->areavalue(idx)*dstAreaFactor ;
+      if (hasDstArea) areaDstUnmasked(nDstLocalUnmasked) = areaDest(idx)*dstAreaFactor ;
       globalDstUnmasked[nDstLocalUnmasked]=globalDst[idx] ;
       ++nDstLocalUnmasked ;