Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
dumux-repositories
dumux
Commits
46aa8561
Commit
46aa8561
authored
8 years ago
by
Kilian Weishaupt
Committed by
Timo Koch
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[staggeredGrid][stencils] Do not use offset for faceDof indices
*Not needed since we use a multitype matrix
parent
4f1c9866
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dumux/discretization/staggered/stencils.hh
+4
-8
4 additions, 8 deletions
dumux/discretization/staggered/stencils.hh
dumux/implicit/staggered/assembler.hh
+2
-2
2 additions, 2 deletions
dumux/implicit/staggered/assembler.hh
with
6 additions
and
10 deletions
dumux/discretization/staggered/stencils.hh
+
4
−
8
View file @
46aa8561
...
@@ -200,7 +200,7 @@ public:
...
@@ -200,7 +200,7 @@ public:
{
{
faceStencils_
[
scvf
.
index
()].
update
(
problem
,
scvf
);
faceStencils_
[
scvf
.
index
()].
update
(
problem
,
scvf
);
const
IndexType
idx
=
scvf
.
dofIndexSelf
()
-
numElements
;
const
IndexType
idx
=
scvf
.
dofIndexSelf
();
const
auto
&
faceToCellCenterStencil
=
faceStencils_
[
scvf
.
index
()].
faceToCellCenterStencil
();
const
auto
&
faceToCellCenterStencil
=
faceStencils_
[
scvf
.
index
()].
faceToCellCenterStencil
();
fullFaceToCellCenterStencils
[
idx
].
insert
(
fullFaceToCellCenterStencils
[
idx
].
end
(),
faceToCellCenterStencil
.
begin
(),
faceToCellCenterStencil
.
end
());
fullFaceToCellCenterStencils
[
idx
].
insert
(
fullFaceToCellCenterStencils
[
idx
].
end
(),
faceToCellCenterStencil
.
begin
(),
faceToCellCenterStencil
.
end
());
...
@@ -229,7 +229,7 @@ public:
...
@@ -229,7 +229,7 @@ public:
auto
&
get
(
const
SubControlVolumeFace
&
scvFace
)
const
auto
&
get
(
const
SubControlVolumeFace
&
scvFace
)
const
{
{
const
IndexType
numElements
=
problemPtr_
->
gridView
().
size
(
0
);
const
IndexType
numElements
=
problemPtr_
->
gridView
().
size
(
0
);
return
faceStencils_
[
scvFace
.
dofIndexSelf
()
-
numElements
];
return
faceStencils_
[
scvFace
.
dofIndexSelf
()];
}
}
/*!
/*!
...
@@ -237,10 +237,8 @@ public:
...
@@ -237,10 +237,8 @@ public:
*/
*/
size_t
fullFaceToCellCenterStencilSize
(
const
int
idx
)
const
size_t
fullFaceToCellCenterStencilSize
(
const
int
idx
)
const
{
{
// const IndexType numElements = problemPtr_->gridView().size(0)
;
assert
(
fullFaceToCellCenterStencils_
&&
"fullFaceToCellCenterStencils_ has already been called and deleted!"
);
assert
(
fullFaceToCellCenterStencils_
&&
"fullFaceToCellCenterStencils_ has already been called and deleted!"
);
return
fullFaceToCellCenterStencils_
.
get
()[
0
][
idx
/*-numElements*/
].
size
();
return
fullFaceToCellCenterStencils_
.
get
()[
0
][
idx
].
size
();
// TODO: why does this not work?
}
}
/*!
/*!
...
@@ -248,10 +246,8 @@ public:
...
@@ -248,10 +246,8 @@ public:
*/
*/
size_t
fullfaceToFaceStencilSize
(
const
int
idx
)
const
size_t
fullfaceToFaceStencilSize
(
const
int
idx
)
const
{
{
// const IndexType numElements = problemPtr_->gridView().size(0)
;
assert
(
fullfaceToFaceStencils_
&&
"fullfaceToFaceStencils_ has already been called and deleted!"
);
assert
(
fullfaceToFaceStencils_
&&
"fullfaceToFaceStencils_ has already been called and deleted!"
);
return
fullfaceToFaceStencils_
.
get
()[
0
][
idx
/*-numElements*/
].
size
();
return
fullfaceToFaceStencils_
.
get
()[
0
][
idx
].
size
();
// TODO: why does this not work?
}
}
/*!
/*!
...
...
This diff is collapsed.
Click to expand it.
dumux/implicit/staggered/assembler.hh
+
2
−
2
View file @
46aa8561
...
@@ -160,7 +160,7 @@ private:
...
@@ -160,7 +160,7 @@ private:
for
(
auto
&&
globalJ
:
cellCenterToCellCenterStencil
)
for
(
auto
&&
globalJ
:
cellCenterToCellCenterStencil
)
A11
.
addindex
(
globalI
,
globalJ
);
A11
.
addindex
(
globalI
,
globalJ
);
for
(
auto
&&
globalJ
:
cellCenterToFaceStencil
)
for
(
auto
&&
globalJ
:
cellCenterToFaceStencil
)
A12
.
addindex
(
globalI
,
globalJ
-
this
->
gridView_
().
size
(
0
)
);
A12
.
addindex
(
globalI
,
globalJ
);
}
}
A11
.
endindices
();
A11
.
endindices
();
A12
.
endindices
();
A12
.
endindices
();
...
@@ -185,7 +185,7 @@ private:
...
@@ -185,7 +185,7 @@ private:
for
(
const
auto
&
stencil
:
fullfaceToFaceStencils
)
for
(
const
auto
&
stencil
:
fullfaceToFaceStencils
)
{
{
for
(
auto
&&
globalJ
:
stencil
)
for
(
auto
&&
globalJ
:
stencil
)
A22
.
addindex
(
globalI
,
globalJ
-
this
->
gridView_
().
size
(
0
)
);
A22
.
addindex
(
globalI
,
globalJ
);
++
globalI
;
++
globalI
;
}
}
...
...
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