Changeset 2138

Timestamp:

05/30/21 23:32:15 (3 years ago)

Author:

yushan

Message:

temporal commit for merging graph into XIOS_coupling @2137

Location:

XIOS/dev/dev_trunk_graph/src

Files:

• node/context.cpp (modified) (1 diff)
• transformation/axis_algorithm/axis_algorithm_reduce_axis.cpp (modified) (2 diffs)

XIOS/dev/dev_trunk_graph/src/node/context.cpp

@@ -630 +630 @@
   {
     bool  finished; 
-    if (isLockedContext()) return ;
+    if (isLockedContext()) return false;
     
     setCurrent(getId()) ;

XIOS/dev/dev_trunk_graph/src/transformation/axis_algorithm/axis_algorithm_reduce_axis.cpp

@@ -52 +52 @@
   eliminateRedondantSrc_= false ;
   algo->checkValid(axisDestination, axisSource);
+  axisDestination->checkAttributes() ;
 
   switch (algo->operation)
@@ -72 +73 @@
          << "Axis source " <<axisSource->getId() << std::endl
          << "Axis destination " << axisDestination->getId());
+  }
 
-    TransformationIndexMap& transMap = this->transformationMapping_;
-    CArray<int,1>& axisDstIndex = axisDestination->index;
-    int nbAxisIdx = axisDstIndex.numElements();
-    for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
-    {
-      int globalAxisIdx = axisDstIndex(idxAxis);
-      transMap[globalAxisIdx].resize(1);
-      transMap[globalAxisIdx][0]=globalAxisIdx ;      
-    }
+  TransformationIndexMap& transMap = this->transformationMapping_;
+  CArray<int,1>& axisDstIndex = axisDestination->index;
+  int nbAxisIdx = axisDstIndex.numElements();
+  for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
+  {
+    int globalAxisIdx = axisDstIndex(idxAxis);
+    transMap[globalAxisIdx].resize(1);
+    transMap[globalAxisIdx][0]=globalAxisIdx ;      
+  }
 
-  }
  
   axisDestination->checkAttributes() ;