Changeset 1993 for XIOS

Timestamp:

12/17/20 12:55:12 (3 years ago)

Author:

ymipsl

Message:

bug fix in chaining transformations

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/transformation_path.cpp (modified) (7 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/transformation_path.cpp

@@ -7 +7 @@
     donePath_ = transformationPaths.donePath_ ;
     //? if (donePath_.empty()) donePath_.push_back(transformationPaths.path_) ; // entry point
-    
+    if (get<1>(remainPath_)!="") return ;
+
     if (!donePath_.empty())
     {
@@ -23 +24 @@
         }
 
-        if (remoteIt==get<2>(remotePath).end()) get<2>(remainPath_).insert( get<2>(remainPath_).begin(), it , std::get<2>(path_).end() ) ;
+        if (remoteIt==get<2>(remotePath).end()) 
+        {
+          get<0>(remainPath_) = std::get<0>(path_) ;
+          get<1>(remainPath_) = std::get<1>(path_) ;
+          get<2>(remainPath_).insert( get<2>(remainPath_).begin(), it , std::get<2>(path_).end() ) ;
+        }
         else  remainPath_ = path_ ;
 
@@ -33 +39 @@
       remainPath_=path_ ;
     } 
+    get<1>(path_).clear() ;
+    get<2>(path_).clear() ;
   }
   
@@ -38 +46 @@
   {
     CTransformationPaths transformationPath ;
+   /* TPath newPath = path_ ;
+    get<2>(newPath).clear() ;
+    transformationPath.donePath_.push_back(newPath) ; */
     mergePaths(transformationPath) ;
   }
@@ -56 +67 @@
   string CTransformationPaths::getNextElementId(void)
   {
+    CTransformationPaths transformationPath = *this ;
+    transformationPath.removeNextTransform() ;
+    return transformationPath.getPathsId(transformationPath.donePath_) ;
+    /*
     string sep="/" ;
     string doneId=getPathsId(donePath_) ;
@@ -64 +79 @@
     if (remainId=="") sep="" ;
     return doneId+sep+remainId ;
+   */
   }
 
@@ -89 +105 @@
       get<1>(newPath)=get<1>(remainPath_) ;
       if (!get<2>(remainPath_).empty()) get<2>(newPath).push_back(get<2>(remainPath_).front()) ;
-      donePath_.push_back(newPath);
-      get<1>(newPath)="" ;
+      if (donePath_.empty()) donePath_.push_back(newPath);
+      else
+      {
+        if (get<0>(donePath_.back())==get<0>(newPath) && get<1>(donePath_.back())==get<1>(newPath)) 
+          get<2>(donePath_.back()).push_back(get<2>(newPath).front()) ;
+        else donePath_.push_back(newPath);
+      }
       if (!get<2>(newPath).empty()) get<2>(remainPath_).pop_front() ;
+      if (get<2>(remainPath_).empty()) get<1>(remainPath_)="" ;
     }
     else