Commit 5d473574 authored by Praetorius, Simon's avatar Praetorius, Simon

small corrections of version number of fixed broken merge-conflict

parent 19ac151d
......@@ -19,12 +19,6 @@ endif()
#TODO: use the cmake build type
SET(MTL_INCLUDE_DIR ${LIB_DIR}/mtl4/ CACHE PATH "mtl4 directory")
# find_package(Subversion QUIET)
# if(Subversion_FOUND)
# Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} svn_info)
# #message("svn-rev: ${svn_info_WC_REVISION}")
# set(AMDIS_SUB_MINOR "${svn_info_WC_REVISION}")
# endif()
set(CurrentRevision "1.1")
if(NOT AMDIS_MAJOR)
set(AMDIS_MAJOR "1")
......
......@@ -26,7 +26,7 @@
/** \brief current AMDiS version */
#ifndef AMDIS_VERSION
#define AMDIS_VERSION "AMDiS: Version 0.9.1"
#define AMDIS_VERSION "AMDiS: Version 1.1"
#endif
#include <boost/config.hpp>
......
......@@ -238,11 +238,7 @@ namespace AMDiS { namespace io {
associated = mesh->periodicAssociations[boundaryType][iadmin];
for (int j = 0; j < dim; j++) {
<<<<<<< HEAD
#ifndef NDEBUG
=======
#ifdef DEBUG
>>>>>>> 7513d640d9de009c53e95dd9e1f252958172b31d
{
unsigned initData(melVertex[el1][verticesEl1[j]]);
unsigned oldData((*associated)[melVertex[el1][verticesEl1[j]]]);
......@@ -288,11 +284,7 @@ namespace AMDiS { namespace io {
} // if
} // for i
<<<<<<< HEAD
#ifndef NDEBUG
=======
#if (DEBUG != 0)
>>>>>>> 7513d640d9de009c53e95dd9e1f252958172b31d
std::map<BoundaryType, std::vector<VertexVector*> >::iterator assoc;
std::map<BoundaryType, std::vector<VertexVector*> >::iterator assocEnd =
mesh->periodicAssociations.end();
......
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