From 12dd385c6d20597ab03264af792ff4015754041c Mon Sep 17 00:00:00 2001
From: Olivier Coulaud <olivier.coulaud@inria.fr>
Date: Wed, 4 Jul 2018 16:51:02 +0200
Subject: [PATCH] Fix bug with optidis. The level in rootcell should be set in
 the construcor (needed in M2M operator)

---
 Examples/ChebyshevStarpuImplicit.cpp         |  2 --
 Examples/LagrangeStarpuImplicit.cpp          |  2 --
 Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp |  3 ++-
 Src/Utils/FCompareResults.hpp                | 10 ++++++++
 Utils/scripts/cmpOpenMPAlgo.slurm            | 25 +++++++++++++-------
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Examples/ChebyshevStarpuImplicit.cpp b/Examples/ChebyshevStarpuImplicit.cpp
index d7f2b534..8b9fe7e4 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 f433e7e6..e13b567f 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 b0676205..80551d43 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 1171889d..e6125222 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] <<std::endl ;
+		  std::cout << idxPart << " " << array2[idxPart].getPotential()
+			    << "  "  << array2[idxPart].getForces()[0]
+			    << "  "  << array2[idxPart].getForces()[1]
+			    << "  "  << array2[idxPart].getForces()[2]  <<std::endl ;
+		}
 	}
 	// Print for information
 	std::cout << tag<< " Energy "  << FMath::Abs(energy1-energy2) << "  "
diff --git a/Utils/scripts/cmpOpenMPAlgo.slurm b/Utils/scripts/cmpOpenMPAlgo.slurm
index 07676c4e..07734f66 100755
--- a/Utils/scripts/cmpOpenMPAlgo.slurm
+++ b/Utils/scripts/cmpOpenMPAlgo.slurm
@@ -4,7 +4,7 @@
 #SBATCH -m a
 #
 #SBATCH -p court
-#SBATCH --time=20:00
+#SBATCH --time=60:00
 #SBATCH --nodes=1
 #SBATCH --ntasks-per-node=24
 #
@@ -66,25 +66,33 @@ PER_SIZE="4 8 12 16 20 24"
 HOST=`hostname`
 NBTEST=3  # 0..NBTEST
 DISTRIB=(unitcube unitsphere prolate plummer)
-DEPTH=(6           7           9            8)
-ALGO=(task newtask sectiontask)
+DEPTH=(6           7           9            8)    # 1M
+#DEPTH=(7           8           10            9)   # 10M
+
+if test ${#DISTRIB[*]}  -ne ${#DEPTH[*]}
+then
+    echo " DEPTH and DISTRIB arrays don't have se same size"
+    exit
+fi
+
+ALGO=(task newtask sectiontask omp4)
 #
 pwd
 export OMP_PROC_BIND=true
-#export KMP_AFFINITY=scatter
 NUM=`git rev-list HEAD --count`
 echo   $DISTRIB
 mkdir  ${DATE}
-for dist in `seq 0 $NBTEST`;
+for dist in ${!DISTRIB[*]}    ;
 do
     echo "Distribution:  " $dist ${DISTRIB[$dist]}   "  depth octree "  ${DEPTH[$dist]}
-    FILE=${data_dir}/${DISTRIB[$dist]}-1M-ref.bfma
+    FILE=${data_dir}/${DISTRIB[$dist]}-1M-ref.bfma      #1M
+#    FILE=${data_dir}/${DISTRIB[$dist]}-10M.bfma         #10M
     FILEGNU=${DISTRIB[$dist]}-${Interp}.txt
     mkdir   ${DATE}/${DISTRIB[$dist]} 
     touch  $FILEGNU
     #
     #    Loop on algorithm 
-    for a in `seq 0 2`;
+    for a in ${!ALGO[*]}    ;
     do 
 echo  "# Core GlabalTIME P2PTIME M2LTIME  MALLOC   FREE MEMUse ENERGY PotentialError ForceError"> $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}'`
-- 
2.22.0