Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Houman Mirzaalian Dastjerdi
waLBerla
Commits
d4f5f173
Commit
d4f5f173
authored
Nov 10, 2017
by
Michael Kuron
Browse files
Clearer warning that BlockForest::addBlockData(boost::function, ...) cannot be used with refinement
parent
5298876a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/blockforest/BlockForest.h
View file @
d4f5f173
...
...
@@ -357,8 +357,7 @@ public:
inline
BlockDataID
addBlockData
(
boost
::
function
<
T
*
(
IBlock
*
const
block
)
>
function
,
const
std
::
string
&
identifier
=
std
::
string
(),
const
Set
<
SUID
>
&
requiredSelectors
=
Set
<
SUID
>::
emptySet
(),
const
Set
<
SUID
>
&
incompatibleSelectors
=
Set
<
SUID
>::
emptySet
()
)
{
return
BlockStorage
::
addBlockData
(
function
,
identifier
,
requiredSelectors
,
incompatibleSelectors
);
}
const
Set
<
SUID
>
&
incompatibleSelectors
=
Set
<
SUID
>::
emptySet
()
);
BlockDataID
addBlockData
(
const
domain_decomposition
::
internal
::
SelectableBlockDataHandlingWrapper
&
dataHandling
,
const
std
::
string
&
identifier
=
std
::
string
()
)
{
return
BlockStorage
::
addBlockData
(
dataHandling
,
identifier
);
}
...
...
@@ -876,6 +875,17 @@ inline BlockDataID BlockForest::addBlockData( const shared_ptr< T > & dataHandli
template
<
typename
T
>
inline
BlockDataID
BlockForest
::
addBlockData
(
boost
::
function
<
T
*
(
IBlock
*
const
block
)
>
function
,
const
std
::
string
&
identifier
,
const
Set
<
SUID
>
&
requiredSelectors
,
const
Set
<
SUID
>
&
incompatibleSelectors
)
{
WALBERLA_ASSERT_EQUAL
(
getDepth
(),
0
,
"addBlockData(function<T*>, ...) cannot be used with refinement, use addBlockData(shared_ptr<T>, ...) instead"
);
return
BlockStorage
::
addBlockData
(
function
,
identifier
,
requiredSelectors
,
incompatibleSelectors
);
}
template
<
typename
T
>
inline
BlockDataID
BlockForest
::
loadBlockData
(
const
std
::
string
&
file
,
const
shared_ptr
<
T
>
&
dataHandling
,
const
std
::
string
&
identifier
,
const
Set
<
SUID
>
&
requiredSelectors
,
const
Set
<
SUID
>
&
incompatibleSelectors
)
...
...
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