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

Recalc cutoff on skin change #3003

Closed
wants to merge 10 commits into from
Closed

Recalc cutoff on skin change #3003

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c68f777
recalc cutoff on skin change
KonradBreitsprecher Jul 24, 2019
70d752e
small epsilon for mmm2d cutoff
KonradBreitsprecher Jul 24, 2019
e7bb04e
removed print
KonradBreitsprecher Jul 24, 2019
7992642
Update coulomb.cpp
KonradBreitsprecher Jul 25, 2019
5a8a58e
Merge branch 'python' into skin_and_cutoff
KonradBreitsprecher Jul 26, 2019
7c44b55
Merge branch 'python' of https://github.com/espressomd/espresso into …
KonradBreitsprecher Aug 11, 2019
bed2d3f
use numeric min
KonradBreitsprecher Aug 21, 2019
e5fb562
Merge branch 'python' of https://github.com/espressomd/espresso into …
KonradBreitsprecher Aug 21, 2019
ba1d6b5
test to cover max_cut behavior of mmm2d activation
KonradBreitsprecher Aug 21, 2019
c53e6ad
Merge branch 'skin_and_cutoff' of https://github.com/KonradBreitsprec…
KonradBreitsprecher Aug 21, 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
4 changes: 2 additions & 2 deletions src/core/electrostatics_magnetostatics/coulomb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ double cutoff(const Utils::Vector3d &box_l) {
switch (coulomb.method) {
case COULOMB_MMM1D:
return std::numeric_limits<double>::infinity();
case COULOMB_MMM2D:
return 1e-40;
fweik marked this conversation as resolved.
Show resolved Hide resolved
#ifdef P3M
case COULOMB_ELC_P3M:
return std::max(elc_params.space_layer, p3m.params.r_cut_iL * box_l[0]);
case COULOMB_MMM2D:
return layer_h - skin;
case COULOMB_P3M_GPU:
case COULOMB_P3M:
/* do not use precalculated r_cut here, might not be set yet */
Expand Down