Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CrayzeeWulf
Xdmf
Commits
d0cfaf91
Commit
d0cfaf91
authored
Sep 13, 2013
by
Andrew J. Burns (Cont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correcting conversion of int to MPI_Comm in DSM
parent
c6357a27
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
core/dsm/XdmfDSMBuffer.cpp
core/dsm/XdmfDSMBuffer.cpp
+12
-6
No files found.
core/dsm/XdmfDSMBuffer.cpp
View file @
d0cfaf91
...
...
@@ -701,12 +701,13 @@ XdmfDSMBuffer::ReceiveAcknowledgment(int source, int &data, int tag, int comm)
&
signalStatus
);
}
else
{
MPI_Comm
tempComm
=
MPI_Comm_f2c
(
comm
);
status
=
MPI_Recv
(
&
data
,
sizeof
(
int
),
MPI_UNSIGNED_CHAR
,
source
,
tag
,
c
omm
,
tempC
omm
,
&
signalStatus
);
}
...
...
@@ -752,12 +753,13 @@ XdmfDSMBuffer::ReceiveCommandHeader(int *opcode, int *source, int *address, int
}
else
{
// In this case the integer is probably a pointer to an MPI_Comm object
MPI_Comm
tempComm
=
MPI_Comm_f2c
(
comm
);
status
=
MPI_Recv
(
&
cmd
,
sizeof
(
CommandMsg
),
MPI_UNSIGNED_CHAR
,
remoteSource
,
XDMF_DSM_COMMAND_TAG
,
c
omm
,
tempC
omm
,
&
signalStatus
);
}
...
...
@@ -801,12 +803,13 @@ XdmfDSMBuffer::ReceiveData(int source, char * data, int aLength, int tag, int aA
&
signalStatus
);
}
else
{
MPI_Comm
tempComm
=
MPI_Comm_f2c
(
comm
);
status
=
MPI_Recv
(
data
,
aLength
,
MPI_UNSIGNED_CHAR
,
source
,
tag
,
c
omm
,
tempC
omm
,
&
signalStatus
);
}
if
(
status
!=
MPI_SUCCESS
)
{
...
...
@@ -902,12 +905,13 @@ XdmfDSMBuffer::SendAcknowledgment(int dest, int data, int tag, int comm)
static_cast
<
XdmfDSMCommMPI
*>
(
this
->
Comm
)
->
GetInterComm
());
}
else
{
MPI_Comm
tempComm
=
MPI_Comm_f2c
(
comm
);
status
=
MPI_Send
(
&
data
,
sizeof
(
int
),
MPI_UNSIGNED_CHAR
,
dest
,
tag
,
c
omm
);
tempC
omm
);
}
if
(
status
!=
MPI_SUCCESS
)
{
try
{
...
...
@@ -952,12 +956,13 @@ XdmfDSMBuffer::SendCommandHeader(int opcode, int dest, int address, int aLength,
}
else
{
// In this case the comm should be a pointer to an MPI_Comm object
MPI_Comm
tempComm
=
MPI_Comm_f2c
(
comm
);
status
=
MPI_Send
(
&
cmd
,
sizeof
(
CommandMsg
),
MPI_UNSIGNED_CHAR
,
dest
,
XDMF_DSM_COMMAND_TAG
,
c
omm
);
tempC
omm
);
}
if
(
status
!=
MPI_SUCCESS
)
{
try
{
...
...
@@ -990,7 +995,8 @@ XdmfDSMBuffer::SendData(int dest, char * data, int aLength, int tag, int aAddres
static_cast
<
XdmfDSMCommMPI
*>
(
this
->
Comm
)
->
GetInterComm
());
}
else
{
status
=
MPI_Send
(
data
,
aLength
,
MPI_UNSIGNED_CHAR
,
dest
,
tag
,
comm
);
MPI_Comm
tempComm
=
MPI_Comm_f2c
(
comm
);
status
=
MPI_Send
(
data
,
aLength
,
MPI_UNSIGNED_CHAR
,
dest
,
tag
,
tempComm
);
}
if
(
status
!=
MPI_SUCCESS
)
{
try
{
...
...
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