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

Jump to bottom

Remove Affinity #3225

Merged
merged 4 commits into from
Oct 2, 2019
Merged

Remove Affinity #3225

merged 4 commits into from
Oct 2, 2019

Conversation

fweik
Copy link
Contributor

@fweik fweik commented Oct 1, 2019

Fixes #3224.

@fweik fweik requested a review from jngrad October 1, 2019 19:39
@codecov
Copy link

codecov bot commented Oct 1, 2019 •
edited
Loading

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           python   #3225    +/-   ##
=======================================
+ Coverage      85%     85%   +<1%     
=======================================
  Files         530     528     -2     
  Lines       26025   25805   -220     
=======================================
- Hits        22158   22150     -8     
+ Misses       3867    3655   -212
Impacted Files Coverage Δ
...bonded_interactions/nonbonded_interaction_data.hpp 100% <ø> (ø) ⬆️
src/core/particle_data.hpp 97% <ø> (ø) ⬆️
...bonded_interactions/nonbonded_interaction_data.cpp 100% <ø> (ø) ⬆️
src/core/particle_data.cpp 95% <ø> (-1%) ⬇️
src/core/forces_inline.hpp 84% <ø> (ø) ⬆️

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 fc08e8a...aeddcb6. Read the comment docs.

jngrad
jngrad approved these changes Oct 2, 2019
View reviewed changes
Copy link
Member

@jngrad jngrad left a comment

Choose a reason for hiding this comment

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

LGTM

src/core/forces_inline.hpp Outdated Show resolved Hide resolved
@KaiSzuttor
Copy link
Member

skip ci is not the best idea... you will never get a green light from ci now.

@fweik
Copy link
Contributor Author

fweik commented Oct 2, 2019

Well that is a bug, no?

@fweik
Copy link
Contributor Author

fweik commented Oct 2, 2019

bors r=KaiSzuttor

bors bot added a commit that referenced this pull request Oct 2, 2019
@bors @fweik
Merge #3225
9dc1e06 
3225: Remove Affinity r=KaiSzuttor a=fweik

Fixes #3224.


Co-authored-by: Florian Weik <[email protected]>
@KaiSzuttor
Copy link
Member

yes

@KaiSzuttor
Copy link
Member

i'm not sure, but I think bors will fail to push since the green status of CI is required

@KaiSzuttor
Copy link
Member

I don't want to invest time for repairing this bug since we will have a transition to github actions soon

@bors
Copy link
Contributor

bors bot commented Oct 2, 2019

Build succeeded

@bors bors bot merged commit aeddcb6 into espressomd:python Oct 2, 2019
@fweik fweik deleted the affinity branch October 2, 2019 11:12
@jngrad jngrad added this to the Espresso 4.2 milestone May 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jngrad jngrad jngrad approved these changes

@KaiSzuttor KaiSzuttor KaiSzuttor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Espresso 4.2.0
Development

Successfully merging this pull request may close these issues.

Remove AFFINITY
3 participants
@fweik @KaiSzuttor @jngrad