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
waLBerla
waLBerla
Commits
7cb04205
Commit
7cb04205
authored
Mar 03, 2021
by
Sebastian Eibl
Browse files
enabled showcases in the pipeline
parent
2e07b7b9
Pipeline
#30686
passed with stages
in 309 minutes and 39 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
7cb04205
...
...
@@ -38,6 +38,7 @@ stages:
-DWALBERLA_BUILD_BENCHMARKS=ON
-DWALBERLA_BUILD_TUTORIALS=ON
-DWALBERLA_BUILD_TOOLS=ON
-DWALBERLA_BUILD_SHOWCASES=ON
-DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI
-DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA
-DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON
...
...
apps/showcases/CombinedResolvedUnresolved/CombinedResolvedUnresolved.cpp
View file @
7cb04205
...
...
@@ -543,7 +543,7 @@ int main(int argc, char** argv)
// create pe bodies
// bounding planes (global)
const
auto
planeMaterial
=
pe
::
createMaterial
(
"planeMaterial"
,
1000
.0
,
0.8
,
0.1
,
0.05
,
0.2
,
80
,
100
,
10
,
11
);
const
auto
planeMaterial
=
pe
::
createMaterial
(
"planeMaterial"
,
1000
_r
,
0.8
_r
,
0.1
_r
,
0.05
_r
,
0.2
_r
,
80
_r
,
100
_r
,
10
_r
,
11
_r
);
pe
::
createPlane
(
*
globalBodyStorage
,
0
,
Vector3
<
real_t
>
(
1
,
0
,
0
),
Vector3
<
real_t
>
(
0
,
0
,
0
),
planeMaterial
);
pe
::
createPlane
(
*
globalBodyStorage
,
0
,
Vector3
<
real_t
>
(
-
1
,
0
,
0
),
Vector3
<
real_t
>
(
real_c
(
domainSize
[
0
]),
0
,
0
),
planeMaterial
);
...
...
@@ -564,8 +564,8 @@ int main(int argc, char** argv)
// add DPM spheres
const
auto
peMaterial_DPM
=
createSphereMaterial
(
"peMaterial_DPM"
,
diameter_DPM
,
densityRatio_DPM
);
createSphereLattice
(
*
blocks
,
*
globalBodyStorage
,
bodyStorageID
,
AABB
(
real_t
(
0
),
real_t
(
0
),
real_t
(
1.0
*
real_t
(
domainSize
[
2
])
/
8.0
),
real_t
(
domainSize
[
0
]),
real_t
(
domainSize
[
1
]),
real_t
(
2.0
*
real_t
(
domainSize
[
2
])
/
8.0
)),
AABB
(
real_t
(
0
),
real_t
(
0
),
real_t
(
1.0
*
real_t
(
domainSize
[
2
])
/
8.0
_r
),
real_t
(
domainSize
[
0
]),
real_t
(
domainSize
[
1
]),
real_t
(
2.0
*
real_t
(
domainSize
[
2
])
/
8.0
_r
)),
diameter_DPM
,
real_t
(
0.15
),
peMaterial_DPM
,
real_t
(
0
));
syncCall
();
...
...
apps/showcases/HeatConduction/ContactDetection.h
View file @
7cb04205
...
...
@@ -83,7 +83,7 @@ inline bool ContactDetection::operator()( const size_t idx1,
template
<
typename
Accessor
>
inline
bool
ContactDetection
::
operator
()(
const
size_t
idx1
,
const
size_t
idx2
,
const
data
::
Sphere
&
s
,
const
data
::
Sphere
&
/*s*/
,
const
data
::
HalfSpace
&
p
,
Accessor
&
ac
)
{
...
...
apps/showcases/Mixer/Mixer.cpp
View file @
7cb04205
...
...
@@ -261,7 +261,7 @@ int main( int argc, char ** argv )
Vec3
origin
=
simulationDomain
.
center
();
Vec3
dp
;
auto
mixingBlade
=
ss
->
create
<
data
::
Box
>
(
Vec3
(
0.009
,
simulationDomain
.
ySize
(),
simulationDomain
.
zSize
())
);
auto
mixingBlade
=
ss
->
create
<
data
::
Box
>
(
Vec3
(
0.009
_r
,
simulationDomain
.
ySize
(),
simulationDomain
.
zSize
())
);
ss
->
shapes
[
mixingBlade
]
->
updateMassAndInertia
(
std
::
numeric_limits
<
real_t
>::
infinity
());
auto
box0
=
ps
->
create
();
box0
->
getPositionRef
()
=
Vec3
(
simulationDomain
.
xSize
()
*
real_t
(
0.5
),
0.0
,
0.0
);
...
...
@@ -316,10 +316,10 @@ int main( int argc, char ** argv )
data
::
particle_flags
::
set
(
box3
->
getFlagsRef
(),
data
::
particle_flags
::
INFINITE
);
data
::
particle_flags
::
set
(
box3
->
getFlagsRef
(),
data
::
particle_flags
::
FIXED
);
data
::
particle_flags
::
set
(
box3
->
getFlagsRef
(),
data
::
particle_flags
::
NON_COMMUNICATING
);
box3
->
getRotationRef
().
rotate
(
Vec3
(
0
,
1
,
0
),
math
::
pi
*
0.15
);
box3
->
getRotationRef
().
rotate
(
Vec3
(
0
,
1
,
0
),
math
::
pi
*
0.15
_r
);
// box3->getRotationRef().rotate(Vec3(0,0,1), -math::pi * 0.15 );
dp
=
(
box3
->
getPosition
()
-
origin
);
dRot
=
Rot3
(
Vec3
(
real_t
(
0
),
real_t
(
0
),
math
::
pi
*
1.5
));
dRot
=
Rot3
(
Vec3
(
real_t
(
0
),
real_t
(
0
),
math
::
pi
*
1.5
_r
));
box3
->
setPosition
(
origin
+
dRot
.
getMatrix
()
*
dp
);
box3
->
getRotationRef
().
rotate
(
dRot
);
...
...
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