Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for parallel collision detection #2195

Merged
merged 22 commits into from
Aug 30, 2018
Merged

Fixes for parallel collision detection #2195

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
41a3cc9
Fix parallelization of collision detection schemes
RudolfWeeber Aug 16, 2018
930dd97
Fix parallelization of collision detection schemes
RudolfWeeber Aug 16, 2018
45834fd
Merge branch 'coldet_par_fix' of ssh://github.com/RudolfWeeber/espres…
RudolfWeeber Aug 20, 2018
4afe110
testsuite: enable parallel testing of collision_detection
RudolfWeeber Aug 20, 2018
ee64c17
clang format collision.cpp before merge
RudolfWeeber Aug 23, 2018
2ddcbd7
Merge branch 'python' of git://github.com/espressomd/espresso into co…
RudolfWeeber Aug 23, 2018
1cdfd6c
Coldet: Use p_old if resolving cell fails
hirschsn Jul 5, 2018
80003b4
autopep8
RudolfWeeber Aug 27, 2018
981e1f4
Revert "autopep8"
RudolfWeeber Aug 27, 2018
c09e8c0
Autopep8
RudolfWeeber Aug 27, 2018
7b2d107
Merge branch 'python' of git://github.com/espressomd/espresso into co…
RudolfWeeber Aug 27, 2018
c20875c
coldet: feature guard + clang sanitizer
RudolfWeeber Aug 27, 2018
c285cc6
collision.cpp: static analysis
RudolfWeeber Aug 28, 2018
ffecb6b
Coldet: static analysis
RudolfWeeber Aug 29, 2018
09543fa
coldet: Review comments + bunch of consts
RudolfWeeber Aug 29, 2018
2f9af26
Clang format
RudolfWeeber Aug 29, 2018
2f0788b
coldet: Also skip pairs if only one particle is accessible
RudolfWeeber Aug 30, 2018
01dd20e
coldet: static analysis
RudolfWeeber Aug 30, 2018
894e5fb
coldet: handle case of changed storage location for particles
RudolfWeeber Aug 30, 2018
0f316f0
Formatting
RudolfWeeber Aug 30, 2018
eb13189
coldet: More particle storage location updates
RudolfWeeber Aug 30, 2018
00cff13
Formatting
RudolfWeeber Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/collision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ void handle_collisions() {
// ore one is ghost and one is not accessible
// we only increase the counter for the ext id to use based on the
// number of particles created by other nodes
if ((!p1 or p1->l.ghost) and (!p2 or p2->l.ghost)) {
if ((!p1 or p1->l.ghost) and (!p2 or p2->l.ghost) or !p1 or !p2) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the two !px in the and are now superfluous. This should be equivalent to:

if (!p1 || !p2 || (p1->l.ghost && p2->l.ghost))

// Increase local counters
if (collision_params.mode & COLLISION_MODE_VS) {
added_particle(current_vs_pid);
Expand Down