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
Aland, Sebastian
amdis
Commits
a72dee5f
Commit
a72dee5f
authored
Oct 22, 2016
by
Praetorius, Simon
Browse files
conflict in MacroReader resolved
parents
6c6238b3
7513d640
Changes
1
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/io/MacroReader.cc
View file @
a72dee5f
...
@@ -238,7 +238,11 @@ namespace AMDiS { namespace io {
...
@@ -238,7 +238,11 @@ namespace AMDiS { namespace io {
associated
=
mesh
->
periodicAssociations
[
boundaryType
][
iadmin
];
associated
=
mesh
->
periodicAssociations
[
boundaryType
][
iadmin
];
for
(
int
j
=
0
;
j
<
dim
;
j
++
)
{
for
(
int
j
=
0
;
j
<
dim
;
j
++
)
{
<<<<<<<
HEAD
#ifndef NDEBUG
#ifndef NDEBUG
=======
#ifdef DEBUG
>>>>>>>
7513
d640d9de009c53e95dd9e1f252958172b31d
{
{
unsigned
initData
(
melVertex
[
el1
][
verticesEl1
[
j
]]);
unsigned
initData
(
melVertex
[
el1
][
verticesEl1
[
j
]]);
unsigned
oldData
((
*
associated
)[
melVertex
[
el1
][
verticesEl1
[
j
]]]);
unsigned
oldData
((
*
associated
)[
melVertex
[
el1
][
verticesEl1
[
j
]]]);
...
@@ -284,7 +288,11 @@ namespace AMDiS { namespace io {
...
@@ -284,7 +288,11 @@ namespace AMDiS { namespace io {
}
// if
}
// if
}
// for i
}
// for i
<<<<<<<
HEAD
#ifndef NDEBUG
#ifndef NDEBUG
=======
#if (DEBUG != 0)
>>>>>>>
7513
d640d9de009c53e95dd9e1f252958172b31d
std
::
map
<
BoundaryType
,
std
::
vector
<
VertexVector
*>
>::
iterator
assoc
;
std
::
map
<
BoundaryType
,
std
::
vector
<
VertexVector
*>
>::
iterator
assoc
;
std
::
map
<
BoundaryType
,
std
::
vector
<
VertexVector
*>
>::
iterator
assocEnd
=
std
::
map
<
BoundaryType
,
std
::
vector
<
VertexVector
*>
>::
iterator
assocEnd
=
mesh
->
periodicAssociations
.
end
();
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