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.

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

Opengl rasterization for union #3538

Merged
merged 5 commits into from
Feb 25, 2020

Conversation

KaiSzuttor
Copy link
Member

No description provided.

@@ -66,6 +67,14 @@ class Union : public Shape {
dist_compare);
}

bool is_inside(Utils::Vector3d const &pos) const override {
Copy link
Member Author

Choose a reason for hiding this comment

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

@fweik this override is necessary if the union shape is used in a LB boundary.

@@ -66,6 +67,14 @@ class Union : public Shape {
dist_compare);
}

bool is_inside(Utils::Vector3d const &pos) const override {
return boost::accumulate(
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 you should use any_of, which will short-cut and makes the intent clearer.

Copy link
Member Author

Choose a reason for hiding this comment

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

you probably mean all_of

@codecov
Copy link

codecov bot commented Feb 24, 2020

Codecov Report

Merging #3538 into python will decrease coverage by <1%.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           python   #3538   +/-   ##
======================================
- Coverage      87%     87%   -1%     
======================================
  Files         536     536           
  Lines       24180   24146   -34     
======================================
- Hits        21066   21014   -52     
- Misses       3114    3132   +18
Impacted Files Coverage Δ
src/core/global.cpp 75% <0%> (-8%) ⬇️
...rc/core/electrostatics_magnetostatics/scafacos.cpp 64% <0%> (-6%) ⬇️
src/core/polymer.cpp 93% <0%> (-6%) ⬇️
src/core/electrostatics_magnetostatics/dipole.cpp 58% <0%> (-6%) ⬇️
...re/bonded_interactions/bonded_interaction_data.cpp 88% <0%> (-3%) ⬇️
src/core/grid_based_algorithms/lb.cpp 95% <0%> (-1%) ⬇️
src/core/electrostatics_magnetostatics/p3m.cpp 85% <0%> (-1%) ⬇️
src/core/nonbonded_interactions/gay_berne.cpp 100% <0%> (ø) ⬆️
src/core/metadynamics.cpp 7% <0%> (ø) ⬆️
src/core/nonbonded_interactions/gay_berne.hpp 98% <0%> (+1%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4b740bd...d1e90df. Read the comment docs.

@KaiSzuttor
Copy link
Member Author

i will provide a test for LB boundary using the union shape which will make codecov happy

@fweik fweik added the automerge Merge with kodiak label Feb 25, 2020
@jngrad jngrad added this to the Espresso 4.2 milestone Feb 25, 2020
@kodiakhq kodiakhq bot merged commit 4ec615f into espressomd:python Feb 25, 2020
@KaiSzuttor KaiSzuttor deleted the opengl_rasterization branch February 25, 2020 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge with kodiak
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants