diff --git a/Examples/ChebyshevStarpuImplicit.cpp b/Examples/ChebyshevStarpuImplicit.cpp index d7f2b5344e8640d97e30c3a70caaeb3203498185..8b9fe7e4dccc15406078b8d86a13208cbe27c8b3 100644 --- a/Examples/ChebyshevStarpuImplicit.cpp +++ b/Examples/ChebyshevStarpuImplicit.cpp @@ -1,7 +1,5 @@ // ==== CMAKE ===== // @FUSE_BLAS -// ================ -// Keep in private GIT // @FUSE_MPI // @FUSE_STARPU // diff --git a/Examples/LagrangeStarpuImplicit.cpp b/Examples/LagrangeStarpuImplicit.cpp index f433e7e620665c969d46d8ec2ffbc6083e822d35..e13b567f5f596984aea62a9c160b23f7a434ba48 100644 --- a/Examples/LagrangeStarpuImplicit.cpp +++ b/Examples/LagrangeStarpuImplicit.cpp @@ -1,7 +1,5 @@ // ==== CMAKE ===== // @FUSE_BLAS -// ================ -// Keep in private GIT // @FUSE_MPI // @FUSE_STARPU // diff --git a/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp b/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp index b0676205f34f1d48a3ba533cf494b822e2034466..80551d4319536569ae574750853a5ce632f1aafe 100644 --- a/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp +++ b/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp @@ -210,6 +210,7 @@ public: FAssertLF(leafLevelSeparationCriteria < 3, "Separation criteria should be < 3"); FAbstractAlgorithm::setNbLevelsInTree(extendedTreeHeight()); + rootCellFromProc.setLevel(offsetRealTree); FLOG(FLog::Controller << "FFmmAlgorithmThreadProcPeriodic\n"); FLOG(FLog::Controller << "Max threads = " << MaxThreads << ", Procs = " << nbProcess << ", I am " << idProcess << ".\n"); @@ -2386,7 +2387,7 @@ public: // the root level of the octree in the virtual array of cells const int rootLevel = offsetRealTree-1 ; - rootCellFromProc.setLevel(rootLevel+1); + // rootCellFromProc.setLevel(rootLevel+1); if( nbLevelsAboveRoot != -1 ){ // we will use offsetRealTree-1 cells but for simplicity allocate offsetRealTree diff --git a/Src/Utils/FCompareResults.hpp b/Src/Utils/FCompareResults.hpp index 1171889d91f21996db14fe3991152f2a11fb138e..e6125222d8209ef8dced69733cf2211664f454d6 100644 --- a/Src/Utils/FCompareResults.hpp +++ b/Src/Utils/FCompareResults.hpp @@ -92,6 +92,16 @@ FSize compareTwoArrays(const std::string &tag, const FSize &nbParticles, const fz.add(array1[idxPart].getForces()[2],array2[idxPart].getForces()[2]); energy1 += array1[idxPart].getPhysicalValue() *array1[idxPart].getPotential() ; energy2 += array2[idxPart].getPhysicalValue() *array2[idxPart].getPotential() ; + if(idxPart==0){ + std::cout << idxPart << " " << array1[idxPart].getPotential() + << " " << array1[idxPart].getForces()[0] + << " " << array1[idxPart].getForces()[1] + << " " << array1[idxPart].getForces()[2] < $FILEPERF-${DISTRIB[$dist]}-${ALGO[$a]}.out # One computation @@ -93,7 +101,8 @@ echo "# Core GlabalTIME P2PTIME M2LTIME MALLOC FREE MEMUse ENERGY PotentialE OUTPUT=${FILEPERF}-${DISTRIB[$dist]}-${ALGO[$a]}-${l}.out echo "ScalFMM git version: " $NUM > $OUTPUT echo "Running on " ${l} " threads with algo " ${ALGO[$a]} - $EXEC ${OPTION} -f $FILE -depth ${DEPTH[$dist]} -subdepth 4 -t $l -cmp -algo ${ALGO[$a]}>> $OUTPUT + $EXEC ${OPTION} -f $FILE -depth ${DEPTH[$dist]} -subdepth 4 -t $l -cmp -algo ${ALGO[$a]}>> $OUTPUT #1M +# $EXEC ${OPTION} -f $FILE -depth ${DEPTH[$dist]} -subdepth 4 -t $l -algo ${ALGO[$a]}>> $OUTPUT #10M # TIME=`grep "@Algorithm" $OUTPUT | awk '{print $4}'` TIMEP2P=`grep "P2P" $OUTPUT | grep "second" | awk '{print $4}'`