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

Stokesian Dynamics #220

Merged
merged 65 commits into from Apr 17, 2015
Merged

Stokesian Dynamics #220

merged 65 commits into from Apr 17, 2015

Conversation

dschwoerer
Copy link
Contributor

With testcases and documentation
The SD implementation includes:

  • lubrication correction
  • Ewald summation for PBCs
  • thermalization

 * iterative solver
 * avoids double counting of R_2B^inf
 * and more
Conflicts:
	src/integrate_sd.cpp
	src/integrate_sd_cuda.cu
	src/tcl/integrate_sd_tcl.cpp
Conflicts:
	src/Makefile.am
	src/global.cpp
	src/global.hpp
	src/tcl/initialize_interpreter.cpp
additional BICGStab and GMRes have precondioner
Conflicts:
	src/Makefile.am
	src/core/global.cpp
	src/core/global.hpp
	src/tcl/initialize_interpreter.cpp
…ix multiplication

* periodic boundary conditions are missing, rest should work
Conflicts:
	src/core/global.cpp
	src/core/global.hpp
* speed of wavespace part is fine
* splitted code in several files
Conflicts:
	src/tcl/statistics_observable_tcl.cpp
Conflicts:
	testsuite/correlation_checkpoint.tcl
Conflicts:
	doc/ug/setup.tex
	src/core/thermostat.hpp
	src/tcl/Makefile.am
	src/tcl/thermostat_tcl.cpp
fweik added a commit that referenced this pull request Apr 17, 2015
@fweik fweik merged commit 354b8e6 into espressomd:master Apr 17, 2015
jngrad pushed a commit to jngrad/espresso that referenced this pull request Jan 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants