[Espressomd-maintainer] [espresso] Object in fluid (#66)

[mgusenbauer]

Hi Axel,

according to you conversation with Ivan i changed the following:

• added implementation into ug (5.4, 13)
• changed extra-->fsi in the code
• deleted the 'upscale' from imd

for questions, my skype name is: gusi04

Markus

---

You can merge this Pull Request by running:

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

Or view, comment on, or merge it at:

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

Commit Summary

• Espresso was cloned from github. Then I reverted to the commit of Ola…
• First merger to current repo
• Hi Axel,

File Changes

• A TODO.txt (20)
• M doc/ug/inter.tex (209)
• M doc/ug/otherrefs.bib (32)
• M doc/ug/ug.tex (1)
• A samples/cell-in-fluid/INPUT/CELLmesh-nodes.dat (400)
• A samples/cell-in-fluid/INPUT/CELLmesh-triangles.dat (796)
• A samples/cell-in-fluid/INPUT/TETRAmesh-nodes.dat (4)
• A samples/cell-in-fluid/INPUT/TETRAmesh-triangles.dat (5)
• A samples/cell-in-fluid/INPUT/mesh-nodes.dat (4)
• A samples/cell-in-fluid/INPUT/mesh-triangles.dat (5)
• A samples/cell-in-fluid/bondGenerator (0)
• A samples/cell-in-fluid/bondGenerator.c (557)
• A samples/cell-in-fluid/cell-in-fluidUG.pdf (0)
• A samples/cell-in-fluid/cell-in-fluidUG.tcl (131)
• M src/Makefile.am (19)
• M src/constraint.c (1)
• M src/energy.h (5)
• M src/features.def (7)
• M src/forces.c (20)
• M src/forces.h (77)
• A src/fsi/area_force_global.c (51)
• A src/fsi/area_force_global.h (427)
• A src/fsi/area_force_local.c (52)
• A src/fsi/area_force_local.h (130)
• A src/fsi/bending_force.c (48)
• A src/fsi/bending_force.h (142)
• A src/fsi/mathtools.c (415)
• A src/fsi/mathtools.h (54)
• A src/fsi/stretching_force.c (46)
• A src/fsi/stretching_force.h (114)
• A src/fsi/volume_force.c (58)
• A src/fsi/volume_force.h (402)
• M src/interaction_data.c (10)
• M src/interaction_data.h (35)
• M src/myconfig-default.h (77)
• M src/pressure.h (15)
• A src/tcl/fsi/area_force_global_tcl.c (62)
• A src/tcl/fsi/area_force_global_tcl.h (37)
• A src/tcl/fsi/area_force_local_tcl.c (64)
• A src/tcl/fsi/area_force_local_tcl.h (39)
• A src/tcl/fsi/bending_force_tcl.c (60)
• A src/tcl/fsi/bending_force_tcl.h (35)
• A src/tcl/fsi/stretching_force_tcl.c (66)
• A src/tcl/fsi/stretching_force_tcl.h (35)
• A src/tcl/fsi/volume_force_tcl.c (67)
• A src/tcl/fsi/volume_force_tcl.h (41)
• M src/tcl/imd_tcl.c (1)
• M src/tcl/interaction_data_tcl.c (40)

Patch Links

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

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