Ignore:
Timestamp:
03/09/17 12:19:33 (7 years ago)
Author:
yushan
Message:

minor modification for using intelmpi

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan/extern/src_ep_dev/ep_declaration.cpp

    r1053 r1068  
    44 
    55#include <mpi.h> 
    6 //#include "ep_declaration.hpp" 
    76 
    87#undef MPI_INT 
     
    2221 
    2322#undef MPI_STATUS_IGNORE 
    24 //#undef MPI_INFO_NULL 
    2523#undef MPI_REQUEST_NULL 
     24#undef MPI_INFO_NULL 
    2625 
    27 #ifdef _openmpi 
    28 //#undef MPI_Fint 
    29 #endif 
     26 
    3027 
    3128// _STD defined in ep_type.cpp 
     
    4744 
    4845extern ::MPI_Status MPI_STATUS_IGNORE_STD; 
    49 //extern ::MPI_Info MPI_INFO_NULL_STD; 
    5046extern ::MPI_Request MPI_REQUEST_NULL_STD; 
     47extern ::MPI_Info MPI_INFO_NULL_STD; 
    5148 
    5249ep_lib::MPI_Datatype MPI_INT = MPI_INT_STD; 
     
    6562ep_lib::MPI_Comm MPI_COMM_NULL(MPI_COMM_NULL_STD); 
    6663 
    67 //ep_lib::MPI_Info MPI_INFO_NULL(MPI_INFO_NULL_STD); 
    6864ep_lib::MPI_Request MPI_REQUEST_NULL(MPI_REQUEST_NULL_STD); 
    69  
    70 //ep_lib::MPI_Status MPI_STATUS_IGNORE_STD = MPI_STATUS_IGNORE_STD; 
    71  
    72 //ep_lib::MPI_Comm EP_COMM_WORLD; 
    73 //ep_lib::MPI_Comm EP_COMM_NULL; 
     65ep_lib::MPI_Info MPI_INFO_NULL(MPI_INFO_NULL_STD); 
    7466 
    7567 
    7668 
     69 
Note: See TracChangeset for help on using the changeset viewer.