Changed CMakeLists.txt to set enable periodic definitions based on pe…

…tsc complex flag in dealii
ferroteam · Feb 24, 2018 · 87ef158 · 87ef158
1 parent d6aff65
commit 87ef158
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,11 +62,15 @@ PROJECT(${TARGET})
 SET(WARNINGSLIST "-w -Wno-sign-compare -Wno-ignored-qualifiers -Wno-deprecated-declarations -Wno-vla-extension -Wno-reorder -Wno-sometimes-uninitialized -Wno-undefined-var-template -Wno-ignored-qualifiers")
 SET(DEAL_II_CXX_FLAGS "${DEAL_II_CXX_FLAGS} ${WARNINGSLIST}" )
 
+#
 #Set periodic BC flag
-IF (DEFINED _ENABLE_PERIODIC)
+#
+IF (DEAL_II_PETSC_WITH_COMPLEX)
  ADD_DEFINITIONS(-DENABLE_PERIODIC_BC)
+ MESSAGE(STATUS "Periodic")
 ELSE()
  ADD_DEFINITIONS(-DDISABLE_PERIODIC_BC)
+ MESSAGE(STATUS "Non-periodic")
 ENDIF()
 
 ADD_EXECUTABLE(${TARGET} ${TARGET_SRC})
@@ -140,13 +144,3 @@ IF (DEFINED SPGLIB_DIR)
 ELSE()
  MESSAGE(FATAL_ERROR "-- Provide path to prefix of SPGLIB: -DSPGLIB_DIR=/path/to/prefix")
 ENDIF (DEFINED SPGLIB_DIR)
-
-#
-# set ignoreMe based on real/comple version of PETSC/SLEPC in deal.II
-#
-IF (DEAL_II_PETSC_WITH_COMPLEX)
- MESSAGE(STATUS "Periodic")
- SET(ignoreMe "TRUE")
-ELSE()
- MESSAGE(STATUS "Non-periodic")
-ENDIF()
diff --git a/setup.sh b/setup.sh
@@ -8,7 +8,7 @@ dealiiPetscComplexDir="/home/vikramg/DFT-FE-softwares/softwareCentos/dealiiDev/i
 alglibDir="/nfs/mcfs_comp/home/rudraa/software/alglib/cpp/src"
 libxcDir="/nfs/mcfs_comp/home/rudraa/software/libxc/libxc-2.2.0/installDir"
 spglibDir="/home/vikramg/DFT-FE-softwares/softwareCentos/spglib"
-optimizedMode=0
+optimizedMode=1
 #
 #Usually, no changes are needed below this line
 #
@@ -23,7 +23,7 @@ if [ $optimizedMode == 1 ]; then
  echo -e "${Blu}Building Non-Periodic executable in Optimized (Release) mode...${RCol}"
  mkdir -p nonPeriodic && cd nonPeriodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_BUILD_TYPE=Release -DDEAL_II_DIR=$dealiiPetscRealDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ..
  echo -e "${Blu}Building Periodic executable in Optimized (Release) mode...${RCol}"
- mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_BUILD_TYPE=Release -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir -D_ENABLE_PERIODIC=TRUE ../../../. && make && cd ../..
+ mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_BUILD_TYPE=Release -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ../..
  else
  rm -rf build/release
  echo -e "${Blu}Creating build directory...${RCol}"
@@ -32,7 +32,7 @@ if [ $optimizedMode == 1 ]; then
  echo -e "${Blu}Building Non-Periodic executable in Optimized (Release) mode...${RCol}"
  mkdir -p nonPeriodic && cd nonPeriodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_BUILD_TYPE=Release -DDEAL_II_DIR=$dealiiPetscRealDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ..
  echo -e "${Blu}Building Periodic executable in Optimized (Release) mode...${RCol}"
- mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_BUILD_TYPE=Release -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir -D_ENABLE_PERIODIC=TRUE ../../../. && make && cd ../..
+ mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_BUILD_TYPE=Release -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ../..
  fi
 else
  if [ -d "build/debug" ]; then
@@ -43,7 +43,7 @@ else
  echo -e "${Blu}Building Non-Periodic executable in Debug mode...${RCol}"
  mkdir -p nonPeriodic && cd nonPeriodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Debug -DDEAL_II_DIR=$dealiiPetscRealDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ..
  echo -e "${Blu}Building Periodic executable in Debug mode...${RCol}"
- mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Debug -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir -D_ENABLE_PERIODIC=TRUE ../../../. && make && cd ../..
+ mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Debug -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ../..
  else
  rm -rf build/debug
  echo -e "${Blu}Creating build directory...${RCol}"
@@ -52,7 +52,7 @@ else
  echo -e "${Blu}Building Non-Periodic executable in Debug mode...${RCol}"
  mkdir -p nonPeriodic && cd nonPeriodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Debug -DDEAL_II_DIR=$dealiiPetscRealDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ..
  echo -e "${Blu}Building Periodic executable in Debug mode...${RCol}"
- mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Debug -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir -D_ENABLE_PERIODIC=TRUE ../../../. && make && cd ../..
+ mkdir -p periodic && cd periodic && cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Debug -DDEAL_II_DIR=$dealiiPetscComplexDir -DALGLIB_DIR=$alglibDir -DLIBXC_DIR=$libxcDir -DSPGLIB_DIR=$spglibDir ../../../. && make && cd ../..
  fi
 fi
 echo -e "${Blu}Build complete.${RCol}"