Release/v1.2

6edf9933 · Praetorius, Simon · 44e00260 · 6edf9933 · 6edf9933 · 6edf9933
Commit 6edf9933 authored Feb 15, 2019 by Praetorius, Simon
17 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,6 @@ build:9-debug-gcc:
    - install/
    name: "$CI_BUILD_NAME"
    expire_in: 6 hrs
-  only:
-  - master

 build:9-release-gcc:
  stage: build
@@ -29,8 +27,6 @@ build:9-release-gcc:
    - install/
    name: "$CI_BUILD_NAME"
    expire_in: 6 hrs
-  only:
-  - master

 build:9-parallel-debug-gcc:
  stage: build
@@ -41,8 +37,6 @@ build:9-parallel-debug-gcc:
    - install/
    name: "$CI_BUILD_NAME"
    expire_in: 6 hrs
-  only:
-  - master

 build:9-parallel-release-gcc:
  stage: build
@@ -53,8 +47,6 @@ build:9-parallel-release-gcc:
    - install/
    name: "$CI_BUILD_NAME"
    expire_in: 6 hrs
-  only:
-  - master


 # compile the demos
@@ -64,8 +56,6 @@ demo:9-debug-gcc:
  - tools/build_amdis.sh --stage demo --config Debug
  dependencies:
  - build:9-debug-gcc
-  only:
-  - master

 demo:9-release-gcc:
  stage: demo
@@ -73,8 +63,6 @@ demo:9-release-gcc:
  - tools/build_amdis.sh --stage demo --config Release
  dependencies:
  - build:9-release-gcc
-  only:
-  - master

 demo:9-parallel-debug-gcc:
  stage: demo
@@ -82,8 +70,6 @@ demo:9-parallel-debug-gcc:
  - tools/build_amdis.sh --stage demo --config Debug --parallel
  dependencies:
  - build:9-parallel-debug-gcc
-  only:
-  - master

 demo:9-parallel-release-gcc:
  stage: demo
@@ -91,8 +77,6 @@ demo:9-parallel-release-gcc:
  - tools/build_amdis.sh --stage demo --config Release --parallel
  dependencies:
  - build:9-parallel-release-gcc
-  only:
-  - master


 # compiel and run the tests
@@ -102,8 +86,6 @@ test:9-debug-gcc:
  - tools/build_amdis.sh --stage test --config Debug
  dependencies:
  - build:9-debug-gcc
-  only:
-  - master

 test:9-release-gcc:
  stage: test
@@ -111,8 +93,6 @@ test:9-release-gcc:
  - tools/build_amdis.sh --stage test --config Release
  dependencies:
  - build:9-release-gcc
-  only:
-  - master

 test:9-parallel-debug-gcc:
  stage: test
@@ -120,8 +100,6 @@ test:9-parallel-debug-gcc:
  - tools/build_amdis.sh --stage test --config Debug --parallel
  dependencies:
  - build:9-parallel-debug-gcc
-  only:
-  - master

 test:9-parallel-release-gcc:
  stage: test
@@ -129,5 +107,3 @@ test:9-parallel-release-gcc:
  - tools/build_amdis.sh --stage test --config Release --parallel
  dependencies:
  - build:9-parallel-release-gcc
-  only:
-  - master
--- a/AMDiS/CMakeLists.txt
+++ b/AMDiS/CMakeLists.txt
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 project(AMDiS)

-set(AMDiS_VERSION "1.1.0")
+set(AMDiS_VERSION "1.2.0")

 set(BASE_DIR ${AMDiS_SOURCE_DIR})
 set(SOURCE_DIR ${BASE_DIR}/src)

--- a/AMDiS/src/DOFSerializer.cc
+++ b/AMDiS/src/DOFSerializer.cc
@@ -7,34 +7,38 @@
 #include "Traverse.h"

 namespace AMDiS
