Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
amdis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iwr
amdis
Commits
03862656
Commit
03862656
authored
15 years ago
by
Thomas Witkowski
Browse files
Options
Downloads
Patches
Plain Diff
Wenn ich nicht so dumm waere, muesste ich jetzt auch nicht updaten.
parent
4c225a62
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
AMDiS/src/PeriodicBC.cc
+4
-0
4 additions, 0 deletions
AMDiS/src/PeriodicBC.cc
AMDiS/src/ProblemScal.cc
+3
-1
3 additions, 1 deletion
AMDiS/src/ProblemScal.cc
AMDiS/src/ProblemVec.cc
+7
-6
7 additions, 6 deletions
AMDiS/src/ProblemVec.cc
with
14 additions
and
7 deletions
AMDiS/src/PeriodicBC.cc
+
4
−
0
View file @
03862656
...
...
@@ -205,6 +205,8 @@ namespace AMDiS {
{
FUNCNAME
(
"PeriodicBC::exitMatrix()"
);
ERROR_EXIT
(
"Not yet implemented, if you have an idea how to do it, than make it!!!
\n
"
);
TEST_EXIT
(
matrix
)(
"no matrix
\n
"
);
if
(
matrix
==
masterMatrix_
)
{
...
...
@@ -215,6 +217,8 @@ namespace AMDiS {
using
namespace
mtl
;
associated_
->
print
();
// Compute reorder matrix (newRow and newCol yields transposed!!!)
matrix
::
traits
::
reorder
<>::
type
R
=
matrix
::
reorder
(
*
associated_
);
DOFMatrix
::
base_matrix_type
&
A
=
matrix
->
getBaseMatrix
(),
B
,
D
,
E
,
TR
;
...
...
This diff is collapsed.
Click to expand it.
AMDiS/src/ProblemScal.cc
+
3
−
1
View file @
03862656
...
...
@@ -605,6 +605,7 @@ namespace AMDiS {
systemMatrix
->
removeRowsWithDBC
(
systemMatrix
->
getApplyDBCs
());
// TODO: ExitMatrix should be called after finishInsertion!
if
(
systemMatrix
->
getBoundaryManager
())
systemMatrix
->
getBoundaryManager
()
->
exitMatrix
(
systemMatrix
);
if
(
rhs
->
getBoundaryManager
())
...
...
@@ -612,9 +613,10 @@ namespace AMDiS {
if
(
solution
->
getBoundaryManager
())
solution
->
getBoundaryManager
()
->
exitVector
(
solution
);
INFO
(
info
,
8
)(
"buildAfterCoarsen needed %.5f seconds
\n
"
,
TIME_USED
(
first
,
clock
()));
systemMatrix
->
finishInsertion
();
INFO
(
info
,
8
)(
"buildAfterCoarsen needed %.5f seconds
\n
"
,
TIME_USED
(
first
,
clock
()));
#ifdef HAVE_PARALLEL_AMDIS
// PetscErrorCode ierr;
// Mat A;
...
...
This diff is collapsed.
Click to expand it.
AMDiS/src/ProblemVec.cc
+
7
−
6
View file @
03862656
...
...
@@ -778,8 +778,9 @@ namespace AMDiS {
ERROR_EXIT
(
"Not yet implemented!
\n
"
);
}
if
(
assembleMatrix
&&
matrix
->
getBoundaryManager
())
matrix
->
getBoundaryManager
()
->
exitMatrix
(
matrix
);
// TODO: ExitMatrix should be called after finishInsertion!
if
(
assembleMatrix
&&
matrix
->
getBoundaryManager
())
matrix
->
getBoundaryManager
()
->
exitMatrix
(
matrix
);
assembledMatrix
[
i
][
j
]
=
true
;
}
...
...
@@ -794,13 +795,13 @@ namespace AMDiS {
// Finish insertion
for
(
int
i
=
0
;
i
<
nComponents
;
i
++
)
for
(
int
j
=
0
;
j
<
nComponents
;
j
++
)
if
((
*
systemMatrix
)[
i
][
j
])
(
*
systemMatrix
)[
i
][
j
]
->
finishInsertion
();
if
((
*
systemMatrix
)[
i
][
j
])
(
*
systemMatrix
)[
i
][
j
]
->
finishInsertion
();
// clock_t first1 = clock();
//
solverMatrix.setMatrix(*systemMatrix);
solverMatrix
.
setMatrix
(
*
systemMatrix
);
// clock_t first2 = clock();
//
createPrecon();
createPrecon
();
// clock_t first3 = clock();
// std::cout << "T1 = " << TIME_USED(first1, first2) << std::endl;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment