Commit 50558613 authored by PIACIBELLO Cyrille's avatar PIACIBELLO Cyrille

Remove warining and undefined link

parent 97ca061d
......@@ -62,7 +62,7 @@ void displ_free_cell(void * inCell){
* @brief Wrapper to FMM operators (refer to CScalfmmApi.h to get the
* detailed descriptions)
*/
void displ_p2m(void* cellData, FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
void displ_p2m(void* cellData, void * leafData, FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
Cell * current_cell = cellData;
printf("P2M with %lld parts filling cell %d ::\n",nbParticlesInLeaf,current_cell->Id);
......@@ -89,12 +89,12 @@ void displ_m2m(int level, void* parentCell, int childPosition, void* childCell,
user_data->nbM2M += 1;
}
void displ_m2l_full(int level, void* targetCell, void* sourceCell[343], void* userData){
void displ_m2l_full(int level, void* targetCell, const int * neighborPosition, const int size, void** sourceCell, void* userData){
Cell * target_cell = targetCell;
printf("M2L at lvl %d filling target cell of Id %d and morton : %d ::\n",target_cell->lvl,target_cell->Id,target_cell->morton);
printf("M2L at lvl %d filling target cell of Id %d and morton : %d with %d neighbors ::\n",target_cell->lvl,target_cell->Id,target_cell->morton,size);
int idSource = 0;
int countSource = 0;
for(idSource = 0 ; idSource<343 ; ++idSource){
for(idSource = 0 ; idSource<size ; ++idSource){
if(sourceCell[idSource]){
Cell * source_cell = sourceCell[idSource];
printf("\t[m2l]Target : %d, sourceCell[%d] : morton %d, with %d,%d,%d coordinates \n",target_cell->morton,
......@@ -121,7 +121,7 @@ void displ_l2l(int level, void* parentCell, int childPosition, void* childCell,
UserData * user_data = userData;
user_data->nbL2L += 1;
}
void displ_l2p(void* leafCell, FSize nbParticles, const FSize* particleIndexes, void* userData){
void displ_l2p(void* leafCell,void * leafData, FSize nbParticles, const FSize* particleIndexes, void* userData){
Cell * current_cell = leafCell;
printf("L2P with %lld parts reading cell %d ::\n",nbParticles,current_cell->Id);
......@@ -132,8 +132,9 @@ void displ_l2p(void* leafCell, FSize nbParticles, const FSize* particleIndexes,
UserData * user_data = userData;
user_data->nbL2P += 1;
}
void displ_p2pFull(FSize nbParticles, const FSize* particleIndexes,
const FSize * sourceParticleIndexes[27], FSize sourceNbPart[27],void* userData) {
void displ_p2pFull(void * targetLeaf, FSize nbParticles, const FSize* particleIndexes,
void ** sourceLeaves,
const FSize ** sourceParticleIndexes, FSize * sourceNbPart, const int* sourcePosition, const int size, void* userData) {
printf("P2P, no cells involved, only leaves\n");
UserData * user_data = userData;
user_data->nbP2PFull+= 1;
......@@ -266,7 +267,7 @@ int main(int argc, char ** av){
userDatas.nbL2P,
userDatas.nbP2PFull);
scalfmm_reset_tree(handle,displ_resetCell);
scalfmm_apply_on_cell(handle,displ_resetCell);
ite++;
}
......
......@@ -6,7 +6,6 @@
#include "Timers.h"
#include <mpi.h>
#include "../Src/CScalfmmApi.h"
#include "../../Src/Kernels/Chebyshev/FChebInterface.h"
......@@ -38,7 +37,7 @@ void cheb_free_cell(void * inCell){
* @brief Wrapper to FMM operators (refer to CScalfmmApi.h to get the
* detailed descriptions)
*/
void cheb_p2m(void* cellData, FSize nbParticlesInLeaf, const FSize* particleIndexes,
void cheb_p2m(void* cellData,void * leafData, FSize nbParticlesInLeaf, const FSize* particleIndexes,
void* userData){
ChebKernel_P2M(cellData,nbParticlesInLeaf,particleIndexes,userData);
}
......@@ -54,11 +53,12 @@ void cheb_l2l(int level, void* parentCell, int childPosition, void* childCell,
void* userData){
ChebKernel_L2L( level, parentCell, childPosition, childCell, userData);
}
void cheb_l2p(void* leafCell, FSize nbParticles, const FSize* particleIndexes,
void cheb_l2p(void* cellData, void* leafData, FSize nbParticles, const FSize* particleIndexes,
void* userData){
ChebKernel_L2P( leafCell, nbParticles, particleIndexes, userData);
ChebKernel_L2P( cellData, nbParticles, particleIndexes, userData);
}
void cheb_p2pFull(FSize nbParticles, const FSize* particleIndexes,
void cheb_p2pFull(void * targetLeaf, FSize nbParticles, const FSize* particleIndexes,
void ** sourceLeaves,
const FSize ** sourceParticleIndexes, FSize* sourceNbPart,const int * sourcePosition,
const int size, void* userData) {
ChebKernel_P2P(nbParticles, particleIndexes, sourceParticleIndexes, sourceNbPart,sourcePosition,size,
......@@ -84,7 +84,7 @@ void * cheb_restore_cell(int level, void * arrayTobeRead){
}
void on_leaf(int level, FSize nbParts, const FSize * idxParts, long long morton_index, double center[3],
void * cellDatas, void * userDatas){
void * cellDatas,void * leafdata, void * userDatas){
UserData * ptrToUserData = (UserData*) userDatas;
//Compute totalEnergy
......
......@@ -96,7 +96,7 @@ struct MyData {
// Our P2M
void my_Callback_P2M(void* cellData, FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
void my_Callback_P2M(void* cellData, void * leafData, FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
struct MyData* my_data = (struct MyData*)userData;
my_data->countP2M += 1;
......@@ -183,7 +183,7 @@ void my_Callback_L2L(int level, void* cellData, int childPosition, void* childDa
// JUST-PUT-HERE: Your L2L
}
void my_Callback_L2P(void* cellData, FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
void my_Callback_L2P(void* cellData, void * leafData, FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
struct MyData* my_data = (struct MyData*)userData;
my_data->countL2P += 1;
......@@ -203,7 +203,8 @@ void my_Callback_L2P(void* cellData, FSize nbParticlesInLeaf, const FSize* parti
}
}
void my_Callback_P2P(FSize nbParticlesInLeaf, const FSize* particleIndexes, FSize nbParticlesInSrc, const FSize* particleIndexesSrc, void* userData){
void my_Callback_P2P(void * targetLeaf, FSize nbParticlesInLeaf, const FSize* particleIndexes,void * sourceLeaf,
FSize nbParticlesInSrc, const FSize* particleIndexesSrc, void* userData){
struct MyData* my_data = (struct MyData*)userData;
my_data->countP2P += 1;
......@@ -229,7 +230,7 @@ void my_Callback_P2P(FSize nbParticlesInLeaf, const FSize* particleIndexes, FSiz
// interacting with the target particles
}
void my_Callback_P2PInner(FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
void my_Callback_P2PInner(void * targetLeaf, FSize nbParticlesInLeaf, const FSize* particleIndexes, void* userData){
struct MyData* my_data = (struct MyData*)userData;
my_data->countP2PInner += 1;
......
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