Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-multimesh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Praetorius, Simon
dune-multimesh
Commits
fc1cd1d3
Commit
fc1cd1d3
authored
6 years ago
by
Praetorius, Simon
Browse files
Options
Downloads
Patches
Plain Diff
interface changed in gridfactory
parent
8ca9a701
No related branches found
Branches containing commit
No related tags found
1 merge request
!5
Feature/interpolation
Checking pipeline status
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dune/multimesh/mmgridfactory.hh
+12
-0
12 additions, 0 deletions
dune/multimesh/mmgridfactory.hh
with
12 additions
and
0 deletions
dune/multimesh/mmgridfactory.hh
+
12
−
0
View file @
fc1cd1d3
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
#include
<vector>
#include
<vector>
#include
<dune/common/hybridutilities.hh>
#include
<dune/common/hybridutilities.hh>
#include
<dune/common/to_unique_ptr.hh>
#include
<dune/common/version.hh>
#include
<dune/common/std/type_traits.hh>
#include
<dune/common/std/type_traits.hh>
#include
<dune/grid/common/gridfactory.hh>
#include
<dune/grid/common/gridfactory.hh>
...
@@ -147,6 +149,7 @@ namespace Dune
...
@@ -147,6 +149,7 @@ namespace Dune
* Create n copies of the grid and store it in unique_pointers
* Create n copies of the grid and store it in unique_pointers
* inside the multimesh grid.
* inside the multimesh grid.
**/
**/
#if DUNE_VERSION_LTE(DUNE_GRID,2,7)
virtual
Grid
*
createGrid
()
override
virtual
Grid
*
createGrid
()
override
{
{
Grid
*
multimesh
=
new
Grid
{};
Grid
*
multimesh
=
new
Grid
{};
...
@@ -154,6 +157,15 @@ namespace Dune
...
@@ -154,6 +157,15 @@ namespace Dune
multimesh
->
grids_
.
emplace_back
(
gridFactory
->
createGrid
());
multimesh
->
grids_
.
emplace_back
(
gridFactory
->
createGrid
());
return
multimesh
;
return
multimesh
;
}
}
#else
virtual
ToUniquePtr
<
Grid
>
createGrid
()
override
{
std
::
unique_ptr
<
Grid
>
multimesh
{
std
::
make_unique
<
Grid
>
()};
for
(
auto
&
gridFactory
:
gridFactories_
)
multimesh
->
grids_
.
emplace_back
(
gridFactory
->
createGrid
());
return
std
::
move
(
multimesh
);
}
#endif
private
:
private
:
std
::
vector
<
std
::
unique_ptr
<
GridFactory
<
HostGrid
>>>
gridFactories_
;
std
::
vector
<
std
::
unique_ptr
<
GridFactory
<
HostGrid
>>>
gridFactories_
;
...
...
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