Commit b44dc25c authored by Dion Häfner's avatar Dion Häfner

Merge branch 'update/install-instructions' into 'master'

updated installation instructions #2, CMake now handles compiler flags #1

Readme now contains installation instructions:
* Docker instructions
* Required software
* Ubuntu step-by-step manual installation (based on Dockerfile instructions)

CMake now handles compiler flags:
* build type is `Release` by default
* for a `Debug` build, warnings are enabled
* information on how to create different types of builds are added to the Readme

See merge request !1
parents ff8f324c bfa87cb7
# Exclude build folder
build-cmake/
# Exclude the parsed mini file
testing/convergence.mini
# Ignore temporary and auto-generated files #
*~
*.pyc
......
......@@ -2,7 +2,6 @@ image: dorie/dune-env:2.4
variables:
DUNE_CONTROL_PATH: /opt/dune:$CI_PROJECT_DIR
COMPILER_FLAGS: -O3
before_script:
- cd /opt/dune
......@@ -12,7 +11,6 @@ stages:
main_job:
script:
- export CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='$COMPILER_FLAGS'"
- ./dune-common/bin/dunecontrol --only=dorie all
- ./dune-common/bin/dunecontrol --only=dorie make install
- ARGS="--output-on-failure" ./dune-common/bin/dunecontrol --only=dorie make test
......@@ -20,9 +18,9 @@ main_job:
update_dune_job:
script:
- export CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='$COMPILER_FLAGS'"
- ./dune-common/bin/dunecontrol update || true
- ./dune-common/bin/dunecontrol --module=dorie all
- ./dune-common/bin/dunecontrol --only=dorie make install
- ./dune-common/bin/dunecontrol exec "rm -rf build-cmake"
- ./dune-common/bin/dunecontrol all
- ./dune-common/bin/dunecontrol make install
- ARGS="--output-on-failure" ./dune-common/bin/dunecontrol --only=dorie make test
stage: main
cmake_minimum_required(VERSION 2.8.12)
project(dorie CXX)
# set build type
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER)
if(CMAKE_BUILD_TYPE_UPPER MATCHES DEBUG)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
#
if(NOT (dune-common_DIR OR dune-common_ROOT OR
"${CMAKE_PREFIX_PATH}" MATCHES ".*dune-common.*"))
string(REPLACE ${CMAKE_PROJECT_NAME} dune-common dune-common_DIR
${PROJECT_BINARY_DIR})
endif()
#find dune-common and set the module path
# find dune-common and set the module path
find_package(dune-common REQUIRED)
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules"
${dune-common_MODULE_PATH})
#include the dune macros
# include the dune macros
include(DuneMacros)
# set some variables
set(CMAKE_DISABLE_FIND_PACKAGE_Python2Interp 1)
# start a dune project with information from dune.module
dune_project()
dune_enable_all_packages()
......@@ -37,3 +46,5 @@ add_subdirectory("cmake/modules")
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
This diff is collapsed.
......@@ -6,6 +6,7 @@ endfunction()
set(python_paths "")
install_python_package("doc" python_paths)
install_python_package("utilities" python_paths)
install_python_package("parscraper" python_paths)
if(dune-testtools_FOUND)
......
alabaster==0.7.7
Babel==2.2.0
breathe==4.1.0
docutils==0.12
Jinja2==2.8
MarkupSafe==0.23
Pygments==2.1
pytz==2015.7
six==1.10.0
snowballstemmer==1.2.1
Sphinx==1.3.5
sphinx-rtd-theme==0.1.9
wheel==0.24.0
alabaster
Babel
breathe
docutils
Jinja2
MarkupSafe
Pygments
pytz
six
snowballstemmer
Sphinx
sphinx-rtd-theme
wheel
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import sys
from setuptools import setup
# do nothing, just install requirements
setup(name='dorie.doc')
cycler==0.9.0
matplotlib==1.5.1
numpy==1.10.4
pyparsing==2.0.7
python-dateutil==2.4.2
pytz==2015.7
scipy==0.17.0
six==1.10.0
wheel==0.24.0
cycler
matplotlib
numpy
pyparsing
python-dateutil
pytz
scipy
six
wheel
......@@ -13,7 +13,6 @@ setup(name='dorie.parscraper',
author='Dion Häfner <mail@dionhaefner.de>',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
install_requires=['dorie.utilities'],
packages=['dorie.parscraper'],
scripts=dorie_parscraper_scripts()
)
cycler==0.9.0
matplotlib==1.5.1
numpy==1.10.4
pyparsing==2.0.6
python-dateutil==2.4.2
pytz==2015.7
scipy==0.17.0
six==1.10.0
wheel==0.24.0
cycler
matplotlib
numpy
pyparsing
python-dateutil
pytz
scipy
six
wheel
......@@ -15,5 +15,5 @@ setup(name='dorie.testtools',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
packages=['dorie.testtools','dorie.testtools.evaluation', 'dorie.testtools.utilities','dorie.testtools.wrapper'],
install_requires=['numpy','scipy','matplotlib','dune.testtools','dorie.utilities'],
install_requires=['dune.testtools'],
scripts=dorie_testtools_scripts())
cycler==0.9.0
matplotlib==1.5.1
numpy==1.10.4
pyparsing==2.0.7
python-dateutil==2.4.2
pytz==2015.7
scipy==0.17.0
six==1.10.0
wheel==0.24.0
cycler
matplotlib
numpy
pyparsing
python-dateutil
pytz
scipy
six
wheel
......@@ -15,6 +15,5 @@ setup(name='dorie.utilities',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
packages=['dorie.utilities'],
install_requires=['numpy','scipy','matplotlib'],
scripts=dorie_utilities_scripts()
)
include /home/dion/codes/dune/dorie/build-cmake/doc/parameters/default.ini
__inifile_optionkey = run
_asset_path = "/home/dion/codes/dune/dorie/testing"
_evaluation = convergence, correlation
output.fileName = convergence | unique
output.outputPath = convergence | unique
output.asciiVtk = true
time.end = 1E5
grid.initialLevel = 0, 1, 2 | expand
grid.gridType = gmsh, rectangular | expand
grid.cells = 20 20
grid.gridFile = "{_asset_path}/meshes/mesh.msh"
boundary.file = "{_asset_path}/bcs/bcFile2d.dat"
parameters.soilDistribution = twoMedia
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