Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-tectonic
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
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
podlesny
dune-tectonic
Commits
68535757
Commit
68535757
authored
11 years ago
by
Elias Pipping
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] Rename: assemble_neumann -> assembleNeumann
parent
9fa425bc
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/assemblers.cc
+6
-6
6 additions, 6 deletions
src/assemblers.cc
src/assemblers.hh
+5
-5
5 additions, 5 deletions
src/assemblers.hh
src/assemblers_tmpl.cc
+1
-1
1 addition, 1 deletion
src/assemblers_tmpl.cc
src/one-body-sample.cc
+2
-2
2 additions, 2 deletions
src/one-body-sample.cc
with
14 additions
and
14 deletions
src/assemblers.cc
+
6
−
6
View file @
68535757
...
@@ -12,12 +12,12 @@
...
@@ -12,12 +12,12 @@
// Assembles Neumann boundary term in f
// Assembles Neumann boundary term in f
template
<
class
GridView
,
class
LocalVectorType
,
class
AssemblerType
>
template
<
class
GridView
,
class
LocalVectorType
,
class
AssemblerType
>
void
assemble
_n
eumann
(
GridView
const
&
gridView
,
AssemblerType
const
&
assembler
,
void
assemble
N
eumann
(
GridView
const
&
gridView
,
AssemblerType
const
&
assembler
,
Dune
::
BitSetVector
<
1
>
const
&
neumannNodes
,
Dune
::
BitSetVector
<
1
>
const
&
neumannNodes
,
Dune
::
BlockVector
<
LocalVectorType
>
&
f
,
Dune
::
BlockVector
<
LocalVectorType
>
&
f
,
Dune
::
VirtualFunction
<
double
,
double
>
const
&
neumann
,
Dune
::
VirtualFunction
<
double
,
double
>
const
&
neumann
,
double
relativeTime
)
{
// constant sample function on
double
relativeTime
)
{
// constant sample function on
// neumann boundary
// neumann boundary
BoundaryPatch
<
GridView
>
const
neumannBoundary
(
gridView
,
neumannNodes
);
BoundaryPatch
<
GridView
>
const
neumannBoundary
(
gridView
,
neumannNodes
);
LocalVectorType
SampleVector
(
0
);
LocalVectorType
SampleVector
(
0
);
neumann
.
evaluate
(
relativeTime
,
SampleVector
[
0
]);
neumann
.
evaluate
(
relativeTime
,
SampleVector
[
0
]);
...
...
This diff is collapsed.
Click to expand it.
src/assemblers.hh
+
5
−
5
View file @
68535757
...
@@ -12,11 +12,11 @@
...
@@ -12,11 +12,11 @@
#include
<dune/tectonic/globalnonlinearity.hh>
#include
<dune/tectonic/globalnonlinearity.hh>
template
<
class
GridView
,
class
LocalVectorType
,
class
AssemblerType
>
template
<
class
GridView
,
class
LocalVectorType
,
class
AssemblerType
>
void
assemble
_n
eumann
(
GridView
const
&
gridView
,
AssemblerType
const
&
assembler
,
void
assemble
N
eumann
(
GridView
const
&
gridView
,
AssemblerType
const
&
assembler
,
Dune
::
BitSetVector
<
1
>
const
&
neumannNodes
,
Dune
::
BitSetVector
<
1
>
const
&
neumannNodes
,
Dune
::
BlockVector
<
LocalVectorType
>
&
f
,
Dune
::
BlockVector
<
LocalVectorType
>
&
f
,
Dune
::
VirtualFunction
<
double
,
double
>
const
&
neumann
,
Dune
::
VirtualFunction
<
double
,
double
>
const
&
neumann
,
double
relativeTime
);
double
relativeTime
);
template
<
class
GridView
,
class
LocalVectorType
,
class
AssemblerType
>
template
<
class
GridView
,
class
LocalVectorType
,
class
AssemblerType
>
Dune
::
shared_ptr
<
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
1
>>>
Dune
::
shared_ptr
<
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
1
>>>
...
...
This diff is collapsed.
Click to expand it.
src/assemblers_tmpl.cc
+
1
−
1
View file @
68535757
...
@@ -23,7 +23,7 @@ using GridView = GridType::LeafGridView;
...
@@ -23,7 +23,7 @@ using GridView = GridType::LeafGridView;
using
P1Basis
=
P1NodalBasis
<
GridView
,
double
>
;
using
P1Basis
=
P1NodalBasis
<
GridView
,
double
>
;
using
AssemblerType
=
Assembler
<
P1Basis
,
P1Basis
>
;
using
AssemblerType
=
Assembler
<
P1Basis
,
P1Basis
>
;
template
void
assemble
_n
eumann
<
GridView
,
SmallVector
,
AssemblerType
>(
template
void
assemble
N
eumann
<
GridView
,
SmallVector
,
AssemblerType
>(
GridView
const
&
gridView
,
AssemblerType
const
&
assembler
,
GridView
const
&
gridView
,
AssemblerType
const
&
assembler
,
Dune
::
BitSetVector
<
1
>
const
&
neumannNodes
,
Dune
::
BitSetVector
<
1
>
const
&
neumannNodes
,
Dune
::
BlockVector
<
SmallVector
>
&
f
,
Dune
::
BlockVector
<
SmallVector
>
&
f
,
...
...
This diff is collapsed.
Click to expand it.
src/one-body-sample.cc
+
2
−
2
View file @
68535757
...
@@ -345,8 +345,8 @@ int main(int argc, char *argv[]) {
...
@@ -345,8 +345,8 @@ int main(int argc, char *argv[]) {
// Problem formulation: right-hand side
// Problem formulation: right-hand side
auto
const
createRHS
=
[
&
](
double
_relativeTime
,
VectorType
&
_ell
)
{
auto
const
createRHS
=
[
&
](
double
_relativeTime
,
VectorType
&
_ell
)
{
assemble
_n
eumann
(
leafView
,
p1Assembler
,
neumannNodes
,
_ell
,
assemble
N
eumann
(
leafView
,
p1Assembler
,
neumannNodes
,
_ell
,
neumannFunction
,
_relativeTime
);
neumannFunction
,
_relativeTime
);
_ell
+=
gravityFunctional
;
_ell
+=
gravityFunctional
;
};
};
VectorType
ell
(
finestSize
);
VectorType
ell
(
finestSize
);
...
...
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