Fix a bug concerning compilation and libtbb available versions. The desactivation of TTB routines do not impact the overall performances of pre-processing part.

Author: skhelladi

README.md

@@ -28,16 +28,15 @@ The solver is based on [GMSH](http://gmsh.info/) library and supports a wide ran
 
 First, make sure the following libraries are installed. If you are running a linux distribution (ubuntu, debian, ...), an installation [script](https://github.com/skhelladi/DGFEM-CAA/blob/main/build.sh) is provided. 
 
-```
-Gmsh (v4.10.5)
-Eigen (v3.4.0)
-Lapack
-Blas
-OpenMP
-Libtbb
-VTK (v9.x)
-FFTW
-```
+- Gmsh (v4.10.5)
+- Eigen (v3.4.0)
+- Lapack
+- Blas
+- OpenMP
+- ~~Libtbb~~
+- VTK (v9.x)
+- FFTW
+
 
 ### Installing
 ```

build.sh

@@ -52,14 +52,14 @@ else
 	echo "Lapack/Blas installed.";
 fi
 
-dpkg -s libtbb2 > /dev/null 2>&1;
-if [ $? -eq 0 ]; then
-	echo "TBB found.";
-else
-	echo "TBB not found, installing...";
-	sudo apt-get -y install libtbb2;
-	echo "TBB installed.";
-fi
+# dpkg -s libtbb2 > /dev/null 2>&1;
+# if [ $? -eq 0 ]; then
+# 	echo "TBB found.";
+# else
+# 	echo "TBB not found, installing...";
+# 	sudo apt-get -y install libtbb2;
+# 	echo "TBB installed.";
+# fi
 
 dpkg -s libglu1-mesa > /dev/null 2>&1;
 if [ $? -eq 0 ]; then

src/CMakeLists.txt

@@ -15,7 +15,7 @@ SET(SRCS
 )
 
 ADD_EXECUTABLE(dgalerkin ${SRCS})
-TARGET_LINK_LIBRARIES(dgalerkin ${GMSH_LIBRARIES} ${LAPACKBLAS_LIBRARIES} ${VTK_LIBRARIES} -fopenmp -ltbb -lpthread -lwave)
+TARGET_LINK_LIBRARIES(dgalerkin ${GMSH_LIBRARIES} ${LAPACKBLAS_LIBRARIES} ${VTK_LIBRARIES} -fopenmp -lpthread -lwave) #-ltbb
 
 vtk_module_autoinit(
 	TARGETS dgalerkin

src/Mesh.cpp

@@ -253,7 +253,7 @@ Mesh::Mesh(Config config) : config(config)
                         jacobian[i * m_elDim + j] = fJacobian(f, g, i, j);
                     }
                 }
-                std::copy(std::execution::par, &fUGradBasisFct(g, n), &fUGradBasisFct(g, n) + m_elDim, &fGradBasisFct(f, g, n));
+                std::copy(/*std::execution::par,*/ &fUGradBasisFct(g, n), &fUGradBasisFct(g, n) + m_elDim, &fGradBasisFct(f, g, n));
                 eigen::solve(jacobian.data(), &fGradBasisFct(f, g, n), m_elDim);
             }
         }
@@ -983,7 +983,7 @@ void Mesh::getUniqueFaceNodeTags()
     m_elFNodeTagsOrdered = m_elFNodeTags;
     // #pragma omp parallel for
     for (int i = 0; i < m_elFNodeTagsOrdered.size(); i += m_fNumNodes)
-        std::sort(std::execution::par, m_elFNodeTagsOrdered.begin() + i, m_elFNodeTagsOrdered.begin() + (i + m_fNumNodes));
+        std::sort(/*std::execution::par,*/ m_elFNodeTagsOrdered.begin() + i, m_elFNodeTagsOrdered.begin() + (i + m_fNumNodes));
 
     screen_display::write_string("get Unique Face Node Tags", RED);
 
@@ -1065,7 +1065,7 @@ void Mesh::getUniqueFaceNodeTags()
     // m_fNodeTagsOrdered.clear();
     m_fNodeTagsOrdered = m_fNodeTags;
     for (int i = 0; i < m_fNodeTagsOrdered.size(); i += m_fNumNodes)
-        std::sort(std::execution::par, m_fNodeTagsOrdered.begin() + i, m_fNodeTagsOrdered.begin() + (i + m_fNumNodes));
+        std::sort(/*std::execution::par,*/ m_fNodeTagsOrdered.begin() + i, m_fNodeTagsOrdered.begin() + (i + m_fNumNodes));
 
     screen_display::write_if_false(tmp == m_fNumNodes, "Bad dimension error...");