Commit 26ae3e2c authored by grandper's avatar grandper
Browse files

Merge branch 'master' into 201308_templateNSSolver

parents bb9e6974 05b0dab8
......@@ -53,6 +53,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION ${TRIBITS_CMAKE_MINIMUM_REQUIRED})
# Add documentation
ADD_SUBDIRECTORY(doc)
# Add source dir to includes
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
# Do all of the processing for this Tribits project
TRIBITS_PROJECT()
......@@ -80,11 +83,11 @@ if (HDF5_IS_IN_TRILINOS AND NOT EpetraExt_FOUND)
endif()
# Adding a new CMake variable for each of the enabled packages
STRING(REPLACE " " ";" PACKAGE_LIST ${LifeV_ENABLED_PACKAGES})
STRING(REPLACE " " ";" ENABLED_PACKAGE_LIST ${LifeV_ENABLED_PACKAGES})
FOREACH(LifeV_PACKAGE ${PACKAGE_LIST})
STRING(TOUPPER ${LifeV_PACKAGE} UPPER_PACKAGE)
SET(LIFEV_HAS_${UPPER_PACKAGE} ON CACHE BOOL "LifeV has ${LifeV_PACKAGE}")
FOREACH(ENABLED_PACKAGE ${ENABLED_PACKAGE_LIST})
STRING(TOUPPER ${ENABLED_PACKAGE} UPPER_PACKAGE)
SET(LIFEV_HAS_${UPPER_PACKAGE} ON)
ENDFOREACH()
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}_config.h.in
......
......@@ -76,13 +76,13 @@ SET( LifeV_PACKAGES_AND_DIRS_AND_CLASSIFICATIONS
Core lifev/core PS
BCInterface lifev/bc_interface PS
OneDFSI lifev/one_d_fsi PS
ZeroDimensional lifev/zero_dimensional PS
LevelSet lifev/level_set PS
Darcy lifev/darcy PS
NavierStokes lifev/navier_stokes PS
Structure lifev/structure PS
Heart lifev/heart PS
FSI lifev/fsi PS
ZeroDimensional lifev/zero_dimensional PS
Multiscale lifev/multiscale PS
Dummy lifev/dummy EX
ETA lifev/eta EX
......
......@@ -40,9 +40,6 @@
night execution of the test inside the testsuite.
*/
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Epetra_ConfigDefs.h>
#ifdef EPETRA_MPI
......@@ -52,10 +49,6 @@
#include <Epetra_SerialComm.h>
#endif
//Tell the compiler to restore the warning previously silented
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
LifeV::AboutData
......
......@@ -183,9 +183,6 @@ ADD_SUBDIRECTORIES(
\begin{verbatim}
INCLUDE(TribitsAddExecutable)
# Make sure the compiler can find include files
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
# Add executable called "cavity_stokes_test" that is built from the source files
# "cavity_stokes.cpp". (Note that the name of the executable has to be uniquely chosen.)
TRIBITS_ADD_EXECUTABLE(
......
......@@ -16,10 +16,6 @@ SET(${PACKAGE_NAME}_VERSION "3.1")
TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION()
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_SUBDIRECTORY(core)
......
......@@ -37,9 +37,6 @@
#ifndef BCInterfaceDefinitions_H
#define BCInterfaceDefinitions_H 1
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
// STL classes
#include <sstream>
......@@ -50,9 +47,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/algorithm/string.hpp>
// Tell the compiler to restore the warning previously silented
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
// LifeV classes
#include <lifev/core/LifeV.hpp>
......
......@@ -62,11 +62,8 @@ ENDFOREACH()
TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
SET(HEADERS "")
SET(SOURCES "")
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
SET(HEADERS ${HEADERS}
LifeV.hpp
LifeVersion.hpp
......@@ -83,8 +80,6 @@ INSTALL(
COMPONENT ${PACKAGE_NAME}
)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_SUBDIRECTORY(algorithm)
SET(HEADERS ${HEADERS} ${algorithm_HEADERS})
SET(SOURCES ${SOURCES} ${algorithm_SOURCES})
......
......@@ -100,15 +100,11 @@
#include <map>
#include <vector>
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <boost/shared_ptr.hpp>
#include <boost/numeric/ublas/vector.hpp>
#include <boost/function.hpp>
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
// deprecated attribute for LifeV functions
// the macro is needed to avoid problems with compilers other than gcc
......
......@@ -41,12 +41,8 @@
#define COMPOSEDPRECONDITIONER_HPP
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Epetra_Operator.h>
#include <Epetra_MultiVector.h>
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
#include <lifev/core/filter/GetPot.hpp>
......
......@@ -29,16 +29,12 @@
#ifdef HAVE_TRILINOS_ANASAZI
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <string>
#include <Teuchos_RefCountPtrDecl.hpp>
#include <Teuchos_RCPBoostSharedPtrConversions.hpp>
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
// ===================================================
//! Constructors & Destructors
......
......@@ -44,8 +44,6 @@
#ifndef EIGENSOLVER_HPP
#define EIGENSOLVER_HPP
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Epetra_MultiVector.h>
#include <Epetra_SerialDenseVector.h>
......@@ -64,8 +62,6 @@
#include <AnasaziLOBPCGSolMgr.hpp>
#include <AnasaziEpetraAdapter.hpp>
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
......
......@@ -40,9 +40,6 @@
#include <iomanip>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Epetra_ConfigDefs.h>
#ifdef EPETRA_MPI
......@@ -69,9 +66,6 @@
#include <Teuchos_ParameterList.hpp>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
......
......@@ -39,15 +39,9 @@
#ifndef NonLinearAitken_H
#define NonLinearAitken_H
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <boost/array.hpp>
// Tell the compiler to restore the warning previously silented
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
#include <lifev/core/util/LifeDebug.hpp>
......
......@@ -39,15 +39,9 @@
#define _EPETRAPRECONDITIONER_HPP_
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Teuchos_ParameterList.hpp>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
......
......@@ -39,9 +39,6 @@
#define _IFPACKPRECONDITIONER_HPP_
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Ifpack_ConfigDefs.h>
#include <Ifpack.h>
......@@ -50,9 +47,6 @@
#include <Ifpack_Amesos.h>
#include <Ifpack_ILU.h>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
......
......@@ -37,17 +37,11 @@
#ifndef PRECONDITIONERSOLVERBELOS_HPP
#define PRECONDITIONERSOLVERBELOS_HPP 1
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Teuchos_ParameterList.hpp>
#include "Teuchos_XMLParameterListHelpers.hpp"
#include <Epetra_Operator.h>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/array/MapEpetra.hpp>
#include <lifev/core/array/VectorEpetra.hpp>
......
......@@ -38,19 +38,8 @@
#ifndef _MLPRECONDITIONER_HPP_
#define _MLPRECONDITIONER_HPP_
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wextra"
#include <ml_MultiLevelPreconditioner.h>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#pragma GCC diagnostic warning "-Wextra"
#include <lifev/core/LifeV.hpp>
#include <lifev/core/filter/GetPot.hpp>
......
......@@ -38,18 +38,12 @@
#ifndef _SolverAmesos_H
#define _SolverAmesos_H
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Amesos.h>
#include <Amesos_BaseSolver.h>
#include <Amesos_ConfigDefs.h>
#include <Teuchos_ParameterList.hpp>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/array/VectorEpetra.hpp>
#include <lifev/core/array/MatrixEpetra.hpp>
......
......@@ -41,9 +41,6 @@
#include <iomanip>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Epetra_ConfigDefs.h>
#ifdef EPETRA_MPI
......@@ -56,9 +53,6 @@
#include <AztecOO.h>
#include <Teuchos_ParameterList.hpp>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
......
......@@ -38,15 +38,9 @@
This class manages the distribution of elements of matrices or vectors on a parallel machine
*/
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Epetra_Util.h>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
#include <lifev/core/LifeV.hpp>
#include <lifev/core/array/MapEpetra.hpp>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment