Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-matrix-vector
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Ansgar Burchardt
dune-matrix-vector
Commits
81df1fe8
Commit
81df1fe8
authored
8 years ago
by
Max Kahnt
Browse files
Options
Downloads
Patches
Plain Diff
Iterator indices are size_t.
parent
e1f066be
Branches
Branches containing commit
Tags
0.1.7
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dune/matrix-vector/transformmatrix.hh
+10
-10
10 additions, 10 deletions
dune/matrix-vector/transformmatrix.hh
with
10 additions
and
10 deletions
dune/matrix-vector/transformmatrix.hh
+
10
−
10
View file @
81df1fe8
...
@@ -208,7 +208,7 @@ namespace MatrixVector {
...
@@ -208,7 +208,7 @@ namespace MatrixVector {
Dune
::
DiagonalMatrix
<
FieldType
,
n
>&
A
,
const
TransformationMatrix
&
T1
,
Dune
::
DiagonalMatrix
<
FieldType
,
n
>&
A
,
const
TransformationMatrix
&
T1
,
const
Dune
::
DiagonalMatrix
<
FieldType
,
n
>&
B
,
const
Dune
::
DiagonalMatrix
<
FieldType
,
n
>&
B
,
const
TransformationMatrix
&
T2
)
{
const
TransformationMatrix
&
T2
)
{
for
(
in
t
k
=
0
;
k
<
n
;
k
++
)
{
for
(
size_
t
k
=
0
;
k
<
n
;
k
++
)
{
for
(
auto
Tki
=
T1
[
k
].
begin
();
Tki
!=
T1
[
k
].
end
();
++
Tki
)
for
(
auto
Tki
=
T1
[
k
].
begin
();
Tki
!=
T1
[
k
].
end
();
++
Tki
)
A
.
diagonal
(
Tki
.
index
())
+=
A
.
diagonal
(
Tki
.
index
())
+=
(
*
Tki
)
*
B
.
diagonal
(
k
)
*
T2
[
k
][
Tki
.
index
()];
(
*
Tki
)
*
B
.
diagonal
(
k
)
*
T2
[
k
][
Tki
.
index
()];
...
@@ -225,7 +225,7 @@ namespace MatrixVector {
...
@@ -225,7 +225,7 @@ namespace MatrixVector {
const
TransformationMatrix
&
T1
,
const
TransformationMatrix
&
T1
,
const
Dune
::
ScaledIdentityMatrix
<
FieldType
,
n
>&
B
,
const
Dune
::
ScaledIdentityMatrix
<
FieldType
,
n
>&
B
,
const
TransformationMatrix
&
T2
)
{
const
TransformationMatrix
&
T2
)
{
for
(
in
t
k
=
0
;
k
<
n
;
k
++
)
for
(
size_
t
k
=
0
;
k
<
n
;
k
++
)
A
.
scalar
()
+=
T1
[
k
][
0
]
*
B
.
scalar
()
*
T2
[
k
][
0
];
A
.
scalar
()
+=
T1
[
k
][
0
]
*
B
.
scalar
()
*
T2
[
k
][
0
];
}
}
};
};
...
@@ -278,13 +278,13 @@ namespace MatrixVector {
...
@@ -278,13 +278,13 @@ namespace MatrixVector {
const
TransformationMatrix
&
T2
)
{
const
TransformationMatrix
&
T2
)
{
transformMatrixPattern
(
A
,
T1
,
B
,
T2
);
transformMatrixPattern
(
A
,
T1
,
B
,
T2
);
A
=
0.0
;
A
=
0.0
;
for
(
in
t
k
=
0
;
k
<
B
.
N
();
++
k
)
{
for
(
size_
t
k
=
0
;
k
<
B
.
N
();
++
k
)
{
for
(
auto
BklIt
=
B
[
k
].
begin
();
BklIt
!=
B
[
k
].
end
();
++
BklIt
)
{
for
(
auto
BklIt
=
B
[
k
].
begin
();
BklIt
!=
B
[
k
].
end
();
++
BklIt
)
{
in
t
l
=
BklIt
.
index
();
size_
t
l
=
BklIt
.
index
();
for
(
auto
T1kiIt
=
T1
[
k
].
begin
();
T1kiIt
!=
T1
[
k
].
end
();
++
T1kiIt
)
{
for
(
auto
T1kiIt
=
T1
[
k
].
begin
();
T1kiIt
!=
T1
[
k
].
end
();
++
T1kiIt
)
{
in
t
i
=
T1kiIt
.
index
();
size_
t
i
=
T1kiIt
.
index
();
for
(
auto
T2ljIt
=
T2
[
l
].
begin
();
T2ljIt
!=
T2
[
l
].
end
();
++
T2ljIt
)
{
for
(
auto
T2ljIt
=
T2
[
l
].
begin
();
T2ljIt
!=
T2
[
l
].
end
();
++
T2ljIt
)
{
in
t
j
=
T2ljIt
.
index
();
size_
t
j
=
T2ljIt
.
index
();
MatrixBlockA
Aij
;
MatrixBlockA
Aij
;
transformMatrix
(
Aij
,
*
T1kiIt
,
*
BklIt
,
*
T2ljIt
);
transformMatrix
(
Aij
,
*
T1kiIt
,
*
BklIt
,
*
T2ljIt
);
A
[
i
][
j
]
+=
Aij
;
A
[
i
][
j
]
+=
Aij
;
...
@@ -300,13 +300,13 @@ namespace MatrixVector {
...
@@ -300,13 +300,13 @@ namespace MatrixVector {
const
MatrixB
&
B
,
const
MatrixB
&
B
,
const
TransformationMatrix
&
T2
)
{
const
TransformationMatrix
&
T2
)
{
Dune
::
MatrixIndexSet
indices
(
T1
.
M
(),
T2
.
M
());
Dune
::
MatrixIndexSet
indices
(
T1
.
M
(),
T2
.
M
());
for
(
in
t
k
=
0
;
k
<
B
.
N
();
++
k
)
{
for
(
size_
t
k
=
0
;
k
<
B
.
N
();
++
k
)
{
for
(
auto
BklIt
=
B
[
k
].
begin
();
BklIt
!=
B
[
k
].
end
();
++
BklIt
)
{
for
(
auto
BklIt
=
B
[
k
].
begin
();
BklIt
!=
B
[
k
].
end
();
++
BklIt
)
{
in
t
l
=
BklIt
.
index
();
size_
t
l
=
BklIt
.
index
();
for
(
auto
T1kiIt
=
T1
[
k
].
begin
();
T1kiIt
!=
T1
[
k
].
end
();
++
T1kiIt
)
{
for
(
auto
T1kiIt
=
T1
[
k
].
begin
();
T1kiIt
!=
T1
[
k
].
end
();
++
T1kiIt
)
{
in
t
i
=
T1kiIt
.
index
();
size_
t
i
=
T1kiIt
.
index
();
for
(
auto
T2ljIt
=
T2
[
l
].
begin
();
T2ljIt
!=
T2
[
l
].
end
();
++
T2ljIt
)
{
for
(
auto
T2ljIt
=
T2
[
l
].
begin
();
T2ljIt
!=
T2
[
l
].
end
();
++
T2ljIt
)
{
in
t
j
=
T2ljIt
.
index
();
size_
t
j
=
T2ljIt
.
index
();
indices
.
add
(
i
,
j
);
indices
.
add
(
i
,
j
);
}
}
}
}
...
...
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