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

Head #250

Merged
merged 344 commits into from
Apr 12, 2019
Merged

Head #250

merged 344 commits into from
Apr 12, 2019

Conversation

bogdan-tanygin
Copy link
Owner

Fixes #

Description of changes:

PR Checklist

  • Tests?
    • Interface
    • Core
  • Docs?

fweik and others added 30 commits March 12, 2019 15:29
@fweik
Formatting
db6e85b
@fweik
core: Pull up coulomb.prefactor
667a084
@fweik
Formatting
772b21a
@fweik
Merge branch 'python' into codingDay
44401ff
@fweik
core: Replace {d,}p3m_{common_parameter,}_pre_init by constructors
6a33e05
@fweik
core: fft: Refactor fft_find_comm_groups
4be8ef2
@fweik
core: utils: all_gatherv, gatherv fix + tests
591dd02
@fweik
Formatting
3a4f534
@reinaual
removed INTER_RF from default config
2152b6b
@reinaual
moved coulomb/dipole cutoff
f62eda9
@reinaual
Formatting
1ae1b88
@reinaual
Formatting
1b45cbd
@reinaual
added default case in dipole switches
21a0fa0
@reinaual
dipole/coulomb cutoff always defined
6211c00
@reinaual
Merge branch 'python' into codingDay
d48318f
@reinaual
added guards
6ebc2bf
@reinaual
Formatting
c2a93d2
@reinaual
fixed box_l vector
47cc190
@reinaual
fixed include for node_grid
c9f71ff
@fweik
core: Disabled not-implemented dipolar pressure calculation.
128ceee
@fweik
core: dipolar: Clean up pressure calculation.
d64465c
@fweik
core: coulomb: Cleanup
5743df1
@fweik
core: coulomb: Cleanup
fe5bfac
@RudolfWeeber
Merge branch 'python' of git://github.com/espressomd/espresso into pr…
5db0d86 
…2054
@RudolfWeeber
Merge commit 'refs/pull/2054/head' of git://github.com/espressomd/esp…
a4f7df3 
…resso into pr2054
@fweik
Merge branch 'python' of https://github.com/espressomd/espresso into …
1b1b2cf 
…codingDay
@fweik
Formatting
2043019
@fweik
maintainer: Fixed regression
5cbb080
@fweik
core: Fixed empty build
a5284a0
@fweik
Merge branch 'python' into codingDay
fa21ba7
fweik and others added 29 commits April 10, 2019 23:07
@fweik
Merge branch 'python' into gpu_availability
8650a43
@fweik
Merge pull request #2653 from RudolfWeeber/gpu_availability
5055147 
Only run gpu tests when a gpu is present
@fweik
Merge branch 'python' into utils
00377f4
@fweik
Merge pull request #2697 from fweik/utils
3ce5c5d 
Removed some code duplication
@fweik
Merge branch 'python' of github.com:espressomd/espresso into p3m_inter
5627eff
@KaiSzuttor
Merge branch 'python' into cuda10compat
740f0b2
@KaiSzuttor
maintainer: added config file for bors.
c8b92f2
@fweik
testsuite: Small explanation of the difference of p3m tests in coulom…
26ba8e3 
…b cloud wall.
@reinaual
added RF interface
8b1899d
@KaiSzuttor
maintainer: exclude temp branches in travis.
85a0c05
@KaiSzuttor
maintainer: exclude temp branches in gitlab ci.
08c616f
@reinaual
added RF test
fa03f40
@reinaual
added quartic interface
d58f823
@reinaual
added quartic test
e890dee
@KaiSzuttor
maintainer: increase timeout time for bors.
ef96060
@reinaual
Merge branch 'python' into coulombTests
657064a
@reinaual
indentation
113e304
@reinaual
Merge branch 'coulombTests' of https://github.com/reinaual/espresso i…
cdd6f5f 
…nto coulombTests
@reinaual
formatting
adaa641
@reinaual
renamed RF and fixed quartic parameters
216de24
@reinaual
docstrings
c5d566b
@reinaual
typo
9caca71
@bors @KaiSzuttor
Merge #2708
05e424d 
2708: maintainer: added config file for bors. r=KaiSzuttor a=KaiSzuttor




Co-authored-by: Kai Szuttor <[email protected]>
@bors @reinaual
Merge #2712
39fb7f7 
2712: Tests for Coulomb_RF and quartic r=KaiSzuttor a=reinaual

Fixes #2688

Co-authored-by: Alexander Reinauer <[email protected]>
Co-authored-by: Alexander Reinauer <[email protected]>
@KaiSzuttor
Merge branch 'python' of https://github.com/espressomd/espresso into …
9c0e21c 
…cuda10compat
@KaiSzuttor
Merge branch 'cuda10compat' of github.com:KaiSzuttor/espresso into cu…
6d16bda 
…da10compat
@KaiSzuttor
Formatting.
5ae0841
@KaiSzuttor
Merge branch 'python' of https://github.com/espressomd/espresso into …
52b239c 
…p3m_inter
@bors @KaiSzuttor @fweik
Merge #2463 #2662
2007aaa 
2463: Cuda10compat r=KaiSzuttor a=KaiSzuttor



2662: testsuite: Test both interpolaton code paths of p3m r=KaiSzuttor a=fweik

P3M can optionally use an interpolated window function, this tests both possible code paths.


Co-authored-by: Kai Szuttor <[email protected]>
Co-authored-by: Kai Szuttor <[email protected]>
Co-authored-by: Florian Weik <[email protected]>
Co-authored-by: Florian Weik <[email protected]>
@bogdan-tanygin bogdan-tanygin merged commit 1869924 into bogdan-tanygin:python Apr 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@bogdan-tanygin @fweik @reinaual @RudolfWeeber @KonradBreitsprecher @KaiSzuttor @jngrad