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

Merge the espresso head fork to the espresso-ffans #3

Merged
merged 56 commits into from
Nov 15, 2015

Conversation

bogdan-tanygin
Copy link
Owner

No description provided.

RudolfWeeber and others added 30 commits September 7, 2012 14:03
Conflicts:
	src/core/collision.cpp
	src/core/mpifake/mpi.h
Conflicts:
	scripts/blockfile_support.tcl
	src/core/collision.cpp
	testsuite/collision-detection-centers.tcl
Conflicts:
	src/core/collision.cpp
	src/core/collision.hpp
	src/tcl/collision_tcl.cpp
RudolfWeeber and others added 23 commits October 26, 2015 15:08
…ich vs are related rotate if ROTATION_PER_PARTICLE is on
Fixes bugs in dipolar direct sum on gpu
Deprecation warnings for undocumented analyze cmds
…015_11_02

2 additional collision_detection schemes, cleanup, memleak fix for GHOSTS_HAVE_BONDS
bogdan-tanygin added a commit that referenced this pull request Nov 15, 2015
Merge the espresso head fork to the espresso-ffans
@bogdan-tanygin bogdan-tanygin merged commit ae51f03 into bogdan-tanygin:master Nov 15, 2015
bogdan-tanygin pushed a commit that referenced this pull request Jul 25, 2017
bogdan-tanygin pushed a commit that referenced this pull request Jun 8, 2018
bogdan-tanygin pushed a commit that referenced this pull request Aug 12, 2018
bogdan-tanygin pushed a commit that referenced this pull request Mar 17, 2019
bogdan-tanygin pushed a commit that referenced this pull request Oct 26, 2019
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.

5 participants