Changeset 2511 for XIOS2/trunk/src/transformation

Timestamp:

06/02/23 15:18:25 (13 months ago)

Author:

ymipsl

Message:

Revert commit 2440 & 2442 that introduced bounds management for rectilinear grid, that make transformations unstable. A specific branch has been created to keep this modifications.
YM

Location:

XIOS2/trunk/src/transformation

Files:

• domain_algorithm_extract.cpp (modified) (3 diffs)
• domain_algorithm_interpolate.cpp (modified) (2 diffs)
• domain_algorithm_zoom.cpp (modified) (2 diffs)

XIOS2/trunk/src/transformation/domain_algorithm_extract.cpp

@@ -135 +135 @@
     if (!domainSrc_->bounds_lon_2d.isEmpty())
     {
-      domainDest_->bounds_lon_2d.resize(domainSrc_->bounds_lon_2d.shape()[0], niDest, njDest);
-      domainDest_->bounds_lon_2d.resize(domainSrc_->bounds_lon_2d.shape()[0], niDest, njDest);
+      domainDest_->bounds_lon_2d.resize(domainDest_->nvertex, niDest, njDest);
+      domainDest_->bounds_lon_2d.resize(domainDest_->nvertex, niDest, njDest);
     }
     else if (!domainSrc_->bounds_lon_1d.isEmpty())
     {
-      domainDest_->bounds_lon_1d.resize(domainSrc_->bounds_lon_1d.shape()[0], niDest);
-      domainDest_->bounds_lon_1d.resize(domainSrc_->bounds_lon_1d.shape()[0], niDest);
+      domainDest_->bounds_lon_1d.resize(domainDest_->nvertex, niDest);
+      domainDest_->bounds_lon_1d.resize(domainDest_->nvertex, niDest);
     }
   }
@@ -177 +177 @@
         if (!domainSrc_->bounds_lon_2d.isEmpty())
         {
-          for (int n = 0; n < domainSrc_->bounds_lon_2d.shape()[0]; ++n)
+          for (int n = 0; n < domainSrc_->nvertex; ++n)
           {
             domainDest_->bounds_lon_2d(n,iDest,jDest) = domainSrc_->bounds_lon_2d(n,iSrc,jSrc);
@@ -185 +185 @@
         else if (!domainSrc_->bounds_lon_1d.isEmpty())
         {
-          for (int n = 0; n < domainSrc_->bounds_lon_1d.shape()[0]; ++n)
+          for (int n = 0; n < domainSrc_->nvertex; ++n)
           {
             domainDest_->bounds_lon_1d(n,iDest) = domainSrc_->bounds_lon_1d(n,iSrc);

XIOS2/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -125 +125 @@
   int niSrc = domainSrc_->ni.getValue(), njSrc = domainSrc_->nj.getValue();
   bool hasBoundSrc = domainSrc_->hasBounds;
-  if ((hasBoundSrc) && (!domainSrc_->nvertex.isEmpty())) nVertexSrc = domainSrc_->nvertex.getValue(); // default is constNVertex = 4
+  if (hasBoundSrc) nVertexSrc = domainSrc_->nvertex.getValue();
   CArray<double,2> boundsLonSrc(nVertexSrc,localDomainSrcSize);
   CArray<double,2> boundsLatSrc(nVertexSrc,localDomainSrcSize);
@@ -197 +197 @@
   int niDest = domainDest_->ni.getValue(), njDest = domainDest_->nj.getValue();
   bool hasBoundDest = domainDest_->hasBounds;
-  if ((hasBoundDest) && (!domainDest_->nvertex.isEmpty())) nVertexDest = domainDest_->nvertex.getValue(); // default is constNVertex = 4
+  if (hasBoundDest) nVertexDest = domainDest_->nvertex.getValue();
   CArray<double,2> boundsLonDest(nVertexDest,localDomainDestSize);
   CArray<double,2> boundsLatDest(nVertexDest,localDomainDestSize);

XIOS2/trunk/src/transformation/domain_algorithm_zoom.cpp

@@ -5 +5 @@
 #include "grid_transformation_factory_impl.hpp"
 #include "attribute_template.hpp"
-#include "type.hpp"
 
 namespace xios {
@@ -147 +146 @@
   if (domainSrc_->hasBounds)
   {
-    nvertex = ( domainSrc_->type==CDomain::type_attr::rectilinear || domainSrc_->type==CDomain::type_attr::curvilinear) ? 4 : domainSrc_->nvertex ;
+    nvertex = domainSrc_->nvertex;
     domainDest_->nvertex.setValue(nvertex);
     if (!domainSrc_->bounds_lon_1d.isEmpty())