Browse files

Added missing copyright headers, moved directory fsi to object-in-fluid.

  • Loading branch information...
1 parent 8913322 commit 9928f27bf361a4a51f74e5d117d9d0a4018f4f58 @olenz olenz committed May 10, 2013
Showing with 250 additions and 138 deletions.
  1. +22 −11 README
  2. +1 −1 doc/ug/fsi.tex
  3. +1 −1 maintainer/files_with_header.sh
  4. +6 −0 maintainer/jenkins/ESPResSo-nightly-3core.sh
  5. +6 −0 maintainer/jenkins/ESPResSo-nightly-4core.sh
  6. +6 −0 maintainer/jenkins/ESPResSo-nightly-CUDA.sh
  7. +6 −0 maintainer/jenkins/ESPResSo-nightly-debug.sh
  8. +6 −0 maintainer/jenkins/ESPResSo-nightly-distcheck.sh
  9. +6 −0 maintainer/jenkins/ESPResSo-nightly-mpich.sh
  10. +6 −0 maintainer/jenkins/ESPResSo-nightly-nofftw.sh
  11. +6 −0 maintainer/jenkins/ESPResSo-nightly-nompi.sh
  12. +6 −0 maintainer/jenkins/ESPResSo-nightly.sh
  13. +6 −0 maintainer/jenkins/ESPResSo.sh
  14. +6 −0 maintainer/jenkins/common.sh
  15. +17 −0 samples/object-in-fluid/object-in-fluid.tcl
  16. +17 −0 samples/object-in-fluid/object-in-fluidUG/object-in-fluidUG.tex
  17. +1 −1 scripts/blockfile_support.tcl
  18. +18 −0 scripts/object_in_fluid.tcl
  19. +17 −12 src/Makefile.am
  20. +5 −5 src/energy.h
  21. +5 −6 src/forces.h
  22. +1 −1 src/galilei.c
  23. +1 −1 src/galilei.h
  24. +2 −2 src/interaction_data.h
  25. +2 −3 src/{fsi → object-in-fluid}/area_force_global.c
  26. +3 −4 src/{fsi → object-in-fluid}/area_force_global.h
  27. +2 −3 src/{fsi → object-in-fluid}/area_force_local.c
  28. +3 −4 src/{fsi → object-in-fluid}/area_force_local.h
  29. +1 −2 src/{fsi → object-in-fluid}/bending_force.c
  30. +3 −4 src/{fsi → object-in-fluid}/bending_force.h
  31. +1 −2 src/{fsi → object-in-fluid}/stretching_force.c
  32. +3 −4 src/{fsi → object-in-fluid}/stretching_force.h
  33. +1 −1 src/{fsi → object-in-fluid}/volume_force.c
  34. +3 −4 src/{fsi → object-in-fluid}/volume_force.h
  35. +1 −1 src/tcl/galilei_tcl.c
  36. +1 −1 src/tcl/galilei_tcl.h
  37. +5 −5 src/tcl/interaction_data_tcl.c
  38. +2 −2 src/tcl/interaction_data_tcl.h
  39. +3 −4 src/tcl/{fsi → object-in-fluid}/area_force_global_tcl.c
  40. +3 −4 src/tcl/{fsi → object-in-fluid}/area_force_global_tcl.h
  41. +3 −4 src/tcl/{fsi → object-in-fluid}/area_force_local_tcl.c
  42. +3 −4 src/tcl/{fsi → object-in-fluid}/area_force_local_tcl.h
  43. +4 −5 src/tcl/{fsi → object-in-fluid}/bending_force_tcl.c
  44. +1 −1 src/tcl/{fsi → object-in-fluid}/bending_force_tcl.h
  45. +4 −5 src/tcl/{fsi → object-in-fluid}/stretching_force_tcl.c
  46. +4 −6 src/tcl/{fsi → object-in-fluid}/stretching_force_tcl.h
  47. +4 −5 src/tcl/{fsi → object-in-fluid}/volume_force_tcl.c
  48. +4 −5 src/tcl/{fsi → object-in-fluid}/volume_force_tcl.h
  49. +1 −1 testsuite/lb_fluid_coupling.tcl
  50. +1 −1 testsuite/lb_fluid_coupling_gpu.tcl
  51. +1 −1 testsuite/lb_planar.tcl
  52. +1 −1 testsuite/lb_planar_gpu.tcl
  53. +1 −1 testsuite/lb_stokes_sphere_gpu.tcl
  54. +7 −9 testsuite/object_in_fluid.tcl
  55. 0 testsuite/{object_in_fluid_system.data.final → object_in_fluid_system-final.data}
  56. 0 testsuite/{object_in_fluid_system.data.init → object_in_fluid_system-init.data}
  57. 0 testsuite/{object_in_fluid_system.data.nodes → object_in_fluid_system-nodes.data}
  58. 0 testsuite/{object_in_fluid_system.data.triangles → object_in_fluid_system-triangles.data}
