Changeset 2482 for XIOS3/dev/XIOS_ATTACHED/src/transformation/domain_algorithm/domain_algorithm_extract.cpp

Timestamp:

03/28/23 16:42:11 (15 months ago)

Author:

ymipsl

Message:

First guess in supression of attached mode replaced by online reader and write filters

YM

File:

• XIOS3/dev/XIOS_ATTACHED/src/transformation/domain_algorithm/domain_algorithm_extract.cpp (modified) (3 diffs)

XIOS3/dev/XIOS_ATTACHED/src/transformation/domain_algorithm/domain_algorithm_extract.cpp

@@ -76 +76 @@
    domainDestination->bounds_lon_2d.reset();
    domainDestination->bounds_lat_2d.reset();
-   domainDestination->area.reset();
+   domainDestination->area_1d.reset();
+   domainDestination->area_2d.reset();
    domainDestination->radius.reset();
    
@@ -175 +176 @@
     }
   }
-  if (domainSrc_->hasArea) domainDest_->area.resize(niDest,njDest);
-
+  if (domainSrc_->hasArea) 
+  {
+    if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d.resize(niDest,njDest);
+    else if (!domainSrc_->area_1d.isEmpty()) domainDest_->area_1d.resize(niDest*njDest);
+  }
   // Set attributes required to define domainDestination->localElement_ and associated views, full and workflow)
   CArray<size_t,1> sourceGlobalIdx = domainSource->getLocalElement()->getGlobalIndex();
@@ -241 +245 @@
 
       // area
-      if (!domainSrc_->area.isEmpty())
-      {
-        domainDest_->area(iIdxDestLocal,jIdxDestLocal) = domainSrc_->area(iIdxSrcLocal,jIdxSrcLocal);
-      }
+      if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d(iIdxDestLocal,jIdxDestLocal) = domainSrc_->area_2d(iIdxSrcLocal,jIdxSrcLocal);
+      else if (!domainSrc_->area_1d.isEmpty())  domainDest_->area_1d(countDest) = domainSrc_->area_1d(countSrc);
 
       // bounds