Commit d7f6f7ae authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

removed unnecessary compiler options from several CMakeLists.txt

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@4535 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent b61e2279
......@@ -11,14 +11,14 @@ DumuxSetup("METIS" "METIS" "METIS")
set(MyIncludeSuffixes "METISLib")
#set(MyLibSuffixes "build/Linux-x86_64/" "build/Linux-i686/" "GKlib/builds/Linux-x86_64/" "GKlib/builds/Linux-i686/")
#DumuxAddPathSuffixes("${MyIncludeSuffixes}" "${MyLibSuffixes}")
DumuxAddPathSuffixes("${MyIncludeSuffixes}" "")
DumuxAddPathSuffixes("${MyIncludeSuffixes}" "${MyLibSuffixes}")
#DumuxAddPathSuffixes("${MyIncludeSuffixes}" "")
DumuxFindIncludeDir("metis.h")
DumuxFindLibrary("metis")
DumuxFindIncludeDir("parmetis.h")
DumuxFindLibrary("parmetis")
#DumuxFindLibrary("GKlib")
#DumuxRequiredLibsFound("metis" "GKlib")
DumuxRequiredLibsFound("metis")
DumuxRequiredLibsFound("parmetis")
DumuxIncludeDirsFound()
DumuxCheckFound()
......@@ -37,9 +37,9 @@ FIND_PACKAGE(Boost REQUIRED)
##############
# Find the optional packages
FIND_PACKAGE(MPI)
FIND_PACKAGE(UG)
#FIND_PACKAGE(UG)
FIND_PACKAGE(ALUGrid)
#FIND_PACKAGE(METIS REQUIRED)
FIND_PACKAGE(METIS)
#FIND_PACKAGE(Alberta)
##############
......@@ -86,7 +86,7 @@ add_definitions("-std=c++0x -Wall -Wno-sign-compare --no-strict-aliasing")
if(CMAKE_BUILD_TYPE STREQUAL "debug")
# debug mode
add_definitions("-g")
add_definitions(-DDEBUG -DDUNE_DEVEL_MODE=1 -DDUNE_ISTL_WITH_CHECKING)
# add_definitions(-DDEBUG -DDUNE_DEVEL_MODE=1 -DDUNE_ISTL_WITH_CHECKING)
else(CMAKE_BUILD_TYPE STREQUAL "debug")
# Release mode
add_definitions("-O3 -march=native")
......@@ -122,40 +122,40 @@ SetConfigHVar(PROJECT_MAINTAINER_EMAIL ProjectMaintainerEmail)
# adapt build system to detected packages
# deal with UG
if (UG_FOUND)
set(DumuxLinkLibraries ${DumuxLinkLibraries}
${UG_LIBRARIES})
set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
${UG_INCLUDE_DIRS})
endif(UG_FOUND)
SetConfigHVar(HAVE_UG UG_FOUND)
#if (UG_FOUND)
# set(DumuxLinkLibraries ${DumuxLinkLibraries}
# ${UG_LIBRARIES})
# set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
# ${UG_INCLUDE_DIRS})
#endif(UG_FOUND)
#SetConfigHVar(HAVE_UG UG_FOUND)
# deal with ALUGrid
if (ALUGrid_FOUND)
set(DumuxLinkLibraries ${DumuxLinkLibraries}
${ALUGrid_LIBRARIES})
set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
${ALUGrid_INCLUDE_DIRS})
endif(ALUGrid_FOUND)
SetConfigHVar(HAVE_ALUGRID ALUGrid_FOUND)
#if (ALUGrid_FOUND)
# set(DumuxLinkLibraries ${DumuxLinkLibraries}
# ${ALUGrid_LIBRARIES})
# set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
# ${ALUGrid_INCLUDE_DIRS})
#endif(ALUGrid_FOUND)
#SetConfigHVar(HAVE_ALUGRID ALUGrid_FOUND)
# deal with METIS
if (METIS_FOUND)
set(DumuxLinkLibraries ${DumuxLinkLibraries}
${METIS_LIBRARIES})
set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
${METIS_INCLUDE_DIRS})
endif(METIS_FOUND)
SetConfigHVar(HAVE_METIS METIS_FOUND)
#if (METIS_FOUND)
# set(DumuxLinkLibraries ${DumuxLinkLibraries}
# ${METIS_LIBRARIES})
# set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
# ${METIS_INCLUDE_DIRS})
#endif(METIS_FOUND)
#SetConfigHVar(HAVE_METIS METIS_FOUND)
# deal with Alberta
if (Alberta_FOUND)
set(DumuxLinkLibraries ${DumuxLinkLibraries}
${Alberta_LIBRARIES})
set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
${Alberta_INCLUDE_DIRS})
endif(Alberta_FOUND)
SetConfigHVar(HAVE_ALBERTA Alberta_FOUND)
#if (Alberta_FOUND)
# set(DumuxLinkLibraries ${DumuxLinkLibraries}
# ${Alberta_LIBRARIES})
# set(DumuxIncludeDirectories ${DumuxIncludeDirectories}
# ${Alberta_INCLUDE_DIRS})
#endif(Alberta_FOUND)
#SetConfigHVar(HAVE_ALBERTA Alberta_FOUND)
##############
if (MPI_FOUND)
......@@ -163,7 +163,7 @@ if (MPI_FOUND)
separate_arguments(TMP)
add_definitions(${TMP})
add_definitions(-DENABLE_MPI=1)
add_definitions(-DModelP) # tell UG that the model is parallelized
# add_definitions(-DModelP) # tell UG that the model is parallelized
set(DumuxLinkLibraries ${DumuxLinkLibraries} ${MPI_LIBRARIES})
set(DumuxIncludeDirectories ${DumuxIncludeDirectories} ${MPI_INCLUDE_PATH})
......@@ -172,7 +172,7 @@ endif (MPI_FOUND)
# actually write the config.h file to disk
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
add_definitions(-DHAVE_CONFIG_H -DDUNE_ENABLE_OLD_NUMBERING)
#add_definitions(-DHAVE_CONFIG_H)
##############
# tell cmake that we've got a few subdirectories. (that's the
......
......@@ -212,7 +212,6 @@ class NewtonController
enum { enableTimeStepRampUp = GET_PROP_VALUE(TypeTag, PTAG(EnableTimeStepRampUp)) };
enum { enablePartialReassemble = GET_PROP_VALUE(TypeTag, PTAG(EnablePartialReassemble)) };
enum { Red = JacobianAssembler::Red };
// class to keep track of the most offending vertices in a way
// compatible with std::priority_queue
......
......@@ -60,7 +60,9 @@ class NewtonMethod
typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianAssembler)) JacobianAssembler;
public:
NewtonMethod(Problem &problem)
: problem_(problem)
: uOld_(problem.model().curSol()),
residual_(problem.model().curSol()),
problem_(problem)
{ }
/*!
......
......@@ -17,10 +17,14 @@
#ifndef DUMUX_1PTEST_PROBLEM_HH
#define DUMUX_1PTEST_PROBLEM_HH
#ifdef HAVE_UG
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#endif
#ifdef HAVE_ALUGRID
#include <dune/grid/io/file/dgfparser/dgfalu.hh>
#endif
#include <dune/grid/io/file/dgfparser/dgfs.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dune/grid/io/file/dgfparser/dgfalu.hh>
#include <dune/grid/io/file/gmshreader.hh>
#include <dumux/boxmodels/1p/1pmodel.hh>
......
add_definitions(-DYASPGRID -DENABLE_ALBERTA -DENABLE_ALUGRID -DENABLE_UG)
# build target for the onephase-onecomponent test problem
ADD_EXECUTABLE("test_1p" test_1p.cc)
TARGET_LINK_LIBRARIES("test_1p" ${DumuxLinkLibraries})
......
add_definitions(-DYASPGRID -DENABLE_ALBERTA -DENABLE_ALUGRID -DENABLE_UG)
ADD_EXECUTABLE("test_1p2c" test_1p2c.cc)
TARGET_LINK_LIBRARIES("test_1p2c" ${DumuxLinkLibraries})
......
......@@ -24,7 +24,9 @@
#ifndef DUMUX_TISSUE_TUMOR_PROBLEM_HH
#define DUMUX_TISSUE_TUMOR_PROBLEM_HH
#ifdef HAVE_UG
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#endif
#include <dune/grid/io/file/dgfparser/dgfs.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
......
add_definitions(-DYASPGRID -DENABLE_ALBERTA -DENABLE_ALUGRID -DENABLE_UG)
# build target for the twophase-twocomponent test problem
ADD_EXECUTABLE("test_2p2c" test_2p2c.cc)
TARGET_LINK_LIBRARIES("test_2p2c" ${DumuxLinkLibraries})
......
add_definitions(-DENABLE_UG)
# build target for the 2p2cni test problem
ADD_EXECUTABLE("test_2p2cni" test_2p2cni.cc)
TARGET_LINK_LIBRARIES("test_2p2cni" ${DumuxLinkLibraries})
......
add_definitions(-DYASPGRID -DENABLE_ALBERTA -DENABLE_ALUGRID -DENABLE_UG)
ADD_EXECUTABLE("test_2pni" test_2pni.cc)
TARGET_LINK_LIBRARIES("test_2pni" ${DumuxLinkLibraries})
......
add_definitions(-DYASPGRID -DENABLE_ALBERTA -DENABLE_ALUGRID -DENABLE_UG)
if (MPI_FOUND)
# tell UG that the model is parallelized
add_definitions(-DModelP)
......
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