View
33 README
@@ -129,6 +129,11 @@ samples/adress/cg_ic_tetra.tab
samples/adress/cg_tetra.tab
samples/adress/thermo_force.tab
samples/maggs_correct_rdf.dat
+samples/object-in-fluid/object-in-fluidUG/figures/arealocal.eps
+samples/object-in-fluid/object-in-fluidUG/figures/bending.eps
+samples/object-in-fluid/object-in-fluidUG/figures/bloodCell.eps
+samples/object-in-fluid/object-in-fluidUG/figures/stretching.eps
+samples/object-in-fluid/object-in-fluidUG/figures/volume.eps
testsuite/analysis_system.data.00.gz
testsuite/analysis_system.data.01.gz
testsuite/analysis_system.data.02.gz
@@ -141,34 +146,40 @@ testsuite/analysis_system.data.08.gz
testsuite/analysis_system.data.09.gz
testsuite/analysis_system.data.10.gz
testsuite/analysis_system.data.chk
+testsuite/angle_cosine.data
+testsuite/angle_cossquare.data
+testsuite/angle_harmonic.data
testsuite/comfixed_system.data
testsuite/comforce_system.data
testsuite/constraints_system.data
testsuite/dh_system.data
testsuite/el2d_system.data
testsuite/el2d_system_die.data
-testsuite/fene_system.data.gz
testsuite/gb_system.data
-testsuite/harm_system.data.gz
-testsuite/intpbc_system.data.gz
-testsuite/intppbc_system.data.gz
testsuite/lb_system.data
testsuite/lj-cos_system.data
-testsuite/lj1.tab
-testsuite/lj2.tab
-testsuite/lj3.tab
testsuite/lj_system.data
+testsuite/maggs_correct_rdf.data
testsuite/mass_system.data
+testsuite/mdlc_expected_energy.data
+testsuite/mdlc_expected_force_torque.data
+testsuite/mdlc_system.data
testsuite/mmm1d_system.data
testsuite/npt_lj_system.data
+testsuite/object_in_fluid_system-final.data
+testsuite/object_in_fluid_system-init.data
+testsuite/object_in_fluid_system-nodes.data
+testsuite/object_in_fluid_system-triangles.data
+testsuite/p3m_magnetostatics2_expected.data
+testsuite/p3m_magnetostatics2_system.data
+testsuite/p3m_magnetostatics.data
testsuite/p3m_system.data
+testsuite/p3m_wall_system.data
+testsuite/pe_micelle.data
testsuite/tabulated_system.data
testsuite/thermostat.data
testsuite/thermostat_rot.data
-testsuite/uwerr_test.data
-testsuite/Makefile.am
-testsuite/p3m-magnetostatics-t1.data
-testsuite/pe_micelle.data
+testsuite/uwerr.data
"Copyright (C) 2010,2011,2012,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
View
2 doc/ug/fsi.tex
@@ -1,4 +1,4 @@
-% Copyright (C) 2010,2011,2012 The ESPResSo project
+% Copyright (C) 2010,2011,2012,2013 The ESPResSo project
%
% This file is part of ESPResSo.
%
View
2 maintainer/files_with_header.sh
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
git ls-files --exclude-standard |
-egrep -v '\.(gz|data|dat|tab|chk|jpg|png|pdf|fig|gif|xcf|bib|vtf|svg|ico)$' |
+egrep -v '\.(gz|data|dat|tab|chk|jpg|png|pdf|fig|gif|xcf|bib|vtf|svg|ico|eps)$' |
egrep -v '^testsuite/configs/|^old/' |
egrep -v '(ChangeLog|AUTHORS|COPYING|bootstrap\.sh)' |
egrep -v '(\.gitignore|pkgIndex\.tcl)' |
View
6 maintainer/jenkins/ESPResSo-nightly-3core.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/ESPResSo-nightly-4core.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/ESPResSo-nightly-CUDA.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/ESPResSo-nightly-debug.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/ESPResSo-nightly-distcheck.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -ex
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
# clean up dir before build
View
6 maintainer/jenkins/ESPResSo-nightly-mpich.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/ESPResSo-nightly-nofftw.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
echo "#error ERROR: fftw not really present but used somewhere." > src/fftw3.h
View
6 maintainer/jenkins/ESPResSo-nightly-nompi.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/ESPResSo-nightly.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/ESPResSo.sh
@@ -1,4 +1,10 @@
#!/bin/bash --login -e
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
source maintainer/jenkins/common.sh
bootstrap
View
6 maintainer/jenkins/common.sh
@@ -1,3 +1,9 @@
+# Copyright (C) 2013 Olaf Lenz
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
if ((`ps -o nice= $$` < 5)); then
renice -n 5 $$
fi
View
17 samples/object-in-fluid/object-in-fluid.tcl
@@ -1,3 +1,20 @@
+# Copyright (C) 2012,2013 The ESPResSo project
+#
+# This file is part of ESPResSo.
+#
+# ESPResSo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# ESPResSo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
# general parameters
############################################################################
View
17 samples/object-in-fluid/object-in-fluidUG/object-in-fluidUG.tex
@@ -1,3 +1,20 @@
+% Copyright (C) 2012,2013 The ESPResSo project
+%
+% This file is part of ESPResSo.
+%
+% ESPResSo is free software: you can redistribute it and/or modify it
+% under the terms of the GNU General Public License as published by the
+% Free Software Foundation, either version 3 of the License, or (at your
+% option) any later version.
+%
+% ESPResSo is distributed in the hope that it will be useful, but
+% WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+% General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program. If not, see <http://www.gnu.org/licenses/>.
+%
\documentclass[a4paper]{article}
\usepackage{graphicx}
\usepackage{verbatim}
View
2 scripts/blockfile_support.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2010,2011,2012 The ESPResSo project
+# Copyright (C) 2010,2011,2012,2013 The ESPResSo project
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
# Max-Planck-Institute for Polymer Research, Theory Group
#
View
18 scripts/object_in_fluid.tcl
@@ -1,3 +1,21 @@
+# Copyright (C) 2012,2013 The ESPResSo project
+#
+# This file is part of ESPResSo.
+#
+# ESPResSo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# ESPResSo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
proc init_objects_in_fluid {} {
# define oif-variables
View
29 src/Makefile.am
@@ -116,7 +116,7 @@ libEspresso_a_SOURCES += \
steppot.c steppot.h \
tab.c tab.h \
tunable_slip.c tunable_slip.h
-
+
# bonded potentials and forces
libEspresso_a_SOURCES += \
angle.c angle.h \
@@ -130,12 +130,12 @@ libEspresso_a_SOURCES += \
harmonic.c harmonic.h \
overlap.c overlap.h \
subt_lj.c subt_lj.h \
- fsi/area_force_local.c fsi/area_force_local.h \
- fsi/area_force_global.c fsi/area_force_global.h \
- fsi/bending_force.c fsi/bending_force.h \
- fsi/stretching_force.c fsi/stretching_force.h \
- fsi/volume_force.c fsi/volume_force.h
-
+ object-in-fluid/area_force_local.c object-in-fluid/area_force_local.h \
+ object-in-fluid/area_force_global.c object-in-fluid/area_force_global.h \
+ object-in-fluid/bending_force.c object-in-fluid/bending_force.h \
+ object-in-fluid/stretching_force.c object-in-fluid/stretching_force.h \
+ object-in-fluid/volume_force.c object-in-fluid/volume_force.h
+
# Coulomb methods
libEspresso_a_SOURCES += \
debye_hueckel.c debye_hueckel.h \
@@ -235,11 +235,16 @@ libEspresso_a_SOURCES += \
tcl/harmonic_tcl.c tcl/harmonic_tcl.h \
tcl/overlap_tcl.c tcl/overlap_tcl.h \
tcl/subt_lj_tcl.c tcl/subt_lj_tcl.h \
- tcl/fsi/area_force_local_tcl.c tcl/fsi/area_force_local_tcl.h \
- tcl/fsi/area_force_global_tcl.c tcl/fsi/area_force_global_tcl.h \
- tcl/fsi/bending_force_tcl.c tcl/fsi/bending_force_tcl.h \
- tcl/fsi/stretching_force_tcl.c tcl/fsi/stretching_force_tcl.h \
- tcl/fsi/volume_force_tcl.c tcl/fsi/volume_force_tcl.h
+ tcl/object-in-fluid/area_force_local_tcl.c \
+ tcl/object-in-fluid/area_force_local_tcl.h \
+ tcl/object-in-fluid/area_force_global_tcl.c \
+ tcl/object-in-fluid/area_force_global_tcl.h \
+ tcl/object-in-fluid/bending_force_tcl.c \
+ tcl/object-in-fluid/bending_force_tcl.h \
+ tcl/object-in-fluid/stretching_force_tcl.c \
+ tcl/object-in-fluid/stretching_force_tcl.h \
+ tcl/object-in-fluid/volume_force_tcl.c \
+ tcl/object-in-fluid/volume_force_tcl.h
# Coulomb methods
libEspresso_a_SOURCES += \
View
10 src/energy.h
@@ -47,11 +47,11 @@
#include "overlap.h"
#include "gb.h"
#include "fene.h"
-#include "fsi/stretching_force.h"
-#include "fsi/area_force_local.h"
-#include "fsi/area_force_global.h"
-#include "fsi/bending_force.h"
-#include "fsi/volume_force.h"
+#include "object-in-fluid/stretching_force.h"
+#include "object-in-fluid/area_force_local.h"
+#include "object-in-fluid/area_force_global.h"
+#include "object-in-fluid/bending_force.h"
+#include "object-in-fluid/volume_force.h"
#include "harmonic.h"
#include "subt_lj.h"
#include "angle.h"
View
11 src/forces.h
@@ -1,4 +1,3 @@
-
/*
Copyright (C) 2010,2012,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
@@ -58,11 +57,11 @@
#include "ljangle.h"
#include "gb.h"
#include "fene.h"
-#include "fsi/stretching_force.h"
-#include "fsi/area_force_local.h"
-#include "fsi/area_force_global.h"
-#include "fsi/bending_force.h"
-#include "fsi/volume_force.h"
+#include "object-in-fluid/stretching_force.h"
+#include "object-in-fluid/area_force_local.h"
+#include "object-in-fluid/area_force_global.h"
+#include "object-in-fluid/bending_force.h"
+#include "object-in-fluid/volume_force.h"
#include "harmonic.h"
#include "subt_lj.h"
#include "angle.h"
View
2 src/galilei.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010,2011,2012 The ESPResSo project
+ Copyright (C) 2010,2011,2012,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
Max-Planck-Institute for Polymer Research, Theory Group
View
2 src/galilei.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010,2011,2012 The ESPResSo project
+ Copyright (C) 2010,2011,2012,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
Max-Planck-Institute for Polymer Research, Theory Group
View
4 src/interaction_data.h
@@ -18,8 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef IA_DATA_H
-#define IA_DATA_H
+#ifndef _INTERACTION_DATA_H
+#define _INTERACTION_DATA_H
/** \file interaction_data.h
Various procedures concerning interactions between particles.
*/
View
5 src/fsi/area_force_global.c → src/object-in-fluid/area_force_global.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -24,7 +23,7 @@
* \ref forces.c
*/
-#include "fsi/area_force_global.h"
+#include "area_force_global.h"
#include "communication.h"
View
7 src/fsi/area_force_global.h → src/object-in-fluid/area_force_global.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AREA_FORCE_GLOBAL_H
-#define AREA_FORCE_GLOBAL_H
+#ifndef _OBJECT_IN_FLUID_AREA_FORCE_GLOBAL_H
+#define _OBJECT_IN_FLUID_AREA_FORCE_GLOBAL_H
/** \file area_force_global.h
* Routines to calculate the AREA_FORCE_GLOBAL energy or/and and force
* for a particle triple (triangle from mesh). (Dupin2007)
View
5 src/fsi/area_force_local.c → src/object-in-fluid/area_force_local.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -24,7 +23,7 @@
* \ref forces.c
*/
-#include "fsi/area_force_local.h"
+#include "area_force_local.h"
#include "communication.h"
View
7 src/fsi/area_force_local.h → src/object-in-fluid/area_force_local.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AREA_FORCE_LOCAL_H
-#define AREA_FORCE_LOCAL_H
+#ifndef _OBJECT_IN_FLUID_AREA_FORCE_LOCAL_H
+#define _OBJECT_IN_FLUID_AREA_FORCE_LOCAL_H
/** \file area_force_local.h
* Routines to calculate the AREA_FORCE_LOCAL energy or/and and force
* for a particle triple (triangle from mesh). (Dupin2007)
View
3 src/fsi/bending_force.c → src/object-in-fluid/bending_force.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
View
7 src/fsi/bending_force.h → src/object-in-fluid/bending_force.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BENDING_FORCE_H
-#define BENDING_FORCE_H
+#ifndef _OBJECT_IN_FLUID_BENDING_FORCE_H
+#define _OBJECT_IN_FLUID_BENDING_FORCE_H
/** \file bending_force.h Routines to calculate the bending_force energy or/and
* and force for a particle quadruple (two triangles that have 2 particles in common)
*/
View
3 src/fsi/stretching_force.c → src/object-in-fluid/stretching_force.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010,2011 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
View
7 src/fsi/stretching_force.h → src/object-in-fluid/stretching_force.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010,2011 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef STRETCHING_FORCE_H
-#define STRETCHING_FORCE_H
+#ifndef _OBJECT_IN_FLUID_STRETCHING_FORCE_H
+#define _OBJECT_IN_FLUID_STRETCHING_FORCE_H
#include "utils.h"
#include "interaction_data.h"
View
2 src/fsi/volume_force.c → src/object-in-fluid/volume_force.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
+ Copyright (C) 2010,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
This file is part of ESPResSo.
View
7 src/fsi/volume_force.h → src/object-in-fluid/volume_force.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef VOLUME_FORCE_H
-#define VOLUME_FORCE_H
+#ifndef _OBJECT_IN_FLUID_VOLUME_FORCE_H
+#define _OBJECT_IN_FLUID_VOLUME_FORCE_H
/** \file volume_force.h
* Routines to calculate the VOLUME_FORCE energy or/and and force
* for a particle triple (triangle from mesh). (Dupin2007)
View
2 src/tcl/galilei_tcl.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010,2011,2012 The ESPResSo project
+ Copyright (C) 2010,2011,2012,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
Max-Planck-Institute for Polymer Research, Theory Group
View
2 src/tcl/galilei_tcl.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010,2011,2012 The ESPResSo project
+ Copyright (C) 2010,2011,2012,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
Max-Planck-Institute for Polymer Research, Theory Group
View
10 src/tcl/interaction_data_tcl.c
@@ -84,11 +84,11 @@
#include "overlap_tcl.h"
#include "harmonic_tcl.h"
#include "subt_lj_tcl.h"
-#include "tcl/fsi/area_force_local_tcl.h"
-#include "tcl/fsi/area_force_global_tcl.h"
-#include "tcl/fsi/volume_force_tcl.h"
-#include "tcl/fsi/stretching_force_tcl.h"
-#include "tcl/fsi/bending_force_tcl.h"
+#include "tcl/object-in-fluid/area_force_local_tcl.h"
+#include "tcl/object-in-fluid/area_force_global_tcl.h"
+#include "tcl/object-in-fluid/volume_force_tcl.h"
+#include "tcl/object-in-fluid/stretching_force_tcl.h"
+#include "tcl/object-in-fluid/bending_force_tcl.h"
///
int tclprint_to_result_CoulombIA(Tcl_Interp *interp);
View
4 src/tcl/interaction_data_tcl.h
@@ -18,8 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef IA_DATA_TCL_H
-#define IA_DATA_TCL_H
+#ifndef _INTERACTION_DATA_TCL_H
+#define _INTERACTION_DATA_TCL_H
#include "parser.h"
#include "forcecap_tcl.h"
View
7 src/tcl/fsi/area_force_global_tcl.c → ...l/object-in-fluid/area_force_global_tcl.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -26,8 +25,8 @@
#include "utils.h"
#include "tcl/parser.h"
-#include "tcl/fsi/area_force_global_tcl.h"
-#include "fsi/area_force_global.h"
+#include "area_force_global_tcl.h"
+#include "object-in-fluid/area_force_global.h"
int tclprint_to_result_areaforceglobalIA(Tcl_Interp *interp, Bonded_ia_parameters *params)
{
View
7 src/tcl/fsi/area_force_global_tcl.h → ...l/object-in-fluid/area_force_global_tcl.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AREA_FORCE_GLOBAL_TCL_H
-#define AREA_FORCE_GLOBAL_TCL_H
+#ifndef _OBJECT_IN_FLUID_AREA_FORCE_GLOBAL_TCL_H
+#define _OBJECT_IN_FLUID_AREA_FORCE_GLOBAL_TCL_H
/** \file area_force_global.h
* Routines to calculate the AREA_FORCE_GLOBAL energy or/and and force
* for a particle triple (triangle from mesh). (Dupin2007)
View
7 src/tcl/fsi/area_force_local_tcl.c → ...cl/object-in-fluid/area_force_local_tcl.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -26,8 +25,8 @@
#include "utils.h"
#include "tcl/parser.h"
-#include "tcl/fsi/area_force_local_tcl.h"
-#include "fsi/area_force_local.h"
+#include "area_force_local_tcl.h"
+#include "object-in-fluid/area_force_local.h"
/************************************************************/
View
7 src/tcl/fsi/area_force_local_tcl.h → ...cl/object-in-fluid/area_force_local_tcl.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AREA_FORCE_LOCAL_TCL_H
-#define AREA_FORCE_LOCAL_TCL_H
+#ifndef _OBJECT_IN_FLUID_AREA_FORCE_LOCAL_TCL_H
+#define _OBJECT_IN_FLUID_AREA_FORCE_LOCAL_TCL_H
/** \file area_force_local.h
* Routines to calculate the AREA_FORCE_LOCAL energy or/and and force
* for a particle triple (triangle from mesh). (Dupin2007)
View
9 src/tcl/fsi/bending_force_tcl.c → src/tcl/object-in-fluid/bending_force_tcl.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -22,9 +21,9 @@
* and force for a particle quadruple (two triangles that have 2 particles in common)
*/
-#include "../../tcl/parser.h"
-#include "fsi/bending_force.h"
-#include "tcl/fsi/bending_force_tcl.h"
+#include "tcl/parser.h"
+#include "object-in-fluid/bending_force.h"
+#include "bending_force_tcl.h"
#include "interaction_data.h"
View
2 src/tcl/fsi/bending_force_tcl.h → src/tcl/object-in-fluid/bending_force_tcl.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
+ Copyright (C) 2010,2013 The ESPResSo project
Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
This file is part of ESPResSo.
View
9 src/tcl/fsi/stretching_force_tcl.c → ...cl/object-in-fluid/stretching_force_tcl.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010,2011 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -19,9 +18,9 @@
*/
#include "utils.h"
-#include "../../tcl/parser.h"
-#include "tcl/fsi/stretching_force_tcl.h"
-#include "fsi/stretching_force.h"
+#include "tcl/parser.h"
+#include "stretching_force_tcl.h"
+#include "object-in-fluid/stretching_force.h"
/** \file stretching_force.h
* Routines to calculate the STRETCHING_FORCE Energy or/and STRETCHING_FORCE force
View
10 src/tcl/fsi/stretching_force_tcl.h → ...cl/object-in-fluid/stretching_force_tcl.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010,2011 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,11 +16,10 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef STRETCHING_FORCE_TCL_H
-#define STRETCHING_FORCE_TCL_H
+#ifndef _OBJECT_IN_FLUID_STRETCHING_FORCE_TCL_H
+#define _OBJECT_IN_FLUID_STRETCHING_FORCE_TCL_H
-
-#include "../../tcl/parser.h"
+#include "tcl/parser.h"
#include "interaction_data.h"
/************************************************************/
View
9 src/tcl/fsi/volume_force_tcl.c → src/tcl/object-in-fluid/volume_force_tcl.c
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -26,9 +25,9 @@
#include "utils.h"
-#include "../../tcl/parser.h"
-#include "tcl/fsi/volume_force_tcl.h"
-#include "fsi/volume_force.h"
+#include "tcl/parser.h"
+#include "volume_force_tcl.h"
+#include "object-in-fluid/volume_force.h"
/************************************************************/
View
9 src/tcl/fsi/volume_force_tcl.h → src/tcl/object-in-fluid/volume_force_tcl.h
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2010 The ESPResSo project
- Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Max-Planck-Institute for Polymer Research, Theory Group, PO Box 3148, 55021 Mainz, Germany
+ Copyright (C) 2012,2013 The ESPResSo project
This file is part of ESPResSo.
@@ -17,15 +16,15 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef VOLUME_FORCE_TCL_H
-#define VOLUME_FORCE_TCL_H
+#ifndef _OBJECT_IN_FLUID_VOLUME_FORCE_TCL_H
+#define _OBJECT_IN_FLUID_VOLUME_FORCE_TCL_H
/** \file volume_force.h
* Routines to calculate the VOLUME_FORCE energy or/and and force
* for a particle triple (triangle from mesh). (Dupin2007)
* \ref forces.c
*/
-#include "../../tcl/parser.h"
+#include "tcl/parser.h"
#include "interaction_data.h"
View
2 testsuite/lb_fluid_coupling.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012 The ESPResSo project
+# Copyright (C) 2011,2012,2013 The ESPResSo project
#
# This file is part of ESPResSo.
#
View
2 testsuite/lb_fluid_coupling_gpu.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012 The ESPResSo project
+# Copyright (C) 2011,2012,2013 The ESPResSo project
#
# This file is part of ESPResSo.
#
View
2 testsuite/lb_planar.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012 The ESPResSo project
+# Copyright (C) 2011,2012,2013 The ESPResSo project
#
# This file is part of ESPResSo.
#
View
2 testsuite/lb_planar_gpu.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012 The ESPResSo project
+# Copyright (C) 2011,2012,2013 The ESPResSo project
#
# This file is part of ESPResSo.
#
View
2 testsuite/lb_stokes_sphere_gpu.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012 The ESPResSo project
+# Copyright (C) 2011,2012,2013 The ESPResSo project
#
# This file is part of ESPResSo.
#
View
16 testsuite/object_in_fluid.tcl
@@ -1,6 +1,4 @@
-# Copyright (C) 2010,2011,2012,2013 The ESPResSo project
-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010
-# Max-Planck-Institute for Polymer Research, Theory Group
+# Copyright (C) 2012,2013 The ESPResSo project
#
# This file is part of ESPResSo.
#
@@ -84,14 +82,14 @@ if { [catch {
set generate_new_data 0
if { $generate_new_data == 1} {
- set fileNodes "object_in_fluid_system.data.nodes"
- set fileTriangles "object_in_fluid_system.data.triangles"
+ set fileNodes "object_in_fluid_system-nodes.data"
+ set fileTriangles "object_in_fluid_system-triangles.data"
setmd box_l 100 20 20
init_objects_in_fluid
add_oif_object origin 10.1 10.1 10.1 nodesfile $fileNodes trianglesfile $fileTriangles ks 0.2 kb 0.4 kal 0.2 kag 0.7 kv 1.0 type 0 mol 0
- write_data_init "object_in_fluid_system.data.init"
+ write_data_init "object_in_fluid_system-init.data"
} else {
- read_data "object_in_fluid_system.data.init"
+ read_data "object_in_fluid_system-init.data"
invalidate_system
}
@@ -130,7 +128,7 @@ if { [catch {
# Here, you write new reference configuration in case you have chosen to generate new data
#
if { $generate_new_data == 1} {
- write_data_final "object_in_fluid_system.data.final"
+ write_data_final "object_in_fluid_system-final.data"
exit
}
@@ -142,7 +140,7 @@ if { [catch {
}
# load reference configuration
- read_data "object_in_fluid_system.data.final"
+ read_data "object_in_fluid_system-final.data"
set diffPOS 0.0
set diffVEL 0.0
View
0 testsuite/object_in_fluid_system.data.final → testsuite/object_in_fluid_system-final.data
File renamed without changes.
View
0 testsuite/object_in_fluid_system.data.init → testsuite/object_in_fluid_system-init.data
File renamed without changes.
View
0 testsuite/object_in_fluid_system.data.nodes → testsuite/object_in_fluid_system-nodes.data
File renamed without changes.
View
0 ...ite/object_in_fluid_system.data.triangles → ...ite/object_in_fluid_system-triangles.data
File renamed without changes.

0 comments on commit 9928f27

Please sign in to comment.