Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Michael Buehlmann
GenericIO
Commits
2fb90def
Commit
2fb90def
authored
Jun 08, 2020
by
Hal Finkel
Browse files
Don't use int as a generic version of MPI_Comm; use conditional compilation instead
parent
f6fb45fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
GenericIO.cxx
View file @
2fb90def
...
...
@@ -395,7 +395,11 @@ static int GetSZDT(GenericIO::Variable &Var) {
return
-
1
;
}
void
GenericIO
::
setFH
(
int
R
)
{
void
GenericIO
::
setFH
(
#ifndef GENERICIO_NO_MPI
MPI_Comm
R
#endif
)
{
#ifndef GENERICIO_NO_MPI
if
(
FileIOType
==
FileIOMPI
)
FH
.
get
()
=
new
GenericFileIO_MPI
(
R
);
...
...
@@ -1051,8 +1055,6 @@ void GenericIO::openAndReadHeader(MismatchBehavior MB, int EffRank, bool CheckPa
setFH
(
#ifndef GENERICIO_NO_MPI
MPI_COMM_SELF
#else
0
#endif
);
...
...
GenericIO.h
View file @
2fb90def
...
...
@@ -638,7 +638,11 @@ public:
FHWCnt
*
CountedFH
;
}
FH
;
void
setFH
(
int
R
);
void
setFH
(
#ifndef GENERICIO_NO_MPI
MPI_Comm
R
#endif
);
};
}
/* END namespace cosmotk */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment