Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-fufem
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-fufem
Commits
821702ee
Commit
821702ee
authored
6 years ago
by
Ansgar Burchardt
Browse files
Options
Downloads
Plain Diff
Merge branch 'use-range-based-for' into 'master'
use range-based for See merge request
agnumpde/dune-fufem!49
parents
c2f66bc5
3108d979
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dune/fufem/assemblers/functionalassembler.hh
+4
-7
4 additions, 7 deletions
dune/fufem/assemblers/functionalassembler.hh
with
4 additions
and
7 deletions
dune/fufem/assemblers/functionalassembler.hh
+
4
−
7
View file @
821702ee
...
@@ -30,7 +30,6 @@ class FunctionalAssembler
...
@@ -30,7 +30,6 @@ class FunctionalAssembler
template
<
class
LocalFunctionalAssemblerType
,
class
GlobalVectorType
>
template
<
class
LocalFunctionalAssemblerType
,
class
GlobalVectorType
>
void
assemble
(
LocalFunctionalAssemblerType
&
localAssembler
,
GlobalVectorType
&
b
,
bool
initializeVector
=
true
)
const
void
assemble
(
LocalFunctionalAssemblerType
&
localAssembler
,
GlobalVectorType
&
b
,
bool
initializeVector
=
true
)
const
{
{
typedef
typename
GridView
::
template
Codim
<
0
>
::
Iterator
ElementIterator
;
typedef
typename
LocalFunctionalAssemblerType
::
LocalVector
LocalVector
;
typedef
typename
LocalFunctionalAssemblerType
::
LocalVector
LocalVector
;
typedef
typename
TrialBasis
::
LinearCombination
LinearCombination
;
typedef
typename
TrialBasis
::
LinearCombination
LinearCombination
;
...
@@ -42,19 +41,17 @@ class FunctionalAssembler
...
@@ -42,19 +41,17 @@ class FunctionalAssembler
b
=
0.0
;
b
=
0.0
;
}
}
ElementIterator
it
=
tBasis_
.
getGridView
().
template
begin
<
0
>();
for
(
const
auto
&
element
:
elements
(
tBasis_
.
getGridView
()))
ElementIterator
end
=
tBasis_
.
getGridView
().
template
end
<
0
>();
for
(;
it
!=
end
;
++
it
)
{
{
// get shape functions
// get shape functions
const
typename
TrialBasis
::
LocalFiniteElement
&
tFE
=
tBasis_
.
getLocalFiniteElement
(
*
i
t
);
const
typename
TrialBasis
::
LocalFiniteElement
&
tFE
=
tBasis_
.
getLocalFiniteElement
(
elemen
t
);
LocalVector
localB
(
tFE
.
localBasis
().
size
());
LocalVector
localB
(
tFE
.
localBasis
().
size
());
localAssembler
.
assemble
(
*
i
t
,
localB
,
tFE
);
localAssembler
.
assemble
(
elemen
t
,
localB
,
tFE
);
for
(
size_t
i
=
0
;
i
<
tFE
.
localBasis
().
size
();
++
i
)
for
(
size_t
i
=
0
;
i
<
tFE
.
localBasis
().
size
();
++
i
)
{
{
int
idx
=
tBasis_
.
index
(
*
i
t
,
i
);
int
idx
=
tBasis_
.
index
(
elemen
t
,
i
);
const
LinearCombination
&
constraints
=
tBasis_
.
constraints
(
idx
);
const
LinearCombination
&
constraints
=
tBasis_
.
constraints
(
idx
);
bool
isConstrained
=
tBasis_
.
isConstrained
(
idx
);
bool
isConstrained
=
tBasis_
.
isConstrained
(
idx
);
if
(
isConstrained
)
if
(
isConstrained
)
...
...
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