Various cmake changes: SuperLU is not enabled by default and VTF-writer is always used, if present. Added option to enable SuperLU_MT instad of SuperLU, when both are present. Added target for linear elasticity App.

git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@816 e10b68d5-8a6e-419e-a041-bce267b0401d
2011-02-22 17:35:18 +00:00
parent 7be12bd1c1
commit 5579c2571f
8 changed files with 128 additions and 178 deletions
--- a/Apps/FiniteDefElasticity/CMakeLists.txt
+++ b/Apps/FiniteDefElasticity/CMakeLists.txt
@@ -3,25 +3,27 @@ PROJECT(FiniteDefElasticity)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

 # Required defines
-SET(CMAKE_CXX_FLAGS "-Dreal=double")
+SET(CMAKE_CXX_FLAGS "-Dreal=double -DUSE_FTNMAT")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DINDEX_CHECK=2 -DINT_DEBUG=0")

 IF(NOT CMAKE_BUILD_TYPE)
  SET(CMAKE_BUILD_TYPE Release)
 ENDIF(NOT CMAKE_BUILD_TYPE)

 # Add local modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
-                      $ENV{HOME}/cmake/Modules/ 
-                      ${PROJECT_SOURCE_DIR}/../../cmake/Modules)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+                      ${PROJECT_SOURCE_DIR}/../../cmake/Modules
+                      $ENV{HOME}/cmake/Modules)

-enable_language(Fortran)
+ENABLE_LANGUAGE(Fortran)
 IF(CMAKE_Fortran_COMPILER MATCHES ifort)
  SET(LANGUAGE_LIBS -lifcore)
 ENDIF(CMAKE_Fortran_COMPILER MATCHES ifort)
-enable_language(CXX)
+
+ENABLE_LANGUAGE(CXX)
 IF(CMAKE_CXX_COMPILER MATCHES icpc)
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MKL")
-ELSE()
+ELSE(CMAKE_CXX_COMPILER MATCHES icpc)
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_CBLAS")
 ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)

@@ -29,82 +31,56 @@ ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)
 FIND_PACKAGE(Boost REQUIRED)
 FIND_PACKAGE(GoTools REQUIRED)
 FIND_PACKAGE(GoTrivariate REQUIRED)
-FIND_PACKAGE(Arpack REQUIRED)
-FIND_PACKAGE(BLAS REQUIRED)
 FIND_PACKAGE(LAPACK REQUIRED)
+FIND_PACKAGE(ARPACK REQUIRED)
 FIND_PACKAGE(IFEM REQUIRED)

 # Optional packages
 IF(${ENABLE_PETSC})
  FIND_PACKAGE(Petsc)
 ENDIF(${ENABLE_PETSC})
-IF(${ENABLE_SUPERLU})
+IF(NOT "${DISABLE_SUPERLU}")
  FIND_PACKAGE(SuperLU)
-ENDIF(${ENABLE_SUPERLU})
+ENDIF(NOT "${DISABLE_SUPERLU}")
 IF(${ENABLE_SAMG})
  FIND_PACKAGE(SAMG)
 ENDIF(${ENABLE_SAMG})
-IF(${ENABLE_VTFWRITER})
-  FIND_PACKAGE(VTFWriter)
-ENDIF(${ENABLE_VTFWRITER})
-
-# Required libraries
-SET(DEPLIBS ${IFEM_LIBRARIES} ${Boost_LIBRARIES} ${GoTrivariate_LIBRARIES}
-            ${GoTools_LIBRARIES} ${BLAS_LIBRARIES}
-            ${Arpack_LIBRARIES} ${LANGUAGE_LIBS}
-)
+FIND_PACKAGE(VTFWriter)

 # Required include directories
