Fix bug with optidis. The level in rootcell should be set in the construcor...

Fix bug with optidis. The level in rootcell should be set in the construcor (needed in M2M operator)

Examples/ChebyshevStarpuImplicit.cpp

 // ==== CMAKE =====
 // @FUSE_BLAS
-// ================
-// Keep in private GIT
 // @FUSE_MPI
 // @FUSE_STARPU
 //

Examples/LagrangeStarpuImplicit.cpp

 // ==== CMAKE =====
 // @FUSE_BLAS
-// ================
-// Keep in private GIT
 // @FUSE_MPI
 // @FUSE_STARPU
 //

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

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) << "  "

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}'`