Changeset 1984 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

Timestamp:

12/06/20 22:14:56 (3 years ago)

Author:

ymipsl

Message:

intermediate commit for new tranformation engine?
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp (modified) (7 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -766 +766 @@
 
       CGrid* gridSrc=getDirectFieldReference()->getGrid() ;
+      std::shared_ptr<COutputPin> lastFilter ;
+      if (filterExpr) lastFilter=filterExpr ;
+      else lastFilter = inputFilter ;
+      CGrid* newGrid ;    
+      
       for(auto grid : gridPath)
       {
         grid->solveElementsRefInheritance() ;
+       
+        // new
+        
+        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid->buildTransformationGraph(gc, gridSrc, detectMissingValues, defaultValue, newGrid) ;
+        lastFilter->connectOutput(filters.first, 0);
+        lastFilter = filters.second;
+        gridSrc = newGrid ;
+
+        // end new
+/*
         grid->completeGrid(gridSrc); // grid generation, to be checked
         grid->checkElementsAttributes() ;
@@ -775 +790 @@
           if (!CField::get(fieldId)->buildWorkflowGraph(gc)) return false ;
         gridSrc=grid ;
-      }
-      
+*/
+      }
+
+    /*  
       std::shared_ptr<COutputPin> lastFilter ;
       if (filterExpr) lastFilter=filterExpr ;
@@ -793 +810 @@
         }
       }
+    */
+      grid_=newGrid ;
+      grid_ref=grid_->getId() ; // for server 
       instantDataFilter = lastFilter ;
       
@@ -824 +844 @@
 
         grid_->solveElementsRefInheritance() ;
-        grid_->completeGrid(); // grid generation, to be checked
+        CGrid* newGrid ;
+        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, nullptr, detectMissingValues, defaultValue, newGrid) ;
+        grid_ = newGrid ;
+        grid_ref=grid_->getId() ; // for server 
+//        grid_->completeGrid(); // grid generation, to be checked => later
         grid_->checkElementsAttributes() ;
         instantDataFilter=inputFilter ;
@@ -1603 +1627 @@
     CContext::getCurrent()->sendContextToFileServer(client);
     getRelFile()->sendFileToFileServer(client);
-    grid_->sendGridToFileServer(client);
+    sentGrid_ = grid_-> duplicateSentGrid() ;
+    sentGrid_->sendGridToFileServer(client);
+    name = getFieldOutputName() ;
     this->sendAllAttributesToServer(client);
     this->sendAddAllVariables(client);
@@ -1697 +1723 @@
     if (grid_ref.isEmpty())
     {
-      grid_ref=grid_->getId() ;
+      grid_ref=sentGrid_->getId() ;
       SuperClass::sendAllAttributesToServer(client) ;
       domain_ref.reset() ;
@@ -1704 +1730 @@
       grid_ref.reset();
     }
-    else SuperClass::sendAllAttributesToServer(client) ;
+    else 
+    {
+      string tmp = grid_ref;
+      grid_ref = sentGrid_->getId() ;
+      SuperClass::sendAllAttributesToServer(client) ;
+      grid_ref = tmp ;
+    }
   }
   CATCH_DUMP_ATTR