compilation with dealii9.5.2 successful

Author: dsambit

CMakeLists.txt

@@ -385,11 +385,11 @@ ENDIF()
 #DEAL_II_INITIALIZE_CACHED_VARIABLES()
 
 
-TARGET_INCLUDE_DIRECTORIES(${TARGETLIB} PUBLIC ${DEAL_II_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${TARGETLIB} PUBLIC ${DEAL_II_INCLUDE_RELDIR})
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-    TARGET_LINK_LIBRARIES (${TARGETLIB} PUBLIC ${DEAL_II_LIBRARIES_RELEASE})
+    TARGET_LINK_LIBRARIES (${TARGETLIB} PUBLIC dealii::dealii_release)
 ELSE()
-   TARGET_LINK_LIBRARIES (${TARGETLIB} PUBLIC ${DEAL_II_LIBRARIES_DEBUG})
+   TARGET_LINK_LIBRARIES (${TARGETLIB} PUBLIC dealii::dealii_debug)
 ENDIF()
 
 IF (WITH_CUSTOMIZED_DEALII)

doc/manual/installation.tex

@@ -153,10 +153,7 @@ \subsubsection{Instructions for deal.II}
 
 \begin{enumerate}
 
-\item Obtain the customized version of deal.II library via
-\begin{verbatim}
-$ git clone -b dealiiCustomizedCUDARelease https://github.com/dftfeDevelopers/dealii.git
-\end{verbatim}
+\item Obtain the latest release version (9.5.2) of deal.II
 
 \item In addition to requiring C, C++ and Fortran compilers, MPI library, and CMake, deal.II additionally requires BOOST library. If not found externally, cmake will resort to the bundled BOOST that comes along with deal.II. Based on our experience, we recommend to use the deal.II's bundled boost (enforced by unsetting/unloading external BOOST library environment paths) to avoid compilation issues. Please do not install deal.II with GPU support as that is not needed by DFT-FE. Further, when installing deal.II for (DFT-FE with GPU support), one must use \verb|-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF| to avoid compilation failure of DFT-FE.
 

setupDevelopPetsc.sh

@@ -17,8 +17,8 @@ SRC=`dirname $0` # location of source directory
 # and optimization flag
 
 #Paths for required external libraries
-dealiiPetscRealDir="/home/vikramg/DFT-softwares-gcc/dealii/install_real_cpu"
-dealiiPetscComplexDir="/home/vikramg/DFT-softwares-gcc/dealii/install_complex_cpu"
+dealiiPetscRealDir="/home/vikramg/DFT-softwares-gcc/dealii9.5.2/install_real_cpu"
+dealiiPetscComplexDir="/home/vikramg/DFT-softwares-gcc/dealii9.5.2/install_complex_cpu"
 alglibDir="/home/vikramg/DFT-softwares-gcc/alglib/alglib-cpp/src"
 libxcDir="/home/vikramg/DFT-softwares-gcc/libxc/libxc-5.2.3/install_libxc5.2.3"
 spglibDir="/home/vikramg/DFT-softwares-gcc/spglib/install"
@@ -46,7 +46,7 @@ withGPUAwareMPI=OFF #Please use this option with care
 withDCCL=OFF
 withMDI=OFF
 withTorch=OFF
-withCustomizedDealii=ON
+withCustomizedDealii=OFF
 
 #Compiler options and flags
 cxx_compiler=/sw/pkgs/arc/stacks/gcc/10.3.0/openmpi/4.1.6/bin/mpicxx  #sets DCMAKE_CXX_COMPILER

setupUser.sh

@@ -47,7 +47,7 @@ withGPUAwareMPI=OFF #Please use this option with care
 withDCCL=ON
 withMDI=OFF
 withTorch=OFF
-withCustomizedDealii=ON
+withCustomizedDealii=OFF
 
 #Compiler options and flags
 cxx_compiler=mpic++  #sets DCMAKE_CXX_COMPILER

src/dft/dft.cc

@@ -4429,7 +4429,8 @@ namespace dftfe
             unsigned int              FEOrderElectro,
             dftfe::utils::MemorySpace memorySpace>
   const std::vector<std::vector<double>> &
-  dftClass<FEOrder, FEOrderElectro, memorySpace>::getImageAtomLocationsCart() const
+  dftClass<FEOrder, FEOrderElectro, memorySpace>::getImageAtomLocationsCart()
+    const
   {
     return d_imagePositionsTrunc;
   }

src/dftfeWrapper.cc

@@ -21,6 +21,7 @@
 // deal.II header
 //
 #include <deal.II/base/data_out_base.h>
+#include <deal.II/base/multithread_info.h>
 #include <p4est_bits.h>
 
 #ifdef USE_PETSC