Changeset 1341


Ignore:
Timestamp:
11/21/17 15:16:39 (5 years ago)
Author:
yushan
Message:

dev_omp OK

Location:
XIOS/dev/branch_openmp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_openmp/extern/remap/src/mapper.cpp

    r1339 r1341  
    420420 
    421421  /* free all memory allocated in this function */ 
    422  /* for (int rank = 0; rank < mpiSize; rank++) 
     422  for (int rank = 0; rank < mpiSize; rank++) 
    423423  { 
    424424    if (nbSendElement[rank] > 0) 
     
    456456  delete[] recvGrad; 
    457457  delete[] sendNeighIds; 
    458   delete[] recvNeighIds;*/ 
     458  delete[] recvNeighIds; 
    459459  return i; 
    460460} 
  • XIOS/dev/branch_openmp/src/node/field.cpp

    r1338 r1341  
    518518      while (isDataLate && timer.getCumulatedTime() < CXios::recvFieldTimeout); 
    519519 
    520       //if (isDataLate) 
    521       //  ERROR("void CField::checkForLateDataFromServer(void)", 
    522       //        << "Late data at timestep = " << currentDate); 
     520      if (isDataLate) 
     521        ERROR("void CField::checkForLateDataFromServer(void)", 
     522              << "Late data at timestep = " << currentDate); 
    523523    } 
    524524  } 
  • XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_axis.cpp

    r1339 r1341  
    7777  } 
    7878   
    79   //if (CReductionAlgorithm::ReductionOperations.end() == CReductionAlgorithm::ReductionOperations.find(op)) 
    8079  if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op)) 
    8180    ERROR("CScalarAlgorithmReduceAxis::CScalarAlgorithmReduceAxis(CAxis* axisDestination, CAxis* axisSource, CReduceAxisToScalar* algo)", 
     
    8483       << "Scalar destination " << scalarDestination->getId()); 
    8584 
    86   //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]); 
    8785  reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]); 
    8886} 
Note: See TracChangeset for help on using the changeset viewer.