Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Backofen, Rainer
amdis
Commits
5d473574
Commit
5d473574
authored
Oct 22, 2016
by
Praetorius, Simon
Browse files
small corrections of version number of fixed broken merge-conflict
parent
19ac151d
Changes
3
Hide whitespace changes
Inline
Side-by-side
AMDiS/cmake/CMakeLists.txt
View file @
5d473574
...
...
@@ -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"
)
...
...
AMDiS/src/Config.h
View file @
5d473574
...
...
@@ -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>
...
...
AMDiS/src/io/MacroReader.cc
View file @
5d473574
...
...
@@ -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
>>>>>>>
7513
d640d9de009c53e95dd9e1f252958172b31d
{
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)
>>>>>>>
7513
d640d9de009c53e95dd9e1f252958172b31d
std
::
map
<
BoundaryType
,
std
::
vector
<
VertexVector
*>
>::
iterator
assoc
;
std
::
map
<
BoundaryType
,
std
::
vector
<
VertexVector
*>
>::
iterator
assocEnd
=
mesh
->
periodicAssociations
.
end
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment