[Espressomd-maintainer] [espresso] Espresso was cloned from github. Then I reverted to the commit of Olaf L... (#63)

[icimrak]

...enz dated back to March 8th 2012, with the hash code 3faac07

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.

---

You can merge this Pull Request by running:

  git pull https://github.com/icimrak/espresso espresso-object-in-fluid

Or view, comment on, or merge it at:

  https://github.com/espressomd/espresso/pull/63

Commit Summary

• Espresso was cloned from github. Then I reverted to the commit of Ola…

File Changes

• A samples/cell-in-fluidUG/INPUT/CELLmesh-nodes.dat (400)
• A samples/cell-in-fluidUG/INPUT/CELLmesh-triangles.dat (796)
• A samples/cell-in-fluidUG/INPUT/TETRAmesh-nodes.dat (4)
• A samples/cell-in-fluidUG/INPUT/TETRAmesh-triangles.dat (5)
• A samples/cell-in-fluidUG/INPUT/mesh-nodes.dat (4)
• A samples/cell-in-fluidUG/INPUT/mesh-triangles.dat (5)
• A samples/cell-in-fluidUG/INPUT/mesh-triangles.dat~ (0)
• A samples/cell-in-fluidUG/TMP/bondsAreaGlobal0 (1)
• A samples/cell-in-fluidUG/TMP/bondsAreaLocal0 (796)
• A samples/cell-in-fluidUG/TMP/bondsBending0 (1194)
• A samples/cell-in-fluidUG/TMP/bondsStretching0 (1194)
• A samples/cell-in-fluidUG/TMP/bondsVolume0 (1)
• A samples/cell-in-fluidUG/TMP/bondsVolumeAreaGlobal0 (1)
• A samples/cell-in-fluidUG/TMP/createPart0 (400)
• A samples/cell-in-fluidUG/TMP/partAreaGlobal0 (796)
• A samples/cell-in-fluidUG/TMP/partAreaLocal0 (796)
• A samples/cell-in-fluidUG/TMP/partBending0 (1194)
• A samples/cell-in-fluidUG/TMP/partStretching0 (1194)
• A samples/cell-in-fluidUG/TMP/partVolume0 (796)
• A samples/cell-in-fluidUG/TMP/partVolumeAreaGlobal0 (796)
• A samples/cell-in-fluidUG/bondGenerator (0)
• A samples/cell-in-fluidUG/bondGenerator.c (557)
• A samples/cell-in-fluidUG/cell-in-fluidUG-CELL.tcl (131)
• A samples/cell-in-fluidUG/cell-in-fluidUG.pdf (0)
• A samples/cell-in-fluidUG/cell-in-fluidUG.tcl (131)
• A samples/cell-in-fluidUG/simEspresso.pdb (402)
• A samples/cell-in-fluidUG/simEspresso.psf (702)
• A samples/cell-in-fluidUG/vmd.log (4)
• A samples/cell-in-fluidUG/vmd_start.script (9)
• M scripts/auxiliary.tcl (5)
• M scripts/pdb.tcl (8)
• M src/Makefile.am (22)
• A src/acconfig.h.in~ (180)
• M src/constraint.c (1)
• M src/energy.h (5)
• A src/extra/area_force_global.c (51)
• A src/extra/area_force_global.h (427)
• A src/extra/area_force_local.c (52)
• A src/extra/area_force_local.h (130)
• A src/extra/bending_force.c (48)
• A src/extra/bending_force.h (142)
• A src/extra/mathtools.c (415)
• A src/extra/mathtools.h (54)
• A src/extra/stretching_force.c (46)
• A src/extra/stretching_force.h (114)
• A src/extra/tcl/area_force_global_tcl.c (62)
• A src/extra/tcl/area_force_global_tcl.h (37)
• A src/extra/tcl/area_force_local_tcl.c (64)
• A src/extra/tcl/area_force_local_tcl.h (39)
• A src/extra/tcl/bending_force_tcl.c (60)
• A src/extra/tcl/bending_force_tcl.h (35)
• A src/extra/tcl/stretching_force_tcl.c (66)
• A src/extra/tcl/stretching_force_tcl.h (35)
• A src/extra/tcl/volume_force_tcl.c (67)
• A src/extra/tcl/volume_force_tcl.h (41)
• A src/extra/volume_force.c (58)
• A src/extra/volume_force.h (402)
• M src/features.def (7)
• M src/forces.c (20)
• M src/forces.h (77)
• M src/interaction_data.c (10)
• M src/interaction_data.h (35)
• M src/myconfig-default.h (70)
• M src/pressure.h (15)
• M src/tcl/imd_tcl.c (15)
• M src/tcl/interaction_data_tcl.c (40)

Patch Links

• https://github.com/espressomd/espresso/pull/63.patch
• https://github.com/espressomd/espresso/pull/63.diff

—
Reply to this email directly or view it on GitHub.