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

Propagate DPD RNG if Langevin active at the same time #3352

Merged
merged 4 commits into from
Dec 3, 2019
Merged

Propagate DPD RNG if Langevin active at the same time #3352

merged 4 commits into from
Dec 3, 2019

Conversation

KaiSzuttor
Copy link
Member

Since we switched to the counter based Philox RNG, the DPD thermostat was not propagated if also the Langevin thermostat was active.

@KaiSzuttor KaiSzuttor requested a review from fweik December 3, 2019 15:13
@KaiSzuttor KaiSzuttor changed the title Fix DPD Propagate DPD RNG if Langevin active at the same time Dec 3, 2019
@codecov
Copy link

codecov bot commented Dec 3, 2019 •
edited
Loading

Codecov Report

Merging #3352 into python will decrease coverage by <1%.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff           @@
##           python   #3352   +/-   ##
======================================
- Coverage      86%     86%   -1%     
======================================
  Files         538     538           
  Lines       25312   25312           
======================================
- Hits        21785   21784    -1     
- Misses       3527    3528    +1
Impacted Files Coverage Δ
src/core/integrate.cpp 80% <100%> (ø) ⬆️
src/core/particle_data.cpp 97% <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 bebaa24...b081309. Read the comment docs.

@fweik fweik added this to the Espresso 4.1.2 milestone Dec 3, 2019
@fweik
Copy link
Contributor

fweik commented Dec 3, 2019

bors r+

bors bot added a commit that referenced this pull request Dec 3, 2019
@bors @KaiSzuttor
Merge #3352
6f89e49 
3352: Propagate DPD RNG if Langevin active at the same time r=fweik a=KaiSzuttor

Since we switched to the counter based Philox RNG, the DPD thermostat was not propagated if also the Langevin thermostat was active.

Co-authored-by: Kai Szuttor <kai@icp.uni-stuttgart.de>
@bors
Copy link
Contributor

bors bot commented Dec 3, 2019

Build succeeded

@bors bors bot merged commit b081309 into espressomd:python Dec 3, 2019
@KaiSzuttor KaiSzuttor deleted the fix_dpd branch December 4, 2019 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fweik fweik fweik approved these changes

Assignees
No one assigned
Labels
BugFix Core
Projects
None yet
Milestone
Espresso 4.1.2
Development

Successfully merging this pull request may close these issues.
2 participants
@KaiSzuttor @fweik