-SET(INCLUDES
-  ${Boost_INCLUDE_DIRS}
-  ${GoTools_INCLUDE_DIRS}
-  ${GoTrivariate_INCLUDE_DIRS}
-  ${Arpack_INCLUDES}
-  ${IFEM_INCLUDES}
-  ${PROJECT_SOURCE_DIR}/../
+SET(INCLUDES ${IFEM_INCLUDES} ${PROJECT_SOURCE_DIR}/..)
+
+# Required libraries
+SET(DEPLIBS ${IFEM_LIBRARIES}
+  ${GoTrivariate_LIBRARIES} ${GoTools_LIBRARIES}
+  ${ARPACK_LIBRARIES} ${LAPACK_LIBRARIES}
+  ${Boost_LIBRARIES} ${LANGUAGE_LIBS}
 )

-IF(SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES)
-    FIND_PACKAGE(Threads REQUIRED)
-    SET(DEPLIBS ${DEPLIBS} ${SuperLU_MT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-    SET(INCLUDES ${INCLUDES} ${SuperLU_MT_INCLUDES})
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SUPERLU_MT")
-ENDIF(SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES)
+# Optional libraries
+IF(SuperLU_MT_LIBRARIES AND "${ENABLE_SUPERLU_MT}")
+  FIND_PACKAGE(Threads REQUIRED)
+  SET(DEPLIBS ${DEPLIBS} ${SuperLU_MT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ELSEIF(SuperLU_LIBRARIES)
+  SET(DEPLIBS ${DEPLIBS} ${SuperLU_LIBRARIES})
+ENDIF(SuperLU_MT_LIBRARIES AND "${ENABLE_SUPERLU_MT}")

-IF(NOT (SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES))
-  IF(SuperLU_LIBRARIES AND SuperLU_INCLUDES)
-    SET(DEPLIBS ${DEPLIBS} ${SuperLU_LIBRARIES})
-    SET(INCLUDES ${INCLUDES} ${SuperLU_INCLUDES})
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SUPERLU")
-  ENDIF(SuperLU_LIBRARIES AND SuperLU_INCLUDES)
-ENDIF(NOT (SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES))
-
-IF(PETSC_LIBRARIES AND PETSC_INCLUDE_DIR)
-  SET(INCLUDES ${INCLUDES} ${PETSC_INCLUDE_DIR})
-  SET(DEPLIBS ${DEPLIBS} ${PETSC_LIBRARIES})
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_PETSC")
-  FIND_PACKAGE(MPI REQUIRED)
-  SET(INCLUDES ${INCLUDES} ${MPI_INCLUDE_PATH})
-  SET(DEPLIBS ${DEPLIBS} ${MPI_LIBRARIES})
+IF(PETSC_LIBRARIES)
  FIND_PACKAGE(SLEPc)
-  IF(SLEPC_LIBRARIES AND SLEPC_INCLUDES)
-    SET(INCLUDES ${INCLUDES} ${SLEPC_INCLUDES})
+  FIND_PACKAGE(MPI REQUIRED)
+  IF(SLEPC_LIBRARIES)
    SET(DEPLIBS ${DEPLIBS} ${SLEPC_LIBRARIES})
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SLEPC")
-  ENDIF(SLEPC_LIBRARIES AND SLEPC_INCLUDES)
-ENDIF(PETSC_LIBRARIES AND PETSC_INCLUDE_DIR)
+  ENDIF(SLEPC_LIBRARIES)
+  SET(DEPLIBS ${DEPLIBS} ${PETSC_LIBRARIES} ${MPI_LIBRARIES})
+ENDIF(PETSC_LIBRARIES)

-IF(SAMG_LIBRARIES AND SAMG_INCLUDES)
+IF(SAMG_LIBRARIES)
  SET(DEPLIBS ${DEPLIBS} ${SAMG_LIBRARIES})
-  SET(INCLUDES ${INCLUDES} ${SAMG_INCLUDES})
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SAMG -DSAMG_UNIX_LINUX=1 -DSAMG_LCASE_USCORE")
-ENDIF(SAMG_LIBRARIES AND SAMG_INCLUDES)
+ENDIF(SAMG_LIBRARIES)

-IF(VTFWRITER_LIBRARIES AND VTFWRITER_INCLUDES)
+IF(VTFWRITER_LIBRARIES)
  SET(DEPLIBS ${DEPLIBS} ${VTFWRITER_LIBRARIES})
-  SET(INCLUDES ${INCLUDES} ${VTFWRITER_INCLUDES})
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_VTFAPI=1")
-ENDIF(VTFWRITER_LIBRARIES AND VTFWRITER_INCLUDES)
+ENDIF(VTFWRITER_LIBRARIES)

 INCLUDE_DIRECTORIES(${INCLUDES})
 SET(EXECUTABLE_OUTPUT_PATH bin)
@@ -115,11 +91,11 @@ IF(NOT WIN32)
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 ENDIF(NOT WIN32)

-FILE(GLOB_RECURSE NonLinEl_SRCS ${PROJECT_SOURCE_DIR}/../SIMLinEl2D.C
-                                ${PROJECT_SOURCE_DIR}/../SIMLinEl3D.C
-                                *.C
-                                *.f
-                                Material/*.f)
+# Enable all warnings
+#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+
+FILE(GLOB_RECURSE NonLinEl_SRCS ${PROJECT_SOURCE_DIR}/../SIMLinEl?D.C
+                                ${PROJECT_SOURCE_DIR}/*.[Cf])

 ADD_EXECUTABLE(NonLinEl ${NonLinEl_SRCS})
 TARGET_LINK_LIBRARIES(NonLinEl ${DEPLIBS})
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,9 @@ PROJECT(IFEM)

 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

-# Required defines
-SET(CMAKE_CXX_FLAGS "-Dreal=double")
+# Required defines (well, PROFILE_LEVEL is not actually required, but...)
+SET(CMAKE_CXX_FLAGS "-Dreal=double -DepsZ=1.0e-12 -DPROFILE_LEVEL=3")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DINDEX_CHECK=2 -DSP_DEBUG=1")

 ENABLE_LANGUAGE(Fortran)
 IF(CMAKE_Fortran_COMPILER MATCHES ifort)
@@ -25,28 +26,25 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
 FIND_PACKAGE(Boost REQUIRED)
 FIND_PACKAGE(GoTools REQUIRED)
 FIND_PACKAGE(GoTrivariate REQUIRED)
-FIND_PACKAGE(Arpack REQUIRED)
-FIND_PACKAGE(BLAS REQUIRED)
 FIND_PACKAGE(LAPACK REQUIRED)
+FIND_PACKAGE(ARPACK REQUIRED)

 # Optional packages
 IF(${ENABLE_PETSC})
  FIND_PACKAGE(Petsc)
 ENDIF(${ENABLE_PETSC})
-IF(${ENABLE_SUPERLU})
+IF(NOT "${DISABLE_SUPERLU}")
  FIND_PACKAGE(SuperLU)
-ENDIF(${ENABLE_SUPERLU})
+ENDIF(NOT "${DISABLE_SUPERLU}")
 IF(${ENABLE_SAMG})
  FIND_PACKAGE(SAMG)
 ENDIF(${ENABLE_SAMG})
-IF(${ENABLE_VTFWRITER})
-  FIND_PACKAGE(VTFWriter)
-ENDIF(${ENABLE_VTFWRITER})
+FIND_PACKAGE(VTFWriter)

 # Required libraries
-SET(DEPLIBS ${Boost_LIBRARIES} ${GoTrivariate_LIBRARIES}
-            ${GoTools_LIBRARIES} ${BLAS_LIBRARIES}
-            ${Arpack_LIBRARIES} ${LANGUAGE_LIBS} ${LAPACK_LIBRARIES}
+SET(DEPLIBS ${GoTrivariate_LIBRARIES} ${GoTools_LIBRARIES}
+            ${ARPACK_LIBRARIES} ${LAPACK_LIBRARIES}
+            ${Boost_LIBRARIES} ${LANGUAGE_LIBS}
 )

 # Required include directories
@@ -60,23 +58,18 @@ SET(INCLUDES
  ${PROJECT_SOURCE_DIR}/src/LinAlg
  ${PROJECT_SOURCE_DIR}/src/SIM
  ${PROJECT_SOURCE_DIR}/src/Utility
-  ${PROJECT_SOURCE_DIR}/Apps
 )

-IF(SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES)
-    FIND_PACKAGE(Threads REQUIRED)
-    SET(DEPLIBS ${DEPLIBS} ${SuperLU_MT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-    SET(INCLUDES ${INCLUDES} ${SuperLU_MT_INCLUDES})
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SUPERLU_MT")
-ENDIF(SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES)
-
-IF(NOT SuperLU_MT_LIBRARIES) 
-  IF(SuperLU_LIBRARIES AND SuperLU_INCLUDES)
-    SET(DEPLIBS ${DEPLIBS} ${SuperLU_LIBRARIES})
-    SET(INCLUDES ${INCLUDES} ${SuperLU_INCLUDES})
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SUPERLU")
-  ENDIF(SuperLU_LIBRARIES AND SuperLU_INCLUDES)
-ENDIF(NOT SuperLU_MT_LIBRARIES)
+IF(SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES AND "${ENABLE_SUPERLU_MT}")
+  FIND_PACKAGE(Threads REQUIRED)
+  SET(DEPLIBS ${DEPLIBS} ${SuperLU_MT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+  SET(INCLUDES ${INCLUDES} ${SuperLU_MT_INCLUDES})
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SUPERLU_MT")
+ELSEIF(SuperLU_LIBRARIES AND SuperLU_INCLUDES)
+  SET(DEPLIBS ${DEPLIBS} ${SuperLU_LIBRARIES})
+  SET(INCLUDES ${INCLUDES} ${SuperLU_INCLUDES})
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_SUPERLU")
+ENDIF(SuperLU_MT_LIBRARIES AND SuperLU_MT_INCLUDES AND "${ENABLE_SUPERLU_MT}")

 IF(PETSC_LIBRARIES AND PETSC_INCLUDE_DIR)
  SET(INCLUDES ${INCLUDES} ${PETSC_INCLUDE_DIR})
@@ -116,19 +109,29 @@ IF(NOT WIN32)
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 ENDIF(NOT WIN32)

+# Enable all warnings
+#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+
 # Make the IFEM library

-FILE(GLOB_RECURSE IFEM_SRCS src/ASM/*.C src/Eig/*.C
-                            src/Eig/*.f src/Integrands/*.C
-                            src/LinAlg/*.C src/SIM/*.C src/Utility/*.C)
+FILE(GLOB_RECURSE IFEM_SRCS ${PROJECT_SOURCE_DIR}/src/*.[Cf])
 ADD_LIBRARY(IFEM ${IFEM_SRCS})
-TARGET_LINK_LIBRARIES(IFEM ${DEPLIBS})
+#TARGET_LINK_LIBRARIES(IFEM ${DEPLIBS})

 # Make the Apps
 FILE(GLOB_RECURSE Poisson_SRCS ${PROJECT_SOURCE_DIR}/Apps/Poisson/*.C)
 ADD_EXECUTABLE(Poisson ${Poisson_SRCS})
 TARGET_LINK_LIBRARIES(Poisson IFEM ${DEPLIBS})

+FILE(GLOB_RECURSE LinEl_SRCS ${PROJECT_SOURCE_DIR}/Apps/main_LinEl3D.C
+  ${PROJECT_SOURCE_DIR}/Apps/SIMLinEl2D.C
+  ${PROJECT_SOURCE_DIR}/Apps/SIMLinEl3D.C
+  ${PROJECT_SOURCE_DIR}/Apps/FiniteDefElasticity/NonlinearElasticity.C
+  ${PROJECT_SOURCE_DIR}/Apps/FiniteDefElasticity/NonlinearElasticityTL.C
+  ${PROJECT_SOURCE_DIR}/Apps/FiniteDefElasticity/stiff_TL.f)
+ADD_EXECUTABLE(LinEl ${LinEl_SRCS})
+TARGET_LINK_LIBRARIES(LinEl IFEM ${DEPLIBS})
+
 IF(NOT IFEM_INSTALL_PREFIX)
  SET(IFEM_INSTALL_PREFIX $ENV{HOME})
 ENDIF(NOT IFEM_INSTALL_PREFIX)
@@ -141,8 +144,7 @@ ELSE(WIN32)
  INSTALL(TARGETS IFEM DESTINATION ${IFEM_INSTALL_PREFIX}/lib)

  # headers
-  FILE(GLOB_RECURSE IFEM_HEADERS src/ASM/*.h src/Eig/*.h
-                                 src/Eig/*.h src/Integrands/*.h
+  FILE(GLOB_RECURSE IFEM_HEADERS src/ASM/*.h src/Integrands/*.h
                                 src/LinAlg/*.h src/SIM/*.h src/Utility/*.h)
  INSTALL(FILES ${IFEM_HEADERS}
          DESTINATION ${IFEM_INSTALL_PREFIX}/include/IFEM)
--- a/cmake/Modules/FindARPACK.cmake
+++ b/cmake/Modules/FindARPACK.cmake
@@ -0,0 +1,15 @@
+IF (ARPACK_LIBRARIES)
+  SET(ARPACK_FIND_QUIETLY TRUE)
+ENDIF (ARPACK_LIBRARIES)
+
+FIND_LIBRARY(ARPACK_LIBRARIES
+  NAMES arpack
+  PATHS $ENV{HOME}/lib
+  /sima/libs/ARPACK
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ARPACK DEFAULT_MSG
+                                  ARPACK_LIBRARIES)
+
+MARK_AS_ADVANCED(ARPACK_LIBRARIES)
--- a/cmake/Modules/FindArpack.cmake
+++ b/cmake/Modules/FindArpack.cmake
@@ -1,20 +0,0 @@
-
-IF (Arpack_LIBRARIES)
-  SET(Arpack_FIND_QUIETLY TRUE)
-ENDIF (Arpack_LIBRARIES)
-
-FIND_LIBRARY(Arpack_LIBRARIES arpack
-             PATHS 
-             /sima/libs/ARPACK
-             $ENV{HOME}/lib
-)
-
-IF(Arpack_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-  SET(Arpack_LIBRARIES ${Arpack_LIBRARIES})
-ENDIF(Arpack_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-
-INCLUDE(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Arpack DEFAULT_MSG
-                                  Arpack_LIBRARIES)
-
-MARK_AS_ADVANCED(Arpack_LIBRARIES)
--- a/cmake/Modules/FindSAMG.cmake
+++ b/cmake/Modules/FindSAMG.cmake
@@ -3,19 +3,17 @@ IF (SAMG_LIBRARIES)
 ENDIF(SAMG_LIBRARIES)

 FIND_PATH(SAMG_INCLUDES
-          NAMES
-          samg.h
-          PATHS
-          $ENV{HOME}/include
+  NAMES samg.h
+  PATHS $ENV{HOME}/include
 )

-FIND_LIBRARY(SAMG_LIBRARIES amg_coo 
-             PATHS 
-             $ENV{HOME}/lib
+FIND_LIBRARY(SAMG_LIBRARIES
+  NAMES amg_coo
+  PATHS $ENV{HOME}/lib
 )

 INCLUDE(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SAMG DEFAULT_MSG
-                                  SAMG_LIBRARIES)
+                                  SAMG_INCLUDES SAMG_LIBRARIES)

-MARK_AS_ADVANCED(SAMG_LIBRARIES)
+MARK_AS_ADVANCED(SAMG_INCLUDES SAMG_LIBRARIES)
--- a/cmake/Modules/FindSuperLU.cmake
+++ b/cmake/Modules/FindSuperLU.cmake
@@ -3,43 +3,31 @@ IF(SuperLU_INCLUDES AND SuperLU_LIBRARIES)
 ENDIF(SuperLU_INCLUDES AND SuperLU_LIBRARIES)

 FIND_PATH(SuperLU_INCLUDES
-          NAMES
-          supermatrix.h
-          PATHS
-          $ENV{HOME}/include
-          /sima/libs/SuperLU_4.0/include
-          PATH_SUFFIXES superlu
+  NAMES slu_ddefs.h
+  PATHS $ENV{HOME}/include
+  /sima/libs/SuperLU/include
+  PATH_SUFFIXES superlu
 )

 FIND_PATH(SuperLU_MT_INCLUDES
-          NAMES
-          slu_mt_machines.h
-          PATHS
-          $ENV{HOME}/include
-          /sima/libs/SuperLU_4.0/include
-          PATH_SUFFIXES superlu
+  NAMES pdsp_defs.h
+  PATHS $ENV{HOME}/include
+  /sima/libs/SuperLU_MT/include
+  PATH_SUFFIXES superlu
 )

-FIND_LIBRARY(SuperLU_LIBRARIES superlu 
-             PATHS 
-             /sima/libs/SuperLU_4.0/lib
-             $ENV{HOME}/lib
+FIND_LIBRARY(SuperLU_LIBRARIES
+  NAMES superlu
+  PATHS $ENV{HOME}/lib
+  /sima/libs/SuperLU/lib
 )

-FIND_LIBRARY(SuperLU_MT_LIBRARIES superlu_mt
-             PATHS 
-             /sima/libs/SuperLU_4.0/lib
-             $ENV{HOME}/lib
+FIND_LIBRARY(SuperLU_MT_LIBRARIES
+  NAMES superlu_mt
+  PATHS $ENV{HOME}/lib
+  /sima/libs/SuperLU_MT/lib           
 )

-IF(SuperLU_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-  SET(SuperLU_LIBRARIES ${SuperLU_LIBRARIES} -lgfortran)
-ENDIF(SuperLU_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-
-IF(SuperLU_MT_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-  SET(SuperLU_MT_LIBRARIES ${SuperLU_MT_LIBRARIES} -lgfortran)
-ENDIF(SuperLU_MT_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-
 INCLUDE(FindPackageHandleStandardArgs)
 IF(SuperLU_LIBRARIES)
  find_package_handle_standard_args(SuperLU DEFAULT_MSG
--- a/cmake/Modules/FindVTFWriter.cmake
+++ b/cmake/Modules/FindVTFWriter.cmake
@@ -3,24 +3,17 @@ IF(VTFWRITER_INCLUDES AND VTFWRITER_LIBRARIES)
 ENDIF(VTFWRITER_INCLUDES AND VTFWRITER_LIBRARIES)

 FIND_PATH(VTFWRITER_INCLUDES
-  NAMES
-  VTFAPI.h
-  PATHS
-  $ENV{HOME}/include
+  NAMES VTFAPI.h
+  PATHS $ENV{HOME}/include
  /sima/libs/GLviewExpressWriter/include
 )

-FIND_LIBRARY(VTFWRITER_LIBRARIES 
-             VTFExpressAPI
-             PATHS
-             $ENV{HOME}/lib
-             /sima/libs/GLviewExpressWriter/lib
+FIND_LIBRARY(VTFWRITER_LIBRARIES
+  NAMES VTFExpressAPI
+  PATHS $ENV{HOME}/lib
+  /sima/libs/GLviewExpressWriter/lib
 )

-IF(VTFWRITER_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-  SET(VTFWRITER_LIBRARIES ${VTFWRITER_LIBRARIES})
-ENDIF(VTFWRITER_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
-
 INCLUDE(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(VTFWRITER DEFAULT_MSG
                                  VTFWRITER_INCLUDES VTFWRITER_LIBRARIES)
--- a/src/LinAlg/LinAlgInit.C
+++ b/src/LinAlg/LinAlgInit.C
@@ -1,4 +1,4 @@
-// $Id: LinAlgInit.C,v 1.2 2011-01-02 15:50:35 kmo Exp $
+// $Id$
 //==============================================================================
 //!
 //! \file LinAlgInit.C
@@ -22,11 +22,10 @@

 LinAlgInit::LinAlgInit (int argc, char** argv)
 {
-#ifdef HAS_SLEPC
+#if defined(HAS_SLEPC)
  SlepcInitialize(&argc,&argv,(char*)0,PETSC_NULL);
-#endif
-#ifdef HAS_PETSC
-  //PetscInitialize(&argc,&argv,(char*)0,PETSC_NULL);
+#elif defined(HAS_PETSC)
+  PetscInitialize(&argc,&argv,(char*)0,PETSC_NULL);
 #endif
 #ifdef PARALLEL_PETSC
  MPI_Comm_rank(PETSC_COMM_WORLD,&myPid);
@@ -38,10 +37,9 @@ LinAlgInit::LinAlgInit (int argc, char** argv)

 LinAlgInit::~LinAlgInit ()
 {
-#ifdef HAS_SLEPC
+#if defined(HAS_SLEPC)
  SlepcFinalize();
-#endif
-#ifdef HAS_PETSC
-  //PetscFinalize();
+#elif defined(HAS_PETSC)
+  PetscFinalize();
 #endif
 }