Ignore:
Timestamp:
05/20/19 13:14:51 (5 years ago)
Author:
yushan
Message:

MARK: branch merged with trunk @1660. Add option --omp to enable multithreading.

Location:
XIOS/dev/dev_trunk_omp/src/node
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/dev_trunk_omp/src/node/field.cpp

    r1646 r1665  
    536536       #ifdef _usingEP 
    537537       MPI_Allreduce(&nstepMax, &nstepMax, 1, MPI_INT, MPI_MAX, context->server->intraComm); 
    538        #elif _usingMPI 
     538       #else 
    539539       MPI_Allreduce(MPI_IN_PLACE, &nstepMax, 1, MPI_INT, MPI_MAX, context->server->intraComm); 
    540540       #endif 

  • XIOS/dev/dev_trunk_omp/src/node/file.cpp

    r1661 r1665  
    728728        isOpen = false; 
    729729       } 
    730      #ifdef _usingMPI  
     730     #ifdef _usingEP 
     731     //if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm); 
     732     #else 
    731733     if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm); 
    732734     #endif 
Note: See TracChangeset for help on using the changeset viewer.