Commit 2fb90def authored by Hal Finkel's avatar Hal Finkel
Browse files

Don't use int as a generic version of MPI_Comm; use conditional compilation instead

parent f6fb45fe
...@@ -395,7 +395,11 @@ static int GetSZDT(GenericIO::Variable &Var) { ...@@ -395,7 +395,11 @@ static int GetSZDT(GenericIO::Variable &Var) {
return -1; return -1;
} }
void GenericIO::setFH(int R) { void GenericIO::setFH(
#ifndef GENERICIO_NO_MPI
MPI_Comm R
#endif
) {
#ifndef GENERICIO_NO_MPI #ifndef GENERICIO_NO_MPI
if (FileIOType == FileIOMPI) if (FileIOType == FileIOMPI)
FH.get() = new GenericFileIO_MPI(R); FH.get() = new GenericFileIO_MPI(R);
...@@ -1051,8 +1055,6 @@ void GenericIO::openAndReadHeader(MismatchBehavior MB, int EffRank, bool CheckPa ...@@ -1051,8 +1055,6 @@ void GenericIO::openAndReadHeader(MismatchBehavior MB, int EffRank, bool CheckPa
setFH( setFH(
#ifndef GENERICIO_NO_MPI #ifndef GENERICIO_NO_MPI
MPI_COMM_SELF MPI_COMM_SELF
#else
0
#endif #endif
); );
......
...@@ -638,7 +638,11 @@ public: ...@@ -638,7 +638,11 @@ public:
FHWCnt *CountedFH; FHWCnt *CountedFH;
} FH; } FH;
void setFH(int R); void setFH(
#ifndef GENERICIO_NO_MPI
MPI_Comm R
#endif
);
}; };
} /* END namespace cosmotk */ } /* END namespace cosmotk */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment