[liggghts] branch master updated (d604745 -> 3ca42f7)

Anton Gladky gladk at moszumanska.debian.org
Sun Sep 7 21:31:07 UTC 2014


This is an automated email from the git hooks/post-receive script.

gladk pushed a change to branch master
in repository liggghts.

      from  d604745   Remove xdmf from BD.
      adds  43935b3   Imported Upstream version 3.0.3+repack
       new  4e23303   Merge.
       new  e188327   Update changelog.
       new  3ca42f7   Update patches.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                                   |   7 +
 debian/patches/01_add_cmake_files.patch            |  16 +--
 debian/patches/05_vtk6_support.patch               |  12 +-
 doc/Eqs/pair_sph_morris_tenscorr_eq1.jpg           | Bin 0 -> 17896 bytes
 doc/Eqs/pair_sph_morris_tenscorr_eq2.jpg           | Bin 0 -> 13313 bytes
 doc/Eqs/pair_sph_morris_tenscorr_eq3.jpg           | Bin 0 -> 11114 bytes
 doc/Eqs/pair_sph_morris_tenscorr_eq4.jpg           | Bin 0 -> 8157 bytes
 doc/Eqs/pair_sph_morris_tenscorr_eq5.jpg           | Bin 0 -> 5047 bytes
 doc/Manual.pdf                                     | Bin 7933716 -> 7935638 bytes
 doc/compute_pair_gran_local.html                   |   8 +-
 doc/compute_pair_gran_local.txt                    |   8 +-
 doc/fix_massflow_mesh.html                         |   2 +-
 doc/fix_massflow_mesh.txt                          |   2 +-
 doc/fix_mesh_surface_stress.html                   |   4 +-
 doc/fix_mesh_surface_stress.txt                    |   4 +-
 doc/fix_wall_gran.html                             |  17 ++-
 doc/fix_wall_gran.txt                              |  17 ++-
 doc/gran_model_hertz.html                          |   2 +-
 doc/gran_model_hertz.txt                           |   2 +-
 doc/gran_model_hertz_stiffness.html                |   2 +-
 doc/gran_model_hertz_stiffness.txt                 |   2 +-
 doc/gran_model_hooke.html                          |   2 +-
 doc/gran_model_hooke.txt                           |   2 +-
 doc/gran_model_hooke_stiffness.html                |   2 +-
 doc/gran_model_hooke_stiffness.txt                 |   2 +-
 doc/pair_gran.html                                 |  13 +-
 doc/pair_gran.txt                                  |  11 +-
 doc/pair_sph_artvisc_tenscorr.html                 |   4 +-
 doc/pair_sph_artvisc_tenscorr.txt                  |   4 +-
 doc/set.html                                       |   3 +-
 doc/set.txt                                        |   3 +-
 .../Tutorials_public/contactModels/in.newModels    |   1 +
 src/ASPHERE/fix_nve_asphere.cpp                    |  89 ++++++++++++-
 src/ASPHERE/fix_nve_asphere.h                      |   2 +
 src/CMakeLists.txt                                 |   4 -
 src/MAKE/Makefile.fedora_debug                     |   2 +-
 ...file.fedora_fpic => Makefile.fedora_fpic_debug} |   2 +-
 src/MAKE/Makefile.ubuntuVTK                        |   2 +-
 .../{Makefile.ubuntuVTK => Makefile.ubuntuVTK6}    |   4 +-
 src/MOLECULE/atom_vec_molecular.cpp                |   2 +-
 src/Makefile.lib                                   |   4 +-
 src/atom_vec_sphere.cpp                            |   1 +
 src/cfd_datacoupling_file.cpp                      |  16 +--
 src/cohesion_model_sjkr.h                          |   8 +-
 src/cohesion_model_sjkr2.h                         |   8 +-
 src/compute_pair_gran_local.cpp                    |  42 +++++-
 src/compute_pair_gran_local.h                      |   4 +-
 src/contact_interface.h                            |   8 +-
 src/contact_models.h                               |  38 +++---
 src/debug_liggghts.h                               |   1 +
 src/dump_atom_vtk.cpp                              |   8 ++
 src/dump_decomposition_vtk.h                       |   1 -
 src/finish.cpp                                     |  58 +++++++++
 src/fix_cfd_coupling_force.cpp                     |  19 ++-
 src/fix_contact_history.cpp                        |  12 +-
 src/fix_contact_history.h                          |   2 +
 src/fix_contact_history_mesh.cpp                   |  17 ++-
 src/fix_contact_history_mesh.h                     |   1 +
 src/fix_dummy.h                                    |   5 +
 src/fix_insert_pack.cpp                            |  11 +-
 src/fix_insert_stream.cpp                          |  10 ++
 src/fix_massflow_mesh.cpp                          |  26 +++-
 src/fix_massflow_mesh.h                            |   2 +
 src/fix_mesh_surface.cpp                           |   4 +-
 src/fix_mesh_surface_stress_servo.cpp              |   4 +
 src/fix_mesh_surface_stress_servo.h                |   1 +
 src/fix_neighlist_mesh.cpp                         |   2 +-
 src/fix_property_atom.cpp                          |  23 ++++
 src/fix_property_atom.h                            |   2 +
 src/fix_scalar_transport_equation.cpp              |  25 ++++
 src/fix_scalar_transport_equation.h                |   4 +
 src/fix_template_sphere.cpp                        |   1 +
 src/fix_wall_gran.cpp                              |  19 ++-
 src/fix_wall_gran_base.h                           |  25 +++-
 src/force.cpp                                      |   6 +-
 src/force.h                                        |   4 +-
 src/general_container_I.h                          |   2 +-
 src/global_properties.cpp                          |  66 +++++++++-
 src/granular_pair_style.h                          |  26 ++++
 src/input.cpp                                      |   3 +-
 src/input_mesh_tri.cpp                             |   2 +-
 src/library_cfd_coupling.cpp                       |  26 ++++
 src/mesh_mover.h                                   |   2 +-
 src/modified_andrew.cpp                            |   6 +-
 src/modify.cpp                                     |   3 +
 src/multi_node_mesh_I.h                            |   5 +
 src/multi_node_mesh_parallel_I.h                   |   9 +-
 src/neighbor.cpp                                   |  37 +++++-
 src/normal_model_hertz.h                           |   5 +-
 src/normal_model_hertz_stiffness.h                 |   8 +-
 src/normal_model_hooke.h                           |   8 +-
 src/normal_model_hooke_hysteresis.h                |  32 +++--
 src/normal_model_hooke_stiffness.h                 |   8 +-
 src/pair_gran.h                                    |   1 +
 src/pair_gran_base.h                               |  24 ++++
 src/pair_gran_proxy.cpp                            |  26 ++++
 src/pair_gran_proxy.h                              |  26 ++++
 src/pair_hybrid.cpp                                |   6 +-
 src/procmap.cpp                                    |   2 +-
 src/property_registry.cpp                          |  19 +++
 src/property_registry.h                            |  41 +++++-
 src/region.h                                       |   2 +-
 src/region_mesh_tet.cpp                            | 109 +++-------------
 src/region_mesh_tet.h                              |  10 +-
 src/{atom_vec_sphere_w.cpp => region_mesh_tet_I.h} |  51 ++++++--
 src/rolling_model_cdt.h                            |   9 +-
 src/rolling_model_epsd.h                           |   9 +-
 src/rolling_model_epsd2.h                          |  12 +-
 src/set.cpp                                        | 101 +++++++--------
 src/settings.h                                     | 144 ++++++++++++---------
 src/surface_model_default.h                        |   4 +-
 src/tangential_model_history.h                     |   4 +-
 src/tangential_model_no_history.h                  |   5 +-
 src/thermo.cpp                                     |   7 +-
 src/utils.h                                        |  25 ++++
 src/verlet.cpp                                     |   1 +
 src/version_liggghts.h                             |   2 +-
 src/version_liggghts.txt                           |   2 +-
 118 files changed, 1136 insertions(+), 435 deletions(-)
 create mode 100755 doc/Eqs/pair_sph_morris_tenscorr_eq1.jpg
 create mode 100755 doc/Eqs/pair_sph_morris_tenscorr_eq2.jpg
 create mode 100755 doc/Eqs/pair_sph_morris_tenscorr_eq3.jpg
 create mode 100755 doc/Eqs/pair_sph_morris_tenscorr_eq4.jpg
 create mode 100755 doc/Eqs/pair_sph_morris_tenscorr_eq5.jpg
 copy src/MAKE/{Makefile.fedora_fpic => Makefile.fedora_fpic_debug} (99%)
 copy src/MAKE/{Makefile.ubuntuVTK => Makefile.ubuntuVTK6} (92%)
 copy src/{atom_vec_sphere_w.cpp => region_mesh_tet_I.h} (50%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liggghts.git



More information about the debian-science-commits mailing list