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
e0d9fe90
Commit
e0d9fe90
authored
May 04, 2018
by
Christian Godenschwager
Browse files
Fix body id initialization in pe tests
parent
51be3bd1
Changes
2
Hide whitespace changes
Inline
Side-by-side
tests/pe/CollisionTobiasGJK.cpp
View file @
e0d9fe90
...
...
@@ -48,7 +48,7 @@
using
namespace
walberla
;
using
namespace
walberla
::
pe
;
typedef
boost
::
tuple
<
Box
,
Capsule
,
Plane
,
Sphere
,
Union
<
boost
::
tuple
<
Sphere
,
Union
<
boost
::
tuple
<
Sphere
>>>>
,
Ellipsoid
>
BodyTuple
;
typedef
boost
::
tuple
<
Box
,
Capsule
,
Plane
,
Sphere
,
Union
<
boost
::
tuple
<
Sphere
>>
,
Union
<
boost
::
tuple
<
Sphere
,
Union
<
boost
::
tuple
<
Sphere
>>>>
,
Ellipsoid
>
BodyTuple
;
bool
gjkEPAcollideHybrid
(
GeomPrimitive
&
geom1
,
GeomPrimitive
&
geom2
,
Vec3
&
normal
,
Vec3
&
contactPoint
,
real_t
&
penetrationDepth
)
{
...
...
tests/pe/SimpleCCD.cpp
View file @
e0d9fe90
...
...
@@ -19,18 +19,19 @@
//======================================================================================================================
#include "pe/Materials.h"
#include "pe/rigidbody/Sphere.h"
#include "pe/Types.h"
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/SetBodyTypeIDs.h"
#include "pe/rigidbody/Sphere.h"
#include "pe/ccd/SimpleCCD.h"
#include "pe/ccd/HashGrids.h"
#include "pe/fcd/SimpleFCD.h"
#include "core/DataTypes.h"
#include "core/DataTypes.h"
#include "core/UniqueID.h"
#include "core/timing/TimingPool.h"
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
#include "core/UniqueID.h"
using
namespace
walberla
;
using
namespace
walberla
::
pe
;
...
...
@@ -43,6 +44,8 @@ int main( int argc, char** argv )
walberla
::
MPIManager
::
instance
()
->
initializeMPI
(
&
argc
,
&
argv
);
SetBodyTypeIDs
<
BodyTuple
>::
execute
();
MaterialID
iron
=
Material
::
find
(
"iron"
);
BodyStorage
globalStorage
;
...
...
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