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
Markus Holzer
waLBerla
Commits
978b4586
Commit
978b4586
authored
Sep 16, 2019
by
Michael Kuron
Browse files
Fix broken ParserUBB
parent
482053ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/lbm/boundary/ParserUBB.h
View file @
978b4586
...
...
@@ -63,7 +63,7 @@ public:
{
public:
inline
Parser
(
const
Config
::
BlockHandle
&
config
);
inline
Parser
(
std
::
array
<
std
::
string
,
3
>
&
equations
);
inline
Parser
(
const
std
::
array
<
std
::
string
,
3
>
&
equations
);
Vector3
<
real_t
>
operator
()(
const
Vector3
<
real_t
>
&
x
,
const
real_t
t
)
const
;
Vector3
<
real_t
>
operator
()(
const
Vector3
<
real_t
>
&
x
)
const
;
bool
isTimeDependent
()
const
{
return
timeDependent_
;
}
...
...
@@ -207,7 +207,7 @@ inline ParserUBB<LatticeModel_T, flag_t, AdaptVelocityToExternalForce, StoreForc
}
template
<
typename
LatticeModel_T
,
typename
flag_t
,
bool
AdaptVelocityToExternalForce
,
bool
StoreForce
>
inline
ParserUBB
<
LatticeModel_T
,
flag_t
,
AdaptVelocityToExternalForce
,
StoreForce
>::
Parser
::
Parser
(
std
::
array
<
std
::
string
,
3
>
&
equations
)
inline
ParserUBB
<
LatticeModel_T
,
flag_t
,
AdaptVelocityToExternalForce
,
StoreForce
>::
Parser
::
Parser
(
const
std
::
array
<
std
::
string
,
3
>
&
equations
)
:
parsers_
(),
equations_
(
equations
),
timeDependent_
(
false
)
{
if
(
equations_
[
0
].
length
()
>
0
)
...
...
@@ -370,7 +370,7 @@ inline void ParserUBB< LatticeModel_T, flag_t, AdaptVelocityToExternalForce, Sto
if
(
p
.
isTimeDependent
()
)
{
parserField_
->
get
(
x
,
y
,
z
)
=
make_shared
<
Parser
>
(
p
);
parserField_
->
get
(
x
,
y
,
z
)
=
make_shared
<
Parser
>
(
p
.
equations
()
);
}
else
{
...
...
@@ -404,7 +404,7 @@ inline void ParserUBB< LatticeModel_T, flag_t, AdaptVelocityToExternalForce, Sto
if
(
p
.
isTimeDependent
()
)
{
auto
shared_p
=
make_shared
<
Parser
>
(
p
);
auto
shared_p
=
make_shared
<
Parser
>
(
p
.
equations
()
);
for
(
auto
cell
=
parserField_
->
beginSliceXYZ
(
cells
);
cell
!=
parserField_
->
end
();
++
cell
)
*
cell
=
shared_p
;
}
...
...
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