-{    
-    
-// satre values of DOFVector on all macro elements to internal container
+{
+
+// store values of DOFVector on all macro elements to internal container
 void DOFSerializer::gather(DOFVector<double> const* vec, std::vector<double>& values)
 {
  std::fill(visited_.begin(), visited_.end(), false);
  values.clear();
-    
+  values.reserve(numValues_);
+
  for (auto* macroEl : mesh_->getMacroElements())
    gather(macroEl->getIndex(), vec, values, false);
+
+  numValues_ = values.size();
 }


-// satre values of DOFVector on macro element `macroIndex` to internal container
+// store values of DOFVector on macro element `macroIndex` to internal container
 void DOFSerializer::gather(int macroIndex, DOFVector<double> const* vec, std::vector<double>& values, bool reset)
 {
+  FUNCNAME("DOFSerializer::gather()");
+  TEST_EXIT(mesh_ == vec->getFeSpace()->getMesh())("Incompatible meshes!\n");
+
  if (reset) {
    std::fill(visited_.begin(), visited_.end(), false);
    values.clear();
  }
-  
-  TEST_EXIT(mesh_ == vec->getFeSpace()->getMesh())("Incompatible meshes!\n");
-  
+
  TraverseStack stack;
  ElInfo *elInfo = stack.traverseFirstOneMacro(mesh_, macroIndex, -1, Mesh::CALL_EVERY_EL_PREORDER);
  while (elInfo) {
    Element *el = elInfo->getElement();
-    
+
    if (el->isLeaf()) {
      gather(VERTEX, elInfo, vec, values);
      if (mesh_->getDim() > 1)
@@ -43,14 +47,15 @@ void DOFSerializer::gather(int macroIndex, DOFVector<double> const* vec, std::ve
        gather(FACE, elInfo, vec, values);
      gather(CENTER, elInfo, vec, values);
    }
-    
+
    elInfo = stack.traverseNext(elInfo);
  }
 }


-void DOFSerializer::gather(GeoIndex geo, ElInfo* elInfo, DOFVector<double> const* vec, std::vector<double>& values) 
+void DOFSerializer::gather(GeoIndex geo, ElInfo* elInfo, DOFVector<double> const* vec, std::vector<double>& values)
 {
+  FUNCNAME_DBG("DOFSerializer::gather()");
  int nd;
  if ((nd = admin_->getNumberOfDofs(geo)))  {
    int entities = mesh_->getGeo(geo);
@@ -59,7 +64,7 @@ void DOFSerializer::gather(GeoIndex geo, ElInfo* elInfo, DOFVector<double> const
    for (int n = 0; n < entities; n++) {
      for(int d = 0; d < nd; d++) {
        DegreeOfFreedom globalDof = elInfo->getElement()->getDof(n0 + n, nd0 + d);
-        TEST_EXIT(globalDof < visited_.size())("visited container not large enough!\n");
+        TEST_EXIT_DBG(globalDof < visited_.size())("visited container not large enough!\n");
        if (!visited_[globalDof]) {
          visited_[globalDof] = true;
          values.push_back((*vec)[globalDof]);
@@ -75,7 +80,7 @@ void DOFSerializer::scatter(std::vector<double> const& values, DOFVector<double>
 {
  std::fill(visited_.begin(), visited_.end(), false);
  counter_ = 0u;
-    
+
  for (auto* macroEl : mesh_->getMacroElements())
    scatter(macroEl->getIndex(), values, vec, false);
 }
@@ -83,19 +88,20 @@ void DOFSerializer::scatter(std::vector<double> const& values, DOFVector<double>

 // assign stored values to DOFVector, on macroElement with index `macroIndex`
 void DOFSerializer::scatter(int macroIndex, std::vector<double> const& values, DOFVector<double>* vec, bool reset) const
-{    
+{
+  FUNCNAME("DOFSerializer::scatter()");
+  TEST_EXIT(mesh_ == vec->getFeSpace()->getMesh())("Incompatible meshes!\n");
+
  if (reset) {
    std::fill(visited_.begin(), visited_.end(), false);
    counter_ = 0u;
  }
-  
-  TEST_EXIT(mesh_ == vec->getFeSpace()->getMesh())("Incompatible meshes!\n");
-  
+
  TraverseStack stack;
  ElInfo *elInfo = stack.traverseFirstOneMacro(mesh_, macroIndex, -1, Mesh::CALL_EVERY_EL_PREORDER);
  while (elInfo) {
    Element *el = elInfo->getElement();
-    
+
    if (el->isLeaf()) {
      scatter(VERTEX, elInfo, values, vec);
      if (mesh_->getDim() > 1)
@@ -104,7 +110,7 @@ void DOFSerializer::scatter(int macroIndex, std::vector<double> const& values, D
        scatter(FACE, elInfo, values, vec);
      scatter(CENTER, elInfo, values, vec);
    }
-    
+
    elInfo = stack.traverseNext(elInfo);
  }
 }
@@ -112,6 +118,7 @@ void DOFSerializer::scatter(int macroIndex, std::vector<double> const& values, D

 void DOFSerializer::scatter(GeoIndex geo, ElInfo* elInfo, std::vector<double> const& values, DOFVector<double>* vec) const
 {
+  FUNCNAME("DOFSerializer::scatter()");
  int nd;
  if ((nd = admin_->getNumberOfDofs(geo)))  {
    int entities = mesh_->getGeo(geo);
@@ -120,7 +127,7 @@ void DOFSerializer::scatter(GeoIndex geo, ElInfo* elInfo, std::vector<double> co
    for (int n = 0; n < entities; n++) {
      for(int d = 0; d < nd; d++) {
        DegreeOfFreedom globalDof = elInfo->getElement()->getDof(n0 + n, nd0 + d);
-        TEST_EXIT(globalDof < visited_.size())("visited container not large enough!\n");
+        TEST_EXIT_DBG(globalDof < visited_.size())("visited container not large enough!\n");
        if (!visited_[globalDof]) {
          visited_[globalDof] = true;
          TEST_EXIT(counter_ < values.size())("Not enough values in value-container!\n");

--- a/AMDiS/src/DOFSerializer.h
+++ b/AMDiS/src/DOFSerializer.h
@@ -41,47 +41,51 @@ namespace AMDiS
  class DOFSerializer
  {
  public:
-    
+
    /// Constructor, stores a pointer to the DOFAdmin. If the number of values to store can be estimated,
    /// pass a second argument `numValues`
-    DOFSerializer(DOFAdmin* admin, std::size_t numValues = 0)
+    DOFSerializer(DOFAdmin* admin, std::size_t numValues = 0u)
      : admin_(admin)
      , mesh_(admin->getMesh())
      , visited_(admin->getUsedSize(), false)
+      , numValues_(numValues)
    {}
-    
-    
-    // satre values of DOFVector on all macro elements to internal container
+
+
+    // store values of DOFVector on all macro elements to internal container
    void gather(DOFVector<double> const* vec, std::vector<double>& values);
-    
-    // satre values of DOFVector on macro element `macroIndex` to internal container
+
+    // store values of DOFVector on macro element `macroIndex` to internal container
    void gather(int macroIndex, DOFVector<double> const* vec, std::vector<double>& values, bool reset = true);
-    
-    
+
+
    // assign stored values to DOFVector, for all macro elements
    void scatter(std::vector<double> const& values, DOFVector<double>* vec) const;
-    
+
    // assign stored values to DOFVector, on macroElement with index `macroIndex`
    void scatter(int macroIndex, std::vector<double> const& values, DOFVector<double>* vec, bool reset = true) const;

-      
+
  protected:
-    
+
    // collect values of one geometry-type
    void gather(GeoIndex geo, ElInfo* elInfo, DOFVector<double> const* vec, std::vector<double>& values);
-    
+
    // assign values of one geometry type
    void scatter(GeoIndex geo, ElInfo* elInfo, std::vector<double> const& values, DOFVector<double>* vec) const;
-    
-    
+
+
  protected:
-    
+
    DOFAdmin* admin_;
    Mesh* mesh_;
-    
+
    // stored which DOFs were already visited during traversal
    mutable std::vector<bool> visited_;
-    
+
+    // estimated number of values
+    std::size_t numValues_ = 0u;
+
    // a counter used during assignment of values. To guarantee the same order as during gather
    mutable std::size_t counter_ = 0u;
  };

--- a/AMDiS/src/Initfile.h
+++ b/AMDiS/src/Initfile.h
@@ -37,7 +37,6 @@

 #include <boost/lexical_cast.hpp>
 #include <boost/numeric/conversion/cast.hpp>
-#include <boost/thread/shared_mutex.hpp> // requires c++14

 #include <boost/type_traits.hpp>

@@ -423,8 +422,6 @@ namespace AMDiS {
    template<typename T>
    static void get(const std::string tag, T& value, int debugInfo = -1)
    {
-//       boost::shared_lock<boost::shared_mutex> lock(singlett().mutex_);
-      
      if (debugInfo == -1)
        debugInfo = singlett().getMsgInfo();
      else {
@@ -498,8 +495,6 @@ namespace AMDiS {
    /// return InitEntry object for tag tag
    static InitEntry get(const std::string tag)
    {
-//       boost::shared_lock<boost::shared_mutex> lock(singlett().mutex_);
-      
      InitEntry result;

      std::string valStr;
@@ -527,8 +522,6 @@ else if(error_code == TAG_NOT_FOUND_BREAK)
    template<typename T>
    static void set(const std::string tag, T const& value, int debugInfo=  -1)
    {
-//       boost::unique_lock<boost::shared_mutex> lock(singlett().mutex_);
-      
      if (debugInfo == -1)
        debugInfo = singlett().getMsgInfo();

@@ -578,14 +571,14 @@ else if(error_code == TAG_NOT_FOUND_BREAK)
    {
      singlett().clear();
    }
-    
+

    /// save singlett-data to file with filename fn
    static void save(std::string fn)
    {
      singlett().write(fn);
    }
-    
+

    // list of included filenames
    static std::set< std::string >& getIncludeList()
@@ -593,7 +586,7 @@ else if(error_code == TAG_NOT_FOUND_BREAK)
      static std::set< std::string > include_list;
      return include_list;
    }
-    
+
 protected:
    Initfile()
    : msgInfo(0),
@@ -656,8 +649,6 @@ protected:
    void getInternalParameters();

    int msgInfo, msgWait, paramInfo, breakOnMissingTag;
-    
-//     mutable boost::shared_mutex mutex_;
  };

  typedef Initfile Parameters;

--- a/AMDiS/src/MeshStructure.cc
+++ b/AMDiS/src/MeshStructure.cc
@@ -280,25 +280,25 @@ namespace AMDiS {
    bool cont = true;
    while (cont) {
      bool cont1;
-// #ifndef NDEBUG
+#ifndef NDEBUG
      bool cont2;
-// #endif
+#endif
      if (structure1->isLeafElement() == structure2->isLeafElement()) {
 	cont1 = structure1->nextElement(result);
-// #ifndef NDEBUG
+#ifndef NDEBUG
 	cont2 = structure2->nextElement();
-// #endif
+#endif
      } else {
 	if (structure1->isLeafElement()) {
 	  cont1 = structure1->nextElement();
-// #ifndef NDEBUG
+#ifndef NDEBUG
 	  cont2 = structure2->skipBranch(result);
-// #endif
+#endif
 	} else {
 	  cont1 = structure1->skipBranch(result);
-// #ifndef NDEBUG
+#ifndef NDEBUG
 	  cont2 = structure2->nextElement();
-// #endif
+#endif
 	}
      }
      TEST_EXIT_DBG(cont1 == cont2)("Structures don't match!\n");
@@ -504,7 +504,7 @@ namespace AMDiS {
      elInfo = stack.traverseNext(elInfo);
    }
  }
-  
+

  void MeshStructure::setMeshStructureValues(int macroElIndex,
 					     DOFVector<double>* vec,
@@ -519,7 +519,7 @@ namespace AMDiS {
    Mesh *mesh = feSpace->getMesh();
    bool feSpaceHasNonVertexDofs = (feSpace->getBasisFcts()->getDegree() > 1);
    int nVertexPreDofs = feSpace->getAdmin()->getNumberOfPreDofs(VERTEX);
-    
+
    std::size_t counter = 0;
    if (withElIndex) {
      TEST_EXIT(static_cast<int>(values[0]) == macroElIndex)

--- a/AUTHORS
+++ b/AUTHORS
-2004-2007 Simon Vey
-2007-2012 Thomas Witkowski
-2008-2013 Peter Gottschling <peter.gottschling@simunova.com>
-2008-2016 Rainer Backofen <rainer.backofen@tu-dresden.de>
-2009-2016 Andreas Naumann <andreas.naumann@tu-dresden.de>
-2010-2016 Simon Praetorius <simon.praetorius@tu-dresden.de>
-2014-2016 Siqi Ling <lsq0473@gmail.com>
\ No newline at end of file
+ 2004-2007 Simon Vey
+ 2007-2012 Thomas Witkowski
+ 2008-2013 Peter Gottschling <peter.gottschling@simunova.com>
+ 2008-2016 Rainer Backofen <rainer.backofen@tu-dresden.de>
+ 2009-2016 Andreas Naumann <andreas.naumann@tu-dresden.de>
+ 2010-2019 Simon Praetorius <simon.praetorius@tu-dresden.de>
+ 2014-2016 Siqi Ling <lsq0473@gmail.com>
+ 2014-2019 Sebastian Reuther <sebastian.reuther@tu-dresden.de>
\ No newline at end of file
--- a/CHANGELOG
+++ b/CHANGELOG
 amdis (@PACKAGE_VERSION_FULL@) @PACKAGE_DISTRIBUTION@; urgency=medium

-  * CMake configuration redesigned
-  * ARH3 reader corrected to parse .parh files correctly
-  * Macro DEBUG removed in favor of NDEBUG
-  * Compatibility with PETSc version 3.7
-  * Functor expressions with arbitrary nr. of arguments
-  * Reimplementation of periodic boundary conditions
-  * build scripts for linux and windows
-  * DirichletBC accepting expressions as value
-  * Resenbrock time-discretization in parallel
+  * Allow to compile with MPI or with OpenMP without domain decomposition
+  * Support c++14 compilers
+  * Support Apple MacOS systems
+  * Support for EasyBuild software management
+  * Change interface to be more const-correct
+  * Some thread-safety improvements
+  * evalAtPoint on parallel grids
+  * Added clamp expression
+  * periodic redistancing

- -- Simon Praetorius <simon.praetorius@tu-dresden.de>  Mon, 31 Oct 2016 10:46:58 +0100
+ -- Simon Praetorius <simon.praetorius@tu-dresden.de>  Mon, 22 Jan 2019 14:00:00 +0100
--- a/LICENSE
+++ b/LICENSE
 The MIT License (MIT)

-Copyright (c) 2016 Institute for Scientific Computing, TU-Dresden
+Copyright (c) 2016 Institute of Scientific Computing, Technische Universität Dresden

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

--- a/README.md
+++ b/README.md
@@ -94,11 +94,15 @@ When configuring AMDiS several options can be modified. For an interactive gui,

 | Option         | Type | Description |
 | -------------- | ---- | ----------- |
+| ENABLE_MPI     | BOOL | Compile and link with mpi library |
+| ENABLE_OPENMP  | BOOL | Compile and link to openMP threading library |
 | ENABLE_UMFPACK | BOOL | Compile with support for suitesparse UMFPack library |
-| ENABLE_COMPRESSION | BOOL | Allow compressed output of .vtk and .arh files. Need development files of zlib and libbz2 to be installed on the system. |
-| ENABLE_PARALLEL_DOMAIN | BOOL | Switch to parallel AMDiS. Needs PETSc and ParMETIS to be installed. |
+| ENABLE_PARALLEL_DOMAIN | BOOL | Switch to parallel AMDiS. Needs PETSc and ParMETIS to be installed. (Implies ENABLE_MPI) |
 | PETSC_DIR | PATH | Path to the PETSc root directory, containing the lib/ and include/ subdirectories. |
 | PARMETIS_DIR | PATH | Path to the ParMETIS root directory, containing the lib/ and include/ subdirectories. |
 | ENABLE_ZOLTAN | BOOL | Compile support for graph paritioning library Zoltan. |
 | ZOLTAN_DIR | PATH | PAth to the Zoltan root directory, containing lib/ and include/ subdirectories. |
+| ENABLE_HYPRE | BOOL | Compile support for algebraic multigrif HYPRE library. |
+| ENABLE_BDDCML | BOOL | Add support for the BDDCML library. |
 | ENABLE_EXTENSIONS | BOOL | Add additional features, not yet part of the standard AMDiS. Experimental! Should be used with care. |
+| ENABLE_COMPRESSION | BOOL | Allow compressed output of .vtk and .arh files. Need development files of zlib and libbz2 to be installed on the system. |
--- a/configure.sh
+++ b/configure.sh
 #!/bin/bash

-AMDIS_VERSION="1.1"
+AMDIS_VERSION="1.2"

 BUILD_DIR=$( pwd )
 SRC_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

--- a/tools/packaging/debian/control.in
+++ b/tools/packaging/debian/control.in
@@ -2,9 +2,9 @@ Source: amdis
 Maintainer: @PACKAGE_CONTACT@
 Section: contrib/misc
 Priority: optional
-Standards-Version: 3.9.2
-Vcs-Git: https://gitlab.math.tu-dresden.de/iwr/amdis.git
-Homepage: https://gitlab.math.tu-dresden.de/iwr/amdis
+Standards-Version: 3.9.8
+Vcs-Git: https://gitlab.mn.tu-dresden.de/iwr/amdis.git
+Homepage: https://gitlab.mn.tu-dresden.de/iwr/amdis
 Build-Depends: debhelper (>= 9), libboost-date-time-dev (>= 1.48),
 libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
 libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
@@ -13,12 +13,12 @@ Build-Depends: debhelper (>= 9), libboost-date-time-dev (>= 1.48),

 Package: libamdis-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-date-time-dev (>= 1.48),
+Depends: ${misc:Depends}, libboost-date-time-dev (>= 1.48),
 libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
 libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
 zlib1g-dev (>= 1.2), cmake (>= 2.8.10), pkg-config (>= 0.26)
-Recommends: libamdis (= ${source:Version}), libamdis-par (= ${source:Version})
-Suggests: libamdis-debug (= ${source:Version}), libamdis-par-debug (= ${source:Version})
+Recommends: libamdis (= ${binary:Version}), libamdis-par (= ${binary:Version})
+Suggests: libamdis-debug (= ${binary:Version}), libamdis-par-debug (= ${binary:Version})
 Description: @PACKAGE_DESCRIPTION_SUMMARY@
 @PACKAGE_DESCRIPTION@
 .
@@ -26,7 +26,7 @@ Description: @PACKAGE_DESCRIPTION_SUMMARY@

 Package: libamdis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= ${source:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= ${binary:Version}),
 libsuitesparse-dev (>= 4.2.1)
 Description: @PACKAGE_DESCRIPTION_SUMMARY@
 @PACKAGE_DESCRIPTION@
@@ -35,7 +35,7 @@ Description: @PACKAGE_DESCRIPTION_SUMMARY@

 Package: libamdis-par
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= ${source:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= ${binary:Version}),
 petsc-dev (>= 3.3), libparmetis-dev (>= 3.0), libmetis-dev (>= 5.0)
 Description: @PACKAGE_DESCRIPTION_SUMMARY@ (parallel Release-mode)
 @PACKAGE_DESCRIPTION@
@@ -44,7 +44,7 @@ Description: @PACKAGE_DESCRIPTION_SUMMARY@ (parallel Release-mode)

 Package: libamdis-debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis (= ${binary:Version})
 Description: @PACKAGE_DESCRIPTION_SUMMARY@ (Debug-mode)
 @PACKAGE_DESCRIPTION@
 .
@@ -52,7 +52,7 @@ Description: @PACKAGE_DESCRIPTION_SUMMARY@ (Debug-mode)

 Package: libamdis-par-debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-par (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-par (= ${binary:Version})
 Description: @PACKAGE_DESCRIPTION_SUMMARY@ (parallel Debug-mode)
 @PACKAGE_DESCRIPTION@
 .

--- a/tools/packaging/debian/create_package.cmake
+++ b/tools/packaging/debian/create_package.cmake
+# CMake script to create debian packages for AMDiS
+# ================================================
+#
+# Usage:
+# - If you want to create a new release, specify the ubuntu distribution, e.g. xenial, or bionic
+#   and call the cmake script with the -DDISTRIBUTION parameters:
+#   ```
+#   cmake -DDISTRIBUTION=xenial -P .../create_package.cmake
+#   ```
+# - Otherwise, if you want to create a Release Candidate, omit the -DDISTRIBUTION parameter.
+# - In case there are multiple uploads of the same version, i.e. you have corrected some bugs,
+#   you may need to append a sub-version to the version string, i.e. add ppa[1-9]
+#   PACKAGE_VERSION=${PACKAGE_VERSION}~ppa[1-9]~${PACKAGE_DISTRIBUTION}
+#
+
 set(PACKAGE_SOURCE_NAME   "amdis")
 set(PACKAGE_NAME          "libamdis")
 set(PACKAGE_SECTION       "libdevel")
@@ -9,7 +24,7 @@ else ()
  set(IS_RELEASE OFF)
 endif ()
 set(PACKAGE_VERSION_MAJOR "1")
-set(PACKAGE_VERSION_MINOR "1")
+set(PACKAGE_VERSION_MINOR "2")
 set(PACKAGE_VERSION_PATCH "0")
 set(PACKAGE_RELEASE_CANDIDATE "1")

@@ -24,11 +39,11 @@ if (NOT IS_RELEASE)
  set(PACKAGE_VERSION "${PACKAGE_VERSION}~rc${PACKAGE_RELEASE_CANDIDATE}")
 endif ()

-set(PACKAGE_VERSION "${PACKAGE_VERSION}~ppa5~${PACKAGE_DISTRIBUTION}")
+set(PACKAGE_VERSION "${PACKAGE_VERSION}~${PACKAGE_DISTRIBUTION}")
 set(PACKAGE_VERSION_FULL "${PACKAGE_VERSION}-1")

 set(PACKAGE_CONTACT "Simon Praetorius <simon.praetorius@tu-dresden.de>")
-set(PACKAGE_SOURCE  "<https://gitlab.math.tu-dresden.de/iwr/amdis.git>")
+set(PACKAGE_SOURCE  "<https://gitlab.mn.tu-dresden.de/iwr/amdis.git>")

 set(PACKAGE_DESCRIPTION_SUMMARY "A C++ library to solve a broad class of PDEs using adaptive finite elements.")
 set(PACKAGE_DESCRIPTION_FILE    "${CMAKE_SOURCE_DIR}/README.md")
@@ -41,6 +56,7 @@ set(PACKAGE_LICENSE_FILE "${CMAKE_SOURCE_DIR}/LICENSE")
 set(PACKAGE_README_FILE  "${CMAKE_SOURCE_DIR}/README.md")

 file(READ ${CMAKE_SOURCE_DIR}/AUTHORS PACKAGE_AUTHORS)
+string(STRIP "${PACKAGE_AUTHORS}" PACKAGE_AUTHORS)
 execute_process(COMMAND date OUTPUT_VARIABLE PACKAGE_DATE)

 set(IN_DIR  ${CMAKE_SOURCE_DIR}/tools/packaging/debian)
@@ -85,7 +101,7 @@ configure_file(${IN_DIR}/libamdis-debug.install     ${DEBIAN_DIR}/libamdis-debug
 configure_file(${IN_DIR}/libamdis-par-debug.install ${DEBIAN_DIR}/libamdis-par-debug.install @ONLY)

 file(WRITE ${DEBIAN_DIR}/compat "9\n")
-file(WRITE ${DEBIAN_DIR}/soure/format "3.0 (quilt)\n")
+file(WRITE ${DEBIAN_DIR}/source/format "3.0 (quilt)\n")

 # generate the debian package
 execute_p