Changeset 2138


Ignore:
Timestamp:
05/30/21 23:32:15 (2 months ago)
Author:
yushan
Message:

temporal commit for merging graph into XIOS_coupling @2137

Location:
XIOS/dev/dev_trunk_graph/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_graph/src/node/context.cpp

    r2137 r2138  
    630630  { 
    631631    bool  finished;  
    632     if (isLockedContext()) return ; 
     632    if (isLockedContext()) return false; 
    633633     
    634634    setCurrent(getId()) ; 
  • XIOS/dev/dev_trunk_graph/src/transformation/axis_algorithm/axis_algorithm_reduce_axis.cpp

    r2019 r2138  
    5252  eliminateRedondantSrc_= false ; 
    5353  algo->checkValid(axisDestination, axisSource); 
     54  axisDestination->checkAttributes() ; 
    5455 
    5556  switch (algo->operation) 
     
    7273         << "Axis source " <<axisSource->getId() << std::endl 
    7374         << "Axis destination " << axisDestination->getId()); 
     75  } 
    7476 
    75     TransformationIndexMap& transMap = this->transformationMapping_; 
    76     CArray<int,1>& axisDstIndex = axisDestination->index; 
    77     int nbAxisIdx = axisDstIndex.numElements(); 
    78     for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis) 
    79     { 
    80       int globalAxisIdx = axisDstIndex(idxAxis); 
    81       transMap[globalAxisIdx].resize(1); 
    82       transMap[globalAxisIdx][0]=globalAxisIdx ;       
    83     } 
     77  TransformationIndexMap& transMap = this->transformationMapping_; 
     78  CArray<int,1>& axisDstIndex = axisDestination->index; 
     79  int nbAxisIdx = axisDstIndex.numElements(); 
     80  for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis) 
     81  { 
     82    int globalAxisIdx = axisDstIndex(idxAxis); 
     83    transMap[globalAxisIdx].resize(1); 
     84    transMap[globalAxisIdx][0]=globalAxisIdx ;       
     85  } 
    8486 
    85   } 
    8687  
    8788  axisDestination->checkAttributes() ; 
Note: See TracChangeset for help on using the changeset viewer.