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

Parametric weight function for DPD.... #3570

Merged
merged 2 commits into from
Mar 10, 2020

Conversation

bindgens1
Copy link
Member

@bindgens1 bindgens1 commented Mar 10, 2020

... with a parabolic weight function

Description of changes:

  • New optional parameter "k" in DPDInteraction for the exponent for the weight function

@bindgens1 bindgens1 changed the title Increase the Schmidt number for DPD fluids.... WIP Increase the Schmidt number for DPD fluids.... Mar 10, 2020
@codecov
Copy link

codecov bot commented Mar 10, 2020

Codecov Report

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

Impacted file tree graph

@@          Coverage Diff           @@
##           python   #3570   +/-   ##
======================================
- Coverage      88%     88%   -1%     
======================================
  Files         524     524           
  Lines       23598   23598           
======================================
- Hits        20772   20770    -2     
- Misses       2826    2828    +2
Impacted Files Coverage Δ
src/core/dpd.hpp 100% <ø> (ø) ⬆️
src/core/dpd.cpp 91% <100%> (ø) ⬆️
src/core/electrostatics_magnetostatics/p3m.cpp 85% <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 a4596e3...56362fc. Read the comment docs.

@fweik fweik changed the title WIP Increase the Schmidt number for DPD fluids.... WIP: Parametric weight function for DPD.... Mar 10, 2020
@fweik
Copy link
Contributor

fweik commented Mar 10, 2020

In principle the type parameter is obsolete now, no? type = 0 is just the same as k = 0.
Ah sorry, this is of course nonsens.

@bindgens1
Copy link
Member Author

yeah 1- x^0 is zero and the weight function is totally gone.

Couldn't find a way to simplify it even more.

@fweik fweik self-assigned this Mar 10, 2020
Copy link
Contributor

@fweik fweik left a comment

Choose a reason for hiding this comment

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

Ok, this looks good to me, but you should add a bit more documentation. In the main docs of the
DPD interaction (6.1.14. DPD interaction in doc/sphinx/inter_non-bonded.rst) you should
include the exponent factor into the formulas for the weight function and maybe add a literature
reference to the paper that describes the physical effect of changing the parameter.

@fweik fweik added this to the Espresso 4.2 milestone Mar 10, 2020
@fweik
Copy link
Contributor

fweik commented Mar 10, 2020

LGTM, thank you for your contribution. I'll take it from here.

@fweik fweik changed the title WIP: Parametric weight function for DPD.... Parametric weight function for DPD.... Mar 10, 2020
@fweik fweik added the automerge Merge with kodiak label Mar 10, 2020
@kodiakhq kodiakhq bot merged commit 5d6575e into espressomd:python Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants