Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-xt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
ag-ohlberger
dune-community
dune-xt
Commits
7ff2181f
Commit
7ff2181f
authored
6 years ago
by
René Fritze
Committed by
Tobias Leibner
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[test/factory] handle broken ALUgrid behaviour with non-default comms
parent
78338e34
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/xt/grid/gridprovider/factory.hh
+9
-0
9 additions, 0 deletions
dune/xt/grid/gridprovider/factory.hh
dune/xt/grid/test/mpi_grid.tpl
+1
-1
1 addition, 1 deletion
dune/xt/grid/test/mpi_grid.tpl
python/dune/xt/grid/grids.bindings.hh
+1
-1
1 addition, 1 deletion
python/dune/xt/grid/grids.bindings.hh
with
11 additions
and
2 deletions
dune/xt/grid/gridprovider/factory.hh
+
9
−
0
View file @
7ff2181f
...
...
@@ -90,6 +90,10 @@ public:
const
Common
::
Configuration
config
=
Common
::
Configuration
(),
MPIHelper
::
MPICommunicator
mpi_comm
=
MPIHelper
::
getCommunicator
())
{
if
(
is_alugrid
<
GridType
>::
value
&&
mpi_comm
!=
MPIHelper
::
getCommunicator
())
{
DUNE_THROW
(
InvalidStateException
,
"Alugrid either ignores, or outright fails with non-world comes when used here"
);
}
if
(
CubeType
::
static_id
()
==
type
)
return
call_create
<
CubeType
>
(
config
,
mpi_comm
);
else
if
(
DgfType
::
static_id
()
==
type
)
...
...
@@ -161,6 +165,11 @@ public:
const
Common
::
Configuration
config
=
Common
::
Configuration
(),
MPIHelper
::
MPICommunicator
mpi_comm
=
MPIHelper
::
getCommunicator
())
{
if
(
is_alugrid
<
GridType
>::
value
&&
mpi_comm
!=
MPIHelper
::
getCommunicator
())
{
DUNE_THROW
(
InvalidStateException
,
"Alugrid either ignores, or outright fails with non-world comes when used here"
);
}
if
(
CubeType
::
static_id
()
==
type
)
return
call_create
<
CubeType
>
(
config
,
mpi_comm
);
else
if
(
available
().
empty
())
...
...
This diff is collapsed.
Click to expand it.
dune/xt/grid/test/mpi_grid.tpl
+
1
−
1
View file @
7ff2181f
...
...
@@ -27,7 +27,7 @@ GTEST_TEST(GridProvider_{{name}}, layers)
MPI_Comm split_comm;
MPI_Comm_split(MPI_COMM_WORLD, world_rank, world_rank,
&split_comm);
{% if "
cube
" in type or "UGGrid" in type %}
{% if "
ALU
" in type or "UGGrid" in type %}
// uggrid + alu cube grids cannot handle non-default comms
EXPECT_THROW(ProviderFactory::create(config, split_comm), Dune::InvalidStateException);
return;
...
...
This diff is collapsed.
Click to expand it.
python/dune/xt/grid/grids.bindings.hh
+
1
−
1
View file @
7ff2181f
...
...
@@ -109,7 +109,7 @@ struct grid_name<ALUGrid<dim, dim, cube, conforming, Comm>>
// not optimal
template
<
int
dim
,
int
dimworld
,
ALU3dGridElementType
elType
,
class
Comm
>
template
<
int
dim
,
int
dimworld
,
ALU3dGridElementType
elType
,
class
Comm
>
struct
grid_name
<
ALU3dGrid
<
dim
,
dimworld
,
elType
,
Comm
>>
{
static
std
::
string
value
()
...
...
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