Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Backofen, Rainer
amdis
Commits
16e2f085
Commit
16e2f085
authored
Sep 11, 2015
by
Siqi Ling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug in 3d domain boundary (face dofs)
parent
87e85533
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
AMDiS/src/DOFMatrix.cc
AMDiS/src/DOFMatrix.cc
+5
-2
AMDiS/src/ProblemStat.cc
AMDiS/src/ProblemStat.cc
+6
-4
AMDiS/src/Tetrahedron.cc
AMDiS/src/Tetrahedron.cc
+4
-2
No files found.
AMDiS/src/DOFMatrix.cc
View file @
16e2f085
...
...
@@ -254,17 +254,20 @@ namespace AMDiS {
{
set_to_zero
(
elementMatrix
);
bool
addMatrix
=
false
;
std
::
vector
<
Operator
*>::
iterator
it
=
operators
.
begin
();
std
::
vector
<
double
*>::
iterator
factorIt
=
operatorFactor
.
begin
();
for
(;
it
!=
operators
.
end
();
++
it
,
++
factorIt
)
if
((
*
it
)
->
getNeedDualTraverse
()
==
false
&&
(
*
factorIt
==
NULL
||
**
factorIt
!=
0.0
))
(
*
factorIt
==
NULL
||
**
factorIt
!=
0.0
))
{
(
*
it
)
->
getElementMatrix
(
elInfo
,
elementMatrix
,
*
factorIt
?
**
factorIt
:
1.0
);
addMatrix
=
true
;
}
if
(
factor
!=
1.0
)
elementMatrix
*=
factor
;
if
(
operators
.
size
())
if
(
operators
.
size
()
&&
addMatrix
)
addElementMatrix
(
elementMatrix
,
bound
,
elInfo
,
NULL
);
}
...
...
AMDiS/src/ProblemStat.cc
View file @
16e2f085
...
...
@@ -1194,8 +1194,9 @@ namespace AMDiS {
matrix
->
assemble2
(
1.0
,
mainElInfo
,
auxElInfo
,
dualElInfo
.
smallElInfo
,
dualElInfo
.
largeElInfo
,
bound
);
if
(
matrix
&&
matrix
->
getBoundaryManager
())
matrix
->
getBoundaryManager
()
->
fillBoundaryConditions
(
mainElInfo
,
matrix
);
if
(
componentMeshes
[
i
]
==
meshes
[
0
]
&&
newEl0
||
componentMeshes
[
i
]
==
meshes
[
1
]
&&
newEl1
)
if
(
matrix
&&
matrix
->
getBoundaryManager
())
matrix
->
getBoundaryManager
()
->
fillBoundaryConditions
(
mainElInfo
,
matrix
);
}
else
{
...
...
@@ -1219,8 +1220,9 @@ namespace AMDiS {
matrix
->
assemble
(
1.0
,
rowElInfo
,
colElInfo
,
dualElInfo
.
smallElInfo
,
dualElInfo
.
largeElInfo
,
bound
);
if
(
matrix
->
getBoundaryManager
())
matrix
->
getBoundaryManager
()
->
fillBoundaryConditions
(
rowElInfo
,
matrix
);
if
(
componentMeshes
[
i
]
==
meshes
[
0
]
&&
newEl0
||
componentMeshes
[
i
]
==
meshes
[
1
]
&&
newEl1
)
if
(
matrix
->
getBoundaryManager
())
matrix
->
getBoundaryManager
()
->
fillBoundaryConditions
(
rowElInfo
,
matrix
);
}
if
(
i
==
j
)
{
...
...
AMDiS/src/Tetrahedron.cc
View file @
16e2f085
...
...
@@ -279,14 +279,16 @@ namespace AMDiS {
child
[
1
]
->
getNodeDofs
(
feSpace
,
nextBound1
,
dofs
,
baseDofPtr
);
if
(
addDof
)
dofs
.
push_back
(
&
(
child
[
0
]
->
getDof
()[
3
][
n0
]));
if
(
std
::
find
(
dofs
.
begin
(),
dofs
.
end
(),
&
(
child
[
0
]
->
getDof
()[
3
][
n0
]))
==
dofs
.
end
())
dofs
.
push_back
(
&
(
child
[
0
]
->
getDof
()[
3
][
n0
]));
child
[
0
]
->
getNodeDofs
(
feSpace
,
nextBound0
,
dofs
,
baseDofPtr
);
}
else
{
child
[
0
]
->
getNodeDofs
(
feSpace
,
nextBound0
,
dofs
,
baseDofPtr
);
if
(
addDof
)
dofs
.
push_back
(
&
(
child
[
0
]
->
getDof
()[
3
][
n0
]));
if
(
std
::
find
(
dofs
.
begin
(),
dofs
.
end
(),
&
(
child
[
0
]
->
getDof
()[
3
][
n0
]))
==
dofs
.
end
())
dofs
.
push_back
(
&
(
child
[
0
]
->
getDof
()[
3
][
n0
]));
child
[
1
]
->
getNodeDofs
(
feSpace
,
nextBound1
,
dofs
,
baseDofPtr
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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