Changeset 1988 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

Timestamp:

12/14/20 09:59:23 (4 years ago)

Author:

ymipsl

Message:

Update to new transformation.
Source filter working again + reading
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp (modified) (6 diffs)

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

@@ -176 +176 @@
 
       }
-
+      
  //     grid->solveElementsRefInheritance(true);
-
+      grid->computeElements() ;
       return grid;
    }
@@ -1905 +1905 @@
 
   std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > 
-  CGrid::buildTransformationGraph(CGarbageCollector& gc, CGrid* gridSrc, double detectMissingValues, double defaultValue, CGrid*& newGrid)
+  CGrid::buildTransformationGraph(CGarbageCollector& gc, bool isSource, CGrid* gridSrc, double detectMissingValues, double defaultValue, CGrid*& newGrid)
   TRY
   {
@@ -1982 +1982 @@
             transformationPath.removeNextTransform() ;
             dstDomain->setTransformationPaths(transformationPath) ;
-            newGrid->addDomain(dstDomain->getId()) ;
           }
+          newGrid->addDomain(dstDomain->getId()) ;
           algo = dstDomain->getTransformationAlgorithm() ;
         }
@@ -2009 +2009 @@
             transformationPath.removeNextTransform() ;
             dstAxis->setTransformationPaths(transformationPath) ;
-            newGrid->addAxis(dstAxis->getId()) ;
           }
+          newGrid->addAxis(dstAxis->getId()) ;
           algo = dstAxis->getTransformationAlgorithm() ;
         }
@@ -2036 +2036 @@
             transformationPath.removeNextTransform() ;
             dstScalar->setTransformationPaths(transformationPath) ;
-            newGrid->addScalar(dstScalar->getId()) ;
           }
+          newGrid->addScalar(dstScalar->getId()) ;
           algo = dstScalar->getTransformationAlgorithm() ;          
         }
@@ -2098 +2098 @@
     if (hadTransform)
     {
-      shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(new CTransformFilter(gc, algo, dimBefore, dimAfter, detectMissingValues, defaultValue)) ;
-      outputFilter->connectOutput(transformFilter,0) ;
-      outputFilter = transformFilter ;
+      if (!isSource)
+      {
+        shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(new CTransformFilter(gc, algo, dimBefore, dimAfter, detectMissingValues, defaultValue)) ;
+        outputFilter->connectOutput(transformFilter,0) ;
+        outputFilter = transformFilter ;
+      }
 
       gridSrc=newGrid ;
-      pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = gridSrc->buildTransformationGraph(gc, gridSrc, detectMissingValues, defaultValue, newGrid) ;
+      pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = gridSrc->buildTransformationGraph(gc, isSource, gridSrc, detectMissingValues, defaultValue, newGrid) ;
       outputFilter->connectOutput(filters.first,0) ;
       outputFilter=filters.second ;