Espresso was cloned from github. Then I reverted to the commit of Olaf Lenz dated back to March 8th 2012, with the hash code 3faac07ec595cd1bca6f45c9ee88fbaa4018bd1c
so that I have the original code of release 3.1.0. The reason for this was this was the code we have enriched with our new functionality of object-in-fluid.

Then I started a new branch named espresso-object-in-fluid. I added all the changes, together with the working example located at samples/cell-in-fluidUG. I emphasize, that the binary bondGenerator has to be compiled before you run the tcl script cell-in-fluidUG.tcl.

Good luck with testing. I am often online on skype icimrak.

Cheers.
First merger to current repo
Just testing how to commit
Hi Axel,

here are the changes due to your suggestions to Ivan:

- changed the code according to extra/ --> fsi/
- added our implementation in the ug (5.4, 13)
- deleted 'upscale' from the imd commands

Hopefully it works, as it is the first time I am using github.

Best regards,
Markus
testing
Merged from Ivan
Merge branch 'master' of git://github.com/espressomd/espresso into object-in-fluid
Some more fixes and lots of comments
Minor add
galilei is all finished up, must still work on the reactions
Merge branch 'object-in-fluid' of git://github.com/arnolda/espresso
I solved some issues from the TODO.txt.
Now the previous commit is ok.

Ivan
mathtools were removed. I either deleted unnecassary functions, or replaced the existing ones from utils.h or I added new function to utils.h, they are located at the end of utils.h
mathtools were removed. I either deleted unnecassary functions, or replaced the existing ones from utils.h or I added new function to utils.h, they are located at the end of utils.h
Merge branch 'master' of https://github.com/icimrak/espresso
Some issues resolved from TODO.txt, namely
- I removed the ifdef statements for stretching, bending and local_area forces.
- I fixed the hardcoded paths in samples
This commit updates the following elements of ESPResSo.
1) It removes the Tcl functions: stop_particles, stopParticles, system_com, system_com_vel, and galileiTransformParticles, which were in the auxiliary.tcl script.
2) It replaces these with MPI functions: kill_particle_motion, kill_particle_forces, system_CMS, system_CMS_velocity, and galilei_transform (respectively). These new functions are incorporated in a new feature called 'GALILEI'.
3) It changes the Hat-potential entry in the user guide to be more clear on what the cut-off radius is and what the radial dependence is.
4) It updates the reaction code with two options:
   (a) Letting each reactant interact only with one catalyst particle during each time step. This enables the creation of catalytic surfaces comprised of catalyst particles (with arbitrary density), yet maintaining a surface-density-independent reaction rate near the surface.
   (b) A print option is given to the reaction command, such that the specific input parameters can be returned to the Tcl level.
5) All the necessary  updates are made in the user guide.
Merge branches 'galilei' and 'galilei_transform' into galilei_transform
Also included the files I missed earlier.