diff --git a/CMakeLists.txt b/CMakeLists.txt index a6705c673cfca97564c2ab2ddd891ca48526dcc8..ae4d016276dcdd6b72ab9ddd856c9f8b9b2401b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1) -project(amdis CXX) +project(amdis CXX VERSION 0.2) #find dune-common and set the module path find_package(dune-common REQUIRED) diff --git a/LICENSE b/LICENSE index 0abd3507f63bfb8dc5be8d32d2b222b4dd626625..e32b9fc379b26e8c7b478091c9d1eb7a6b43b598 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ The MIT License (MIT) -Copyright (c) 2016-2018 Simon Praetorius - 2018 Felix Müller +Copyright (c) 2016-2019 Simon Praetorius + 2019 Felix Müller Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/amdis.pc.in b/amdis.pc.in index c41ceecce7b6d78dbf18a6e44596979726328989..69e6642e19dc316c611b19b7867ee072276f625f 100644 --- a/amdis.pc.in +++ b/amdis.pc.in @@ -9,8 +9,8 @@ DEPENDENCIES=@REQUIRES@ Name: @PACKAGE_NAME@ Version: @VERSION@ Description: AMDiS dune-module -URL: https://gitlab.math.tu-dresden.de/spraetor/dune-amdis +URL: https://gitlab.mn.tu-dresden.de/amdis/amdis-core Requires: dune-common dune-geometry dune-localfunctions dune-typetree dune-grid dune-functions -Suggests: dune-uggrid dune-alugrid dune-foamgrid +Suggests: dune-uggrid dune-alugrid dune-foamgrid dune-spgrid dune-ist Libs: -L${libdir} Cflags: -I${includedir} diff --git a/bin/amdisproject b/bin/amdisproject index 6c0e11bed29952416ab8c4d0ca3b9202206ba6d5..6985c88c59cfb75aca4435fcd466ba8bc07a0f7e 100644 --- a/bin/amdisproject +++ b/bin/amdisproject @@ -523,10 +523,6 @@ M_DELIM ################## PROJECT.CC ################## echo "- $PROJECT/src/$MODULE.cpp" cat> "$PROJECT/src/$MODULE.cpp" << CC_DELIM -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <amdis/AMDiS.hpp> using namespace AMDiS; @@ -684,7 +680,7 @@ mesh->global refinements: 0 $NAME->mesh: mesh $NAME->solver->name: default -$NAME->solver->tolerance: 1.e-8 +$NAME->solver->relative tolerance: 1.e-6 $NAME->solver->info: 1 $NAME->output[0]->filename: $NAME_ @@ -801,4 +797,5 @@ echo echo "done." echo "------------------------------------------" echo "For further details read the Dune build system documentation at" -echo "https://www.dune-project.org/buildsystem/" +echo "https://www.dune-project.org/buildsystem/ or in the file" +echo "dune-common/doc/buildsystem/dune-common.rst" diff --git a/dune.module b/dune.module index bd22ba1dd5e77e68e84713eeb8d7624f062f645a..fecc62715f734a0be199526ab67863e9a35061e4 100644 --- a/dune.module +++ b/dune.module @@ -3,7 +3,7 @@ ################################ Module: amdis -Version: 0.1 +Version: 0.2 Maintainer: simon.praetorius@tu-dresden.de Depends: dune-common (>= 2.6) dune-geometry (>= 2.6) dune-localfunctions (>= 2.6) dune-typetree (>= 2.6) dune-grid (>= 2.6) dune-functions (>= 2.6) -Suggests: dune-uggrid dune-alugrid dune-foamgrid dune-spgrid +Suggests: dune-uggrid dune-alugrid dune-foamgrid dune-spgrid dune-istl