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

Improve opencl #161

Open
wants to merge 8 commits into
base: development
Choose a base branch
from
Open

Improve opencl #161

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d431eba
Add skip_display params
lungd Jan 27, 2019
62d4cac
Fix skip_display_connections
lungd Jan 28, 2019
1937934
Pass dt to C302NRNSimulation instance after initialization
lungd Jan 28, 2019
b4e45c1
Merge branch 'worm_crawl_half_resolution_membrane_fix' into development
lungd Jan 29, 2019
e3dc991
Merge branch 'improve_output' into development
lungd Jan 29, 2019
fb1553c
Merge remote-tracking branch 'upstream/development' into development
lungd Feb 8, 2019
c315248
Set local_NDRange_size to 32 (MAX_NEIGHBOR_COUNT). Better performance…
lungd Feb 11, 2019
0ada241
Test
lungd Feb 11, 2019
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
Prev Previous commit
Next Next commit
Fix skip_display_connections
  • Loading branch information
@lungd
lungd committed Jan 28, 2019
commit 62d4cac4b589bc7c715046f465cfb7b2f5aa2843
5 changes: 2 additions & 3 deletions src/owWorldSimulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,10 @@ void display(void) {
if (i < j) {
glColor4b(150 / 2, 125 / 2, 0, 100 / 2 /*alpha*/);

if (p_cpp[j * 4 + 3] > 2.25) {
if (skip_display_connections && (p_cpp[j * 4 + 3] > 2.25)) {
//glColor4b(250 / 2, 250 / 2, 200 / 2, 255 / 2); // agar
continue;
} else if ((p_cpp[i * 4 + 3] > 2.31) && (p_cpp[i * 4 + 3] < 2.33)) {
} else if (skip_display_connections && (p_cpp[i * 4 + 3] > 2.31) && (p_cpp[i * 4 + 3] < 2.33)) {
// agar particles which contacted the worm
continue;
}
Expand Down Expand Up @@ -385,7 +385,6 @@ void display(void) {
glColor4b(50 / 2, 125 / 2, 0, 255 / 2);
if (p_cpp[j * 4 + 3] > 2.25) {
glColor4b(250 / 2, 250 / 2, 200 / 2, 255 / 2); // agar
continue;
}
if ((p_cpp[i * 4 + 3] > 2.31) && (p_cpp[i * 4 + 3] < 2.33))
glColor4b(200 / 2, 250 / 2, 000 / 2,
Expand Down