Commit 2f2b5d82 authored by Simon Scholz's avatar Simon Scholz

fix install

parent c0b4f9a7
......@@ -15,7 +15,7 @@ endif
AUTOMAKE_OPTIONS = foreign 1.9
# pass most important options when "make distcheck" is used
DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT) --with-dune-typetree=$(DUNE_TYPETREE_ROOT) --with-dune-pdelab=$(DUNE_PDELAB_ROOT) --with-dumux=$(DUMUX_ROOT) --with-dumux-devel=$(DUMUX_DEVEL_ROOT) CXX="$(CXX)" CC="$(CC)"
DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT) --with-dune-typetree=$(DUNE_TYPETREE_ROOT) --with-dune-pdelab=$(DUNE_PDELAB_ROOT) --with-dumux=$(DUMUX_ROOT) CXX="$(CXX)" CC="$(CC)"
include $(top_srcdir)/am/top-rules
include $(top_srcdir)/am/global-rules
......
......@@ -10,6 +10,6 @@ Name: @PACKAGE_NAME@
Version: @VERSION@
Description: Scholz2017a module
URL: http://dune-project.org/
Requires: dune-common dune-geometry dune-grid dune-localfunctions dune-istl dune-typetree dune-pdelab dumux dumux-devel
Requires: dune-common dune-geometry dune-grid dune-localfunctions dune-istl dune-typetree dune-pdelab dumux
Libs: -L${libdir}
Cflags: -I${includedir}
USE_CMAKE=yes
BUILDDIR=build-clang
CXX_WARNING_OPTS=" \
-Wall \
-Wunused \
-Wmissing-include-dirs \
-Wcast-align \
-Wno-sign-compare \
-Wno-unused-parameter \
CXX_OPTS=" \
-fno-strict-aliasing \
-fstrict-overflow \
-fno-finite-math-only \
-O3 \
-march=native \
-DNDEBUG=1"
# configure flags
CMAKE_FLAGS=" \
-DCMAKE_CXX_FLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
-DUG_DIR=ug_installation_path \
"
......@@ -6,8 +6,8 @@ AC_CONFIG_SRCDIR([src/Scholz2017a.cc])
AC_CONFIG_HEADERS([config.h])
# we need no more than the standard DE-stuff
# this module depends on dune-common dune-geometry dune-grid dune-localfunctions dune-istl dune-typetree dune-pdelab dumux dumux-devel
# this implies checking for [dune-common], [dune-geometry], [dune-grid], [dune-localfunctions], [dune-istl], [dune-typetree], [dune-pdelab], [dumux], [dumux-devel]
# this module depends on dune-common dune-geometry dune-grid dune-localfunctions dune-istl dune-typetree dune-pdelab dumux
# this implies checking for [dune-common], [dune-geometry], [dune-grid], [dune-localfunctions], [dune-istl], [dune-typetree], [dune-pdelab], [dumux]
DUNE_CHECK_ALL
# implicitly set the Dune-flags everywhere
......
......@@ -7,4 +7,4 @@ Module: Scholz2017a
Version: 1.0
Maintainer: simon.scholz@iws.uni-stuttgart.de
#depending on
Depends: dune-common dune-geometry dune-grid dune-localfunctions dune-istl dune-typetree dune-pdelab dumux dumux-devel
Depends: dune-common dune-geometry dune-grid dune-localfunctions dune-istl dune-typetree dune-pdelab dumux
\ No newline at end of file
USE_CMAKE=yes
BUILDDIR=build-gcc
GXX_WARNING_OPTS="\
-Wall \
-Wunused \
-Wmissing-include-dirs \
-Wno-cast-align \
-Wno-sign-compare \
-Wno-unused-parameter"
GXX_OPTS=" \
-fno-strict-aliasing \
-fstrict-overflow \
-fno-finite-math-only \
-O3 \
-march=native \
-DNDEBUG=1"
# configure flags
CMAKE_FLAGS=" \
-DCMAKE_CXX_FLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
-DUG_DIR=ug_installation_path \
"
#!/bin/sh
### Create a folder for the dune and dumux modules
### Go into the folder and execute this script
if [ -d dune-common ]; then
echo "error: A directory named dune-common already exists."
echo "Aborting."
exit 1
fi
### Clone the necessary modules
git clone https://gitlab.dune-project.org/core/dune-common.git
git clone https://gitlab.dune-project.org/core/dune-geometry.git
git clone https://gitlab.dune-project.org/core/dune-grid.git
git clone https://gitlab.dune-project.org/core/dune-istl.git
git clone https://gitlab.dune-project.org/core/dune-localfunctions.git
git clone https://gitlab.dune-project.org/pdelab/dune-pdelab.git
git clone https://gitlab.dune-project.org/pdelab/dune-typetree.git
git clone https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git dumux
git clone https://git.iws.uni-stuttgart.de/dumux-pub/Scholz2017a.git
### Go to specific branches
cd dune-common && git checkout releases/2.4 && cd ..
cd dune-geometry && git checkout releases/2.4 && cd ..
cd dune-grid && git checkout releases/2.4 && cd ..
cd dune-istl && git checkout releases/2.4 && cd ..
cd dune-localfunctions && git checkout releases/2.4 && cd ..
cd dune-pdelab && git checkout releases/2.0 && cd ..
cd dune-typetree && git checkout releases/2.3 && cd ..
cd dumux && git checkout releases/2.11 && cd ..
### Go to specific commits
cd dune-common && git checkout e1a9b914d0a3b133641647a6987c61c9e2a5423a && cd ..
cd dune-geometry && git checkout ac1fca4ff249ccdc7fb035fa069853d84b93fb73 && cd ..
cd dune-grid && git checkout 5aeced8b0a64d46ff12afd3a252f99c19a8575d8 && cd ..
cd dune-istl && git checkout ac276f16a04d9ec11bf4ef1a7c76f45f967fdaff && cd ..
cd dune-localfunctions && git checkout b3a11b4a446ddafc31d51bd6695b8a8a6a1ba30a && cd ..
cd dune-pdelab && git checkout 19c782eea7232e94849617b20dfee8d9781eb4fb && cd ..
cd dune-typetree && git checkout ecffa10c59fa61a0071e7c788899464b0268719f && cd ..
cd dumux && git checkout eab5f0836a9fcf0f60e85fc1fcac877da4125381 && cd ..
### Run dunecontrol
./dune-common/bin/dunecontrol --opts=Scholz2017a/gcc-optim.opts all
./dune-common/bin/dunecontrol --opts=Scholz2017a/clang-optim.opts all
Markdown is supported
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