Changeset 2507 for XIOS3/trunk/src/transformation/domain_algorithm/domain_algorithm_zoom.cpp

Timestamp:

06/01/23 10:58:08 (13 months ago)

Author:

ymipsl

Message:

Merging XIOS3_ATTACHED branch into XIOS3 trunk.

YM

File:

• XIOS3/trunk/src/transformation/domain_algorithm/domain_algorithm_zoom.cpp (modified) (2 diffs)

XIOS3/trunk/src/transformation/domain_algorithm/domain_algorithm_zoom.cpp

@@ -173 +173 @@
     }
   }
-  if (domainSrc_->hasArea) domainDest_->area.resize(niDest,njDest);
-
+  if (domainSrc_->hasArea)
+  {
+    if (!domainSrc_->area_1d.isEmpty()) domainDest_->area_1d.resize(niDest*njDest);
+    else if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d.resize(niDest,njDest);
+  }
 
   for (int iDest = 0; iDest < niDest; iDest++)
@@ -196 +199 @@
 
       if (domainSrc_->hasArea)
-        domainDest_->area(iDest,jDest) = domainSrc_->area(iSrc,jSrc);
+      {  
+         if (!domainSrc_->area_1d.isEmpty())      domainDest_->area_1d(indLocDest)  = domainSrc_->area_1d(ind);
+         else if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d(iDest,jDest) = domainSrc_->area_2d(iSrc,jSrc);
+      }
 
       if (domainSrc_->hasLonLat)