Changeset 2322

Timestamp:

04/08/22 11:58:08 (2 years ago)

Author:

ymipsl

Message:

Some fix in domain_extract transformation for curvilinear grid.
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_extract.cpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_extract.cpp

@@ -141 +141 @@
   domainDest_->j_index.resize(niDest*njDest);
 
+  if (!domainSrc_->nvertex.isEmpty()) domainDest_->nvertex = domainSrc_->nvertex ;
+
   // Resize lon/lat, bounds, area arrays to local domain dimensions
   if (!domainSrc_->lonvalue_1d.isEmpty())
@@ -149 +151 @@
       domainDest_->latvalue_1d.resize(njDest);
     }
-    else if (domainDest_->type == CDomain::type_attr::unstructured)
-    {
-      domainDest_->lonvalue_1d.resize(niDest);
-      domainDest_->latvalue_1d.resize(niDest);
+    else 
+    {
+      domainDest_->lonvalue_1d.resize(niDest*njDest);
+      domainDest_->latvalue_1d.resize(niDest*njDest);
     }
   }
@@ -165 +167 @@
     {
       domainDest_->bounds_lon_2d.resize(domainDest_->nvertex, niDest, njDest);
-      domainDest_->bounds_lon_2d.resize(domainDest_->nvertex, niDest, njDest);
+      domainDest_->bounds_lat_2d.resize(domainDest_->nvertex, niDest, njDest);
     }
     else if (!domainSrc_->bounds_lon_1d.isEmpty())
     {
       domainDest_->bounds_lon_1d.resize(domainDest_->nvertex, niDest);
-      domainDest_->bounds_lon_1d.resize(domainDest_->nvertex, niDest);
+      domainDest_->bounds_lat_1d.resize(domainDest_->nvertex, niDest);
     }
   }
@@ -272 +274 @@
           domainDest_->latvalue_1d(jIdxDestLocal) = domainSrc_->latvalue_1d(jIdxSrcLocal);
         }
-        else if (domainDest_->type == CDomain::type_attr::unstructured)
+        else
         {
           domainDest_->lonvalue_1d(countDest) = domainSrc_->lonvalue_1d(countSrc);
@@ -280 +282 @@
       else if (!domainDest_->lonvalue_2d.isEmpty())
       {
-        if (domainDest_->type == CDomain::type_attr::curvilinear)
-        {
-          domainDest_->lonvalue_2d(iIdxDestLocal, jIdxDestLocal) = domainSrc_->lonvalue_2d(iIdxSrcLocal,jIdxSrcLocal);
-          domainDest_->latvalue_2d(iIdxDestLocal, jIdxDestLocal) = domainSrc_->latvalue_2d(iIdxSrcLocal,jIdxSrcLocal);
-        }
+        domainDest_->lonvalue_2d(iIdxDestLocal, jIdxDestLocal) = domainSrc_->lonvalue_2d(iIdxSrcLocal,jIdxSrcLocal);
+        domainDest_->latvalue_2d(iIdxDestLocal, jIdxDestLocal) = domainSrc_->latvalue_2d(iIdxSrcLocal,jIdxSrcLocal);
       }