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

Electrostatic pressure consistency #2409

Merged
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e0b49f3
Merge branch 'python' of https://github.com/espressomd/espresso into …
jonaslandsgesell Oct 10, 2018
0a3fb9a
Merge branch 'python' of https://github.com/espressomd/espresso into …
jonaslandsgesell Dec 7, 2018
8bddfac
add check
jonaslandsgesell Dec 7, 2018
3fea6f0
add check
jonaslandsgesell Dec 7, 2018
735e208
patch
jonaslandsgesell Dec 7, 2018
47a448b
imports
jonaslandsgesell Dec 7, 2018
fef2320
up
jonaslandsgesell Dec 7, 2018
a86fe43
Update p3m_electrostatic_pressure.py
jonaslandsgesell Dec 7, 2018
7162cc6
format
jonaslandsgesell Dec 7, 2018
0439567
Merge branch 'electrostatic_pressure_consistency' of github.com:jonas…
jonaslandsgesell Dec 7, 2018
34b84d9
Update p3m_electrostatic_pressure.py
jonaslandsgesell Dec 10, 2018
8b0f747
apply patch
jonaslandsgesell Dec 10, 2018
111f7df
exchange assert code
jonaslandsgesell Dec 10, 2018
e8ea34e
docstring for test
jonaslandsgesell Dec 10, 2018
1854f20
apply patch
jonaslandsgesell Dec 10, 2018
e8dacd3
reformulate comparison
jonaslandsgesell Dec 10, 2018
0ed0db8
year
jonaslandsgesell Dec 10, 2018
8e7f5ba
patch
jonaslandsgesell Dec 10, 2018
369d9ff
revert to np testing
jonaslandsgesell Dec 10, 2018
d633df9
changed comparison to maximal 2 percent deviation
jonaslandsgesell Dec 10, 2018
ad96ffe
changed comparison to maximal 2 percent deviation
jonaslandsgesell Dec 10, 2018
779dd88
patch
jonaslandsgesell Dec 10, 2018
faebdb7
Merge branch 'python' of https://github.com/espressomd/espresso into …
jonaslandsgesell Dec 11, 2018
19a6d85
empty
jonaslandsgesell Dec 12, 2018
59bb109
add tune skin
jonaslandsgesell Dec 17, 2018
3495d37
add warmup
jonaslandsgesell Dec 17, 2018
95351a6
patch
jonaslandsgesell Dec 17, 2018
be260e0
refactor pressure calculation in small python class
jonaslandsgesell Dec 18, 2018
6e452f5
patch
jonaslandsgesell Dec 18, 2018
0ea2791
new style class
jonaslandsgesell Dec 18, 2018
7686113
add LJ to required features
jonaslandsgesell Dec 18, 2018
b3e0aad
patch
jonaslandsgesell Dec 18, 2018
2820cb3
Merge branch 'python' of https://github.com/espressomd/espresso into …
jonaslandsgesell Dec 19, 2018
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
1 change: 1 addition & 0 deletions testsuite/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ python_test(FILE lb_boundary.py MAX_NUM_PROC 2)
python_test(FILE lb_streaming.py MAX_NUM_PROC 4)
python_test(FILE lb_shear.py MAX_NUM_PROC 2)
python_test(FILE lb_thermostat.py MAX_NUM_PROC 2)
python_test(FILE p3m_electrostatic_pressure.py MAX_NUM_PROC 2)

if(PY_H5PY)
python_test(FILE h5md.py MAX_NUM_PROC 2)
Expand Down
105 changes: 105 additions & 0 deletions testsuite/python/p3m_electrostatic_pressure.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#
# Copyright (C) 2013-2018 The ESPResSo project
#
# This file is part of ESPResSo.
#
# ESPResSo is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ESPResSo is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
from __future__ import print_function
import unittest as ut
import numpy as np
import numpy.testing as npt

import espressomd
from espressomd import electrostatics


@ut.skipIf(not espressomd.has_features(["ELECTROSTATICS"]),
"Features not available, skipping test!")
class ElectrostaticInteractionsTests(ut.TestCase):
# Handle to espresso system
system = espressomd.System(box_l=[50, 50, 50])

def setUp(self):
self.system.time_step = 0.01
self.kT = 0.5
self.system.thermostat.set_langevin(kT=self.kT, gamma=1.0)
self.system.seed = range(
self.system.cell_system.get_state()["n_nodes"])
self.system.non_bonded_inter[0, 0].lennard_jones.set_params(
epsilon=1.0, sigma=1.0, cutoff=2**(1.0 / 6.0), shift="auto")
num_part = 40
mass = 1
np.random.seed(seed=1)

for i in range(num_part):
self.system.part.add(pos=np.random.random(
3) * self.system.box_l, q=1, v=np.sqrt(self.kT / mass) * np.random.normal(loc=[0, 0, 0]))
self.system.part.add(pos=np.random.random(
3) * self.system.box_l, q=-1, v=np.sqrt(self.kT / mass) * np.random.normal(loc=[0, 0, 0]))

def pressure_via_volume_scaling(
self,
system,
kbT,
list_of_previous_values):
# taken from "Efficient pressure estimation in molecular simulations without evaluating the virial"
# only works so far for isotropic volume changes, i.e. the isotropic
# pressure
energy = system.analysis.energy()
Epot_old = energy["total"] - energy["kinetic"]
old_box_lengths = system.box_l
old_volume = np.prod(old_box_lengths)
dV_div_old_volume = 0.001
dV = -dV_div_old_volume * old_volume
new_volume = old_volume + dV
new_box_l = (new_volume)**(1. / 3.)
system.change_volume_and_rescale_particles(new_box_l, "xyz")
system.integrator.run(0)
energy = system.analysis.energy()
Epot_new = energy["total"] - energy["kinetic"]
system.change_volume_and_rescale_particles(old_box_lengths[0], "xyz")
system.integrator.run(0)
DeltaEpot = Epot_new - Epot_old
particle_number = len(system.part[:].id)
current_value = (new_volume / old_volume)**particle_number * \
np.exp(-DeltaEpot / kbT)
list_of_previous_values.append(current_value)
average_value = np.mean(list_of_previous_values)

pressure = kbT / dV * np.log(average_value)
return pressure

def test_p3m_pressure(self):
pressures_via_virial = []
pressures_via_volume_scaling = []
p3m = electrostatics.P3M(prefactor=2.0, accuracy=1e-3)
Copy link
Member

Choose a reason for hiding this comment

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

Maybe it's a good idea to also check the GPU version?

self.system.actors.add(p3m)
num_samples = 100
pressure_via_volume_scaling = np.nan
for i in range(num_samples):
self.system.integrator.run(100)
Copy link
Member

Choose a reason for hiding this comment

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

maybe we can use less integration steps?

Copy link
Member Author

Choose a reason for hiding this comment

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

this will have an impact on the accuracy. it is a statistical equivalence of the pressures only.

pressures_via_virial.append(
self.system.analysis.pressure()['total'])
pressure_via_volume_scaling = self.pressure_via_volume_scaling(
self.system, self.kT, pressures_via_volume_scaling)
pressure_virial = np.mean(pressures_via_virial)
ratio_pressure_virial_pressure_volume_scaling = pressure_via_volume_scaling / \
pressure_virial # should be 1 ideally
npt.assert_almost_equal(
ratio_pressure_virial_pressure_volume_scaling, 1.0, decimal=2)


if __name__ == "__main__":
ut.main()