Changeset 2507 for XIOS3/trunk/src/transformation/domain_algorithm

Timestamp:

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

Author:

ymipsl

Message:

Merging XIOS3_ATTACHED branch into XIOS3 trunk.

YM

Location:

XIOS3/trunk/src/transformation/domain_algorithm

Files:

• domain_algorithm_extract.cpp (modified) (3 diffs)
• domain_algorithm_redistribute.cpp (added)
• domain_algorithm_redistribute.hpp (added)
• domain_algorithm_reorder.cpp (modified) (2 diffs)
• domain_algorithm_zoom.cpp (modified) (2 diffs)

XIOS3/trunk/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

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

@@ -128 +128 @@
    else if (!domainSource->lonvalue_2d.isEmpty() )
    {
-     domainDestination->latvalue_2d.resize( domainSource->latvalue_2d.numElements() );
-     domainDestination->lonvalue_2d.resize( domainSource->lonvalue_2d.numElements() );
+     domainDestination->latvalue_2d.resize( domainSource->latvalue_2d.shape() );
+     domainDestination->lonvalue_2d.resize( domainSource->lonvalue_2d.shape() );
      domainDestination->latvalue_2d = domainSource->latvalue_2d;
      domainDestination->lonvalue_2d = domainSource->lonvalue_2d;
@@ -145 +145 @@
    else if (!domainSource->bounds_lon_2d.isEmpty() )
    {
-     domainDestination->bounds_lon_2d.resize( domainSource->bounds_lon_2d.numElements() );
-     domainDestination->bounds_lat_2d.resize( domainSource->bounds_lat_2d.numElements() );
+     domainDestination->bounds_lon_2d.resize( domainSource->bounds_lon_2d.shape() );
+     domainDestination->bounds_lat_2d.resize( domainSource->bounds_lat_2d.shape() );
      domainDestination->bounds_lon_2d = domainSource->bounds_lon_2d;
      domainDestination->bounds_lat_2d = domainSource->bounds_lat_2d;
    }
    // set area
-   if (!domainSource->area.isEmpty() )
-   {
-     domainDestination->area.resize( domainSource->area.numElements() );
-     domainDestination->area = domainSource->area;    
-   }
+   if (!domainSource->area_1d.isEmpty() )
+   {
+     domainDestination->area_1d.resize( domainSource->area_1d.numElements() );
+     domainDestination->area_1d = domainSource->area_1d;    
+   }
+   else if (!domainSource->area_2d.isEmpty() )
+   {
+     domainDestination->area_2d.resize( domainSource->area_2d.shape() );
+     domainDestination->area_2d = domainSource->area_2d;    
+   }
+
    if (!domainSource->radius.isEmpty() )
      domainDestination->radius = domainSource->radius;

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)