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
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
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
Committing
Merge branch 'kessel_master' into espresso-object-in-fluid
I used the citebox environment, clered mpi_rank calls, cleaned all the warnings at the compilation...
just testing
The previous commits were not correct.