Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Praetorius, Simon
dune-amdis
Commits
d887ec02
Commit
d887ec02
authored
Jul 04, 2018
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rebased to develop and added small corrections
parent
384b27d4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
24 deletions
+8
-24
src/amdis/ProblemStat.hpp
src/amdis/ProblemStat.hpp
+7
-20
src/amdis/common/ConceptsBase.hpp
src/amdis/common/ConceptsBase.hpp
+1
-0
src/amdis/utility/TreeData.hpp
src/amdis/utility/TreeData.hpp
+0
-4
No files found.
src/amdis/ProblemStat.hpp
View file @
d887ec02
...
...
@@ -73,7 +73,7 @@ namespace AMDiS
**/
explicit
ProblemStat
(
std
::
string
name
)
:
StandardProblemIteration
(
dynamic_cast
<
ProblemStatBase
&>
(
*
this
))
,
name
(
std
::
move
(
name
))
,
name
_
(
std
::
move
(
name
))
{}
/// Constructor taking additionally a reference to a grid that is used
...
...
@@ -94,19 +94,6 @@ namespace AMDiS
initGlobalBasis
(
*
globalBasis_
);
}
/// \brief Constructor taking a grid reference and a basis reference.
/// Stores pointers to both.
ProblemStat
(
std
::
string
name
,
Grid
&
grid
,
GlobalBasis
&
globalBasis
)
:
StandardProblemIteration
(
dynamic_cast
<
ProblemStatBase
&>
(
*
this
))
,
name
(
std
::
move
(
name
))
{
gridName
=
""
;
Parameters
::
get
(
name
+
"->mesh"
,
gridName
);
globalBasis_
=
Dune
::
stackobject_to_shared_ptr
(
globalBasis
);
initGlobalBasis
(
*
globalBasis_
);
}
/**
* \brief Initialisation of the problem.
...
...
@@ -246,9 +233,9 @@ namespace AMDiS
void
createGlobalBasis
(
std
::
true_type
)
{
assert
(
bool
(
grid
)
);
assert
(
bool
(
grid
_
)
);
static_assert
(
std
::
is_same
<
GridView
,
typename
Grid
::
LeafGridView
>::
value
,
""
);
globalBasis_
=
std
::
make_shared
<
GlobalBasis
>
(
Traits
::
create
(
grid
->
leafGridView
()));
globalBasis_
=
std
::
make_shared
<
GlobalBasis
>
(
Traits
::
create
(
grid
_
->
leafGridView
()));
}
void
createGlobalBasis
(
std
::
false_type
)
...
...
@@ -273,10 +260,10 @@ namespace AMDiS
void
initGlobalBasis
(
GlobalBasis
const
&
globalBasis
)
{
localView_
=
std
::
make_shared
<
typename
GlobalBasis
::
LocalView
>
(
globalBasis
.
localView
());
matrixOperators
.
init
(
localView_
->
tree
(),
tag
::
store
{});
rhsOperators
.
init
(
localView_
->
tree
(),
tag
::
store
{});
constraints
.
init
(
localView_
->
tree
(),
tag
::
store
{});
localView_
=
std
::
make_shared
<
typename
GlobalBasis
::
LocalView
>
(
globalBasis
_
->
localView
());
matrixOperators
_
.
init
(
localView_
->
tree
(),
tag
::
store
{});
rhsOperators
_
.
init
(
localView_
->
tree
(),
tag
::
store
{});
constraints
_
.
init
(
localView_
->
tree
(),
tag
::
store
{});
}
void
createMatricesAndVectors
()
...
...
src/amdis/common/ConceptsBase.hpp
View file @
d887ec02
#pragma once
#include <type_traits>
#include <dune/common/typetraits.hh>
#ifdef DOXYGEN
#define REQUIRES(...)
...
...
src/amdis/utility/TreeData.hpp
View file @
d887ec02
...
...
@@ -252,11 +252,7 @@ namespace AMDiS
void
init
(
Tree
const
&
tree
,
tag
::
store
)
{
Super
::
init
(
tree
,
tag
::
store
{});
<<<<<<<
c786927261d1c07223ce3f9feabd89e439f2f4bb
AMDiS
::
forEachNode_
(
tree
,
[
&
,
this
](
auto
const
&
node
,
auto
&&
)
=======
forEachNode_
(
tree
,
[
&
,
this
](
auto
const
&
node
,
auto
&&
)
>>>>>>>
compatibility
with
dune
2.6.0
of
all
dependend
modules
{
(
*
this
)[
node
].
init
(
tree
,
tag
::
store
{});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment