Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
amdis
amdis-core
Commits
e0f34db5
Commit
e0f34db5
authored
May 02, 2019
by
Praetorius, Simon
Browse files
Merge branch 'issue/factory_parametrization' into 'master'
Make FactoryParametrization compatible to dune 2.7 See merge request
!40
parents
2c7ee1ed
ea26a4b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
examples/FactoryParametrization.hpp
View file @
e0f34db5
...
...
@@ -28,7 +28,6 @@ namespace AMDiS
namespace
Dune
{
/// \brief A factory class for \ref SimpleGrid.
template
<
class
Grid
,
class
Projection
>
class
GridFactory
<
AMDiS
::
Parametrization
<
Grid
,
Projection
>>
...
...
@@ -50,8 +49,7 @@ namespace Dune
public:
/// Default constructor
GridFactory
()
{}
GridFactory
()
=
default
;
/// Insert a vertex into the coarse grid
virtual
void
insertVertex
(
GlobalCoordinate
const
&
pos
)
override
...
...
@@ -73,7 +71,7 @@ namespace Dune
for
(
std
::
size_t
i
=
0
;
i
<
vertices
.
size
();
++
i
)
corners
[
i
]
=
coordinates
[
vertices
[
i
]];
factory
.
insertElement
(
type
,
vertices
,
std
::
shared
_ptr
<
Projection
Base
>
(
new
Projection
(
std
::
move
(
corners
))
)
);
factory
.
insertElement
(
type
,
vertices
,
std
::
make_
shared
<
Projection
>
(
std
::
move
(
corners
))
);
}
virtual
void
insertBoundarySegment
(
std
::
vector
<
unsigned
int
>
const
&
/*vertices*/
)
override
...
...
@@ -82,22 +80,24 @@ namespace Dune
}
/// Finalize grid creation and hand over the grid.
Grid
*
create
()
std
::
unique_ptr
<
Grid
>
create
()
{
return
factory
.
createGrid
();
return
std
::
unique_ptr
<
Grid
>
(
factory
.
createGrid
()
)
;
}
#if DUNE_VERSION_GT(DUNE_GRID,2,6)
virtual
ToUniquePtr
<
GridWrapper
>
createGrid
()
override
#else
virtual
GridWrapper
*
createGrid
()
override
#endif
{
AMDiS
::
warning
(
"Should not be created. Use non-virtual method `create()` instead, to create the underlying grid!"
);
return
nullptr
;
}
private:
// buffers for the mesh data
std
::
vector
<
GlobalCoordinate
>
coordinates
;
GridFactory
<
Grid
>
factory
;
};
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment