Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
c46cba15
Commit
c46cba15
authored
Dec 09, 2014
by
BRAMAS Berenger
Browse files
remove some conversion warnings
parent
a8554166
Changes
2
Hide whitespace changes
Inline
Side-by-side
Src/Containers/FMpiBufferWriter.hpp
View file @
c46cba15
...
...
@@ -37,7 +37,7 @@ class FMpiBufferWriter : public FAbstractBufferWriter {
/** Test and exit if not enought space */
void
expandIfNeeded
(
const
size_t
requestedSpace
)
{
if
(
arrayCapacity
<
int
(
currentIndex
+
requestedSpace
)
){
arrayCapacity
=
int
((
currentIndex
+
requestedSpace
+
1
)
*
1.5
);
arrayCapacity
=
int
(
double
(
currentIndex
+
requestedSpace
+
1
)
*
1.5
);
char
*
arrayTmp
=
new
char
[
arrayCapacity
];
memcpy
(
arrayTmp
,
array
.
get
(),
sizeof
(
char
)
*
currentIndex
);
array
.
reset
(
arrayTmp
);
...
...
Src/Core/FFmmAlgorithmThreadProc.hpp
View file @
c46cba15
...
...
@@ -674,7 +674,7 @@ private:
for
(
int
idxProc
=
0
;
idxProc
<
nbProcess
;
++
idxProc
){
const
long
long
int
toSendAtProcAtLevel
=
indexToSend
[
idxLevel
*
nbProcess
+
idxProc
];
if
(
toSendAtProcAtLevel
!=
0
){
sendBuffer
[
idxLevel
*
nbProcess
+
idxProc
]
=
new
FMpiBufferWriter
(
comm
.
getComm
(),
toSendAtProcAtLevel
);
sendBuffer
[
idxLevel
*
nbProcess
+
idxProc
]
=
new
FMpiBufferWriter
(
comm
.
getComm
(),
int
(
toSendAtProcAtLevel
)
)
;
sendBuffer
[
idxLevel
*
nbProcess
+
idxProc
]
->
write
(
int
(
toSend
[
idxLevel
*
nbProcess
+
idxProc
].
getSize
()));
...
...
@@ -693,7 +693,7 @@ private:
const
long
long
int
toReceiveFromProcAtLevel
=
globalReceiveMap
[(
idxProc
*
nbProcess
*
OctreeHeight
)
+
idxLevel
*
nbProcess
+
idProcess
];
if
(
toReceiveFromProcAtLevel
){
recvBuffer
[
idxLevel
*
nbProcess
+
idxProc
]
=
new
FMpiBufferReader
(
comm
.
getComm
(),
toReceiveFromProcAtLevel
);
recvBuffer
[
idxLevel
*
nbProcess
+
idxProc
]
=
new
FMpiBufferReader
(
comm
.
getComm
(),
int
(
toReceiveFromProcAtLevel
)
)
;
FMpi
::
MpiAssert
(
MPI_Irecv
(
recvBuffer
[
idxLevel
*
nbProcess
+
idxProc
]
->
data
(),
recvBuffer
[
idxLevel
*
nbProcess
+
idxProc
]
->
getCapacity
(),
MPI_PACKED
,
idxProc
,
...
...
Write
Preview
Supports
Markdown
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