[liggghts] branch master updated (0592532 -> 739cac6)

Anton Gladky gladk at moszumanska.debian.org
Sat Jan 16 23:59:37 UTC 2016


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

gladk pushed a change to branch master
in repository liggghts.

      from  0592532   Update changelog.
      adds  3697863   Imported Upstream version 3.3.1+repack1
       new  8d004a6   Merge.
       new  662e977   Refresh patches.
       new  df1a7e8   Remove dbg-file.
       new  739cac6   Update changelog.

The 4 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:
 README                                             |   27 +-
 debian/changelog                                   |    8 +
 debian/control                                     |   22 -
 debian/patches/01_add_cmake_files.patch            |  197 ++-
 debian/patches/05_vtk6_support.patch               |    6 +-
 debian/rules                                       |    3 -
 doc/Eqs/pair_gran_hooke_eqEpsd2.gif                |  Bin 4103 -> 5188 bytes
 doc/Eqs/pair_gran_hooke_eqEpsd2.tex                |    5 +-
 doc/Eqs/viblin.jpg                                 |  Bin 8629 -> 24293 bytes
 doc/Eqs/vibrot.jpg                                 |  Bin 8215 -> 24866 bytes
 doc/Manual.html                                    |    2 +-
 doc/Manual.pdf                                     |  Bin 3356212 -> 3419668 bytes
 doc/Manual.txt                                     |    2 +-
 doc/Section_commands.html                          |   47 +-
 doc/Section_commands.txt                           |    8 +
 doc/Section_gran_models.html                       |   12 +-
 doc/Section_gran_models.txt                        |   13 +-
 doc/Section_intro.html                             |    6 +-
 doc/Section_intro.txt                              |    4 +-
 doc/Section_start.html                             |    5 -
 doc/Section_start.txt                              |    5 -
 doc/atom_style.html                                |    5 +
 doc/atom_style.txt                                 |    5 +
 doc/change_box.html                                |    2 +-
 doc/change_box.txt                                 |    2 +-
 doc/compute_erotate_multisphere.html               |   60 +
 doc/compute_erotate_multisphere.txt                |   55 +
 doc/compute_ke_multisphere.html                    |   59 +
 doc/compute_ke_multisphere.txt                     |   54 +
 doc/compute_pair_gran_local.html                   |   28 +-
 doc/compute_pair_gran_local.txt                    |   26 +-
 doc/compute_pe.html                                |    5 +-
 doc/compute_pe.txt                                 |    5 +-
 doc/compute_pe_atom.html                           |    3 +
 doc/compute_pe_atom.txt                            |    3 +
 doc/compute_reduce.html                            |    2 +-
 doc/compute_reduce.txt                             |    2 +-
 doc/compute_rigid.html                             |    5 +-
 doc/compute_rigid.txt                              |    5 +-
 doc/create_atoms.html                              |   13 +-
 doc/create_atoms.txt                               |   13 +-
 doc/dump.html                                      |    7 +-
 doc/dump.txt                                       |    7 +-
 doc/dump_custom_vtk.html                           |   21 +-
 doc/dump_custom_vtk.txt                            |   21 +-
 doc/fix_ave_spatial.html                           |    2 +-
 doc/fix_ave_spatial.txt                            |    2 +-
 doc/fix_buoyancy.html                              |   95 +
 doc/fix_buoyancy.txt                               |   85 +
 doc/fix_deform.html                                |    2 +-
 doc/fix_deform.txt                                 |    2 +-
 doc/fix_dt_reset.html                              |    2 +-
 doc/fix_dt_reset.txt                               |    2 +-
 doc/fix_heat_gran_conduction.html                  |   13 +-
 doc/fix_heat_gran_conduction.txt                   |   12 +-
 doc/fix_insert_pack.html                           |    6 +-
 doc/fix_insert_pack.txt                            |    6 +-
 doc/fix_insert_stream.html                         |    5 +-
 doc/fix_insert_stream.txt                          |    2 +-
 doc/fix_mesh_surface.html                          |   96 +-
 doc/fix_mesh_surface.txt                           |   86 +-
 doc/fix_mesh_surface_stress.html                   |    4 +-
 doc/fix_mesh_surface_stress.txt                    |    4 +-
 doc/fix_move.html                                  |    2 +-
 doc/fix_move.txt                                   |    2 +-
 doc/fix_move_mesh.html                             |   14 +-
 doc/fix_move_mesh.txt                              |   14 +-
 doc/fix_multisphere.html                           |  101 ++
 doc/fix_multisphere.txt                            |   98 ++
 doc/fix_particledistribution_discrete.html         |   48 +-
 doc/fix_particledistribution_discrete.txt          |   48 +-
 doc/fix_particletemplate_multisphere.html          |  148 ++
 doc/fix_particletemplate_multisphere.txt           |  127 ++
 doc/fix_particletemplate_sphere.html               |   36 +-
 doc/fix_particletemplate_sphere.txt                |   35 +-
 doc/fix_poems.html                                 |    2 +-
 doc/fix_poems.txt                                  |    2 +-
 doc/fix_wall_gran.html                             |    6 +
 doc/fix_wall_gran.txt                              |    6 +
 doc/fix_wall_reflect.html                          |    4 +-
 doc/fix_wall_reflect.txt                           |    4 +-
 doc/gran_cohesion_easo_capillary_viscous.html      |  162 ++
 doc/gran_cohesion_easo_capillary_viscous.txt       |  155 ++
 doc/gran_cohesion_sjkr.html                        |    4 +-
 doc/gran_cohesion_sjkr.txt                         |    4 +-
 doc/gran_cohesion_sjkr2.html                       |    4 +-
 doc/gran_cohesion_sjkr2.txt                        |    4 +-
 doc/gran_cohesion_washino_capillary_viscous.html   |  154 ++
 doc/gran_cohesion_washino_capillary_viscous.txt    |  148 ++
 doc/gran_model_hertz.html                          |   22 +-
 doc/gran_model_hertz.txt                           |   22 +-
 doc/gran_model_hertz_stiffness.html                |   25 +-
 doc/gran_model_hertz_stiffness.txt                 |   26 +-
 doc/gran_model_hooke.html                          |   28 +-
 doc/gran_model_hooke.txt                           |   28 +-
 doc/gran_model_hooke_stiffness.html                |   16 +-
 doc/gran_model_hooke_stiffness.txt                 |   16 +-
 doc/gran_rolling_friction_epsd.html                |   10 +-
 doc/gran_rolling_friction_epsd.txt                 |   10 +-
 ..._epsd.html => gran_rolling_friction_epsd3.html} |   14 +-
 ...on_epsd.txt => gran_rolling_friction_epsd3.txt} |   15 +-
 doc/gran_surface_sphere.html                       |   29 +
 doc/gran_surface_sphere.txt                        |   24 +
 doc/gran_tangential_history.html                   |   32 +-
 doc/gran_tangential_history.txt                    |   29 +-
 doc/liggghts_2.X_tutorial.html                     |    2 +-
 doc/liggghts_2.X_tutorial.txt                      |    2 +-
 doc/pair_gran.html                                 |    2 +-
 doc/pair_gran.txt                                  |    2 +-
 doc/region.html                                    |    2 +-
 doc/region.txt                                     |    2 +-
 doc/set.html                                       |   45 +-
 doc/set.txt                                        |   45 +-
 doc/thermo_modify.html                             |    7 +-
 doc/thermo_modify.txt                              |    7 +-
 doc/variable.html                                  |    6 +-
 doc/variable.txt                                   |    6 +-
 doc/velocity.html                                  |   10 +-
 doc/velocity.txt                                   |   10 +-
 .../ParScale/heatTransferBed_paScal/cleanscript    |    1 +
 .../ParScale/heatTransferBed_paScal/in.liggghts    |   51 +-
 .../heatTransferBed_paScal/pascal/0/heat.json      |    4 +-
 .../heatTransferBed_paScal/pascal/0/radius.json    |    4 +-
 .../pascal/settings/integrator.json                |   18 +
 .../LIGGGHTS/Tutorials_public/chute_wear/gmon.out  |  Bin 5708252 -> 0 bytes
 .../Tutorials_public/chute_wear/post/dummy         |    1 -
 .../LIGGGHTS/Tutorials_public/cohesion/gmon.out    |  Bin 5690150 -> 0 bytes
 .../LIGGGHTS/Tutorials_public/cohesion/post/dummy  |    1 -
 .../Tutorials_public/contactModels/gmon.out        |  Bin 5689415 -> 0 bytes
 .../Tutorials_public/contactModels/log.liggghts    |  151 --
 .../Tutorials_public/contactModels/post/dummy      |    1 -
 .../contactModels/post/dump0.newModels             |    9 -
 .../contactModels/post/dump10400.newModels         | 1809 --------------------
 .../contactModels/post/dump11200.newModels         | 1809 --------------------
 .../contactModels/post/dump12000.newModels         | 1809 --------------------
 .../contactModels/post/dump12800.newModels         | 1809 --------------------
 .../contactModels/post/dump13600.newModels         | 1809 --------------------
 .../contactModels/post/dump14400.newModels         | 1809 --------------------
 .../contactModels/post/dump15200.newModels         | 1809 --------------------
 .../contactModels/post/dump1600.newModels          | 1809 --------------------
 .../contactModels/post/dump16000.newModels         | 1809 --------------------
 .../contactModels/post/dump16800.newModels         | 1809 --------------------
 .../contactModels/post/dump17600.newModels         | 1809 --------------------
 .../contactModels/post/dump18400.newModels         | 1809 --------------------
 .../contactModels/post/dump19200.newModels         | 1809 --------------------
 .../contactModels/post/dump20000.newModels         | 1809 --------------------
 .../contactModels/post/dump2400.newModels          | 1809 --------------------
 .../contactModels/post/dump3200.newModels          | 1809 --------------------
 .../contactModels/post/dump4000.newModels          | 1809 --------------------
 .../contactModels/post/dump4800.newModels          | 1809 --------------------
 .../contactModels/post/dump5600.newModels          | 1809 --------------------
 .../contactModels/post/dump6400.newModels          | 1809 --------------------
 .../contactModels/post/dump7200.newModels          | 1809 --------------------
 .../contactModels/post/dump800.newModels           | 1809 --------------------
 .../contactModels/post/dump8000.newModels          | 1809 --------------------
 .../contactModels/post/dump8800.newModels          | 1809 --------------------
 .../contactModels/post/dump9600.newModels          | 1809 --------------------
 .../LIGGGHTS/Tutorials_public/conveyor/gmon.out    |  Bin 5707454 -> 0 bytes
 .../LIGGGHTS/Tutorials_public/conveyor/post/dummy  |    1 -
 .../Tutorials_public/heatTransfer_1/gmon.out       |  Bin 5692145 -> 0 bytes
 .../Tutorials_public/heatTransfer_1/post/dummy     |    1 -
 .../Tutorials_public/heatTransfer_2/gmon.out       |  Bin 5692145 -> 0 bytes
 .../Tutorials_public/heatTransfer_2/post/dummy     |    1 -
 .../Tutorials_public/insert_stream/gmon.out        |  Bin 5699243 -> 0 bytes
 .../Tutorials_public/insert_stream/post/dummy      |    1 -
 .../LIGGGHTS/Tutorials_public/meshGran/gmon.out    |  Bin 5707517 -> 0 bytes
 .../LIGGGHTS/Tutorials_public/meshGran/post/dummy  |    1 -
 .../LIGGGHTS/Tutorials_public/mesh_tet/in.mesh_tet |    1 -
 .../Tutorials_public/movingMeshGran/gmon.out       |  Bin 5712809 -> 0 bytes
 .../Tutorials_public/movingMeshGran/post/dummy     |    1 -
 .../data/stone1.multisphere                        |   50 +
 .../multisphere_stone_restitution/data/stone1.test |    2 +
 .../multisphere_stone_restitution/in.multisphere   |   65 +
 .../post/.gitignore                                |    0
 .../postscript                                     |    2 +-
 src/ASPHERE/fix_nve_asphere.cpp                    |   33 +-
 src/CMakeLists.txt                                 |  139 +-
 src/MAKE/Makefile.fedora_vtk_fpic                  |    2 +-
 ...ic_debug_vtk => Makefile.fedora_vtk_fpic_debug} |   17 +-
 src/MAKE/Makefile.ubuntuVTK                        |   18 +-
 src/MAKE/Makefile.ubuntuVTK6                       |   16 +-
 src/MAKE/Makefile.ubuntuVTK_debug                  |   22 +-
 src/MAKE/Makefile.ubuntuVTK_fpic                   |    7 +-
 ...buntuVTK_fpic => Makefile.ubuntuVTK_fpic_debug} |   20 +-
 ...le.ubuntuVTK_fpic => Makefile.ubuntu_15p10_vtk} |   17 +-
 ...ntuVTK_fpic => Makefile.ubuntu_15p10_vtk_debug} |   21 +-
 ...untuVTK_fpic => Makefile.ubuntu_15p10_vtk_fpic} |   13 +-
 src/Make.sh                                        |   23 +-
 src/PASCAL/Install.sh                              |    2 +-
 src/PASCAL/fix_pascal_couple.cpp                   |    2 +-
 src/POEMS/fix_poems.cpp                            | 1101 ++++++------
 src/POEMS/fix_poems.h                              |   99 +-
 src/RIGID/fix_rigid.cpp                            |    2 +-
 src/WINDOWS/GenerateHeaders.bat                    |   16 +
 src/WINDOWS/extra/dirent.h                         |  372 ++++
 src/WINDOWS/extra/erf.h                            |   20 +
 src/WINDOWS/extra/erf_namd.c                       |  345 ++++
 src/WINDOWS/extra/fftw2/FFTW2dll.dll               |  Bin 0 -> 263168 bytes
 src/WINDOWS/extra/fftw2/FFTW2dll.lib               |  Bin 0 -> 22998 bytes
 src/WINDOWS/extra/fftw2/FFTW2st.lib                |  Bin 0 -> 404572 bytes
 src/WINDOWS/extra/fftw2/RFFTW2dll.dll              |  Bin 0 -> 481792 bytes
 src/WINDOWS/extra/fftw2/RFFTW2dll.lib              |  Bin 0 -> 35830 bytes
 src/WINDOWS/extra/fftw2/RFFTW2st.lib               |  Bin 0 -> 337962 bytes
 src/WINDOWS/extra/fftw2/fftw.h                     |  421 +++++
 src/WINDOWS/extra/fftw2/x64/FFTW2dll.dll           |  Bin 0 -> 228864 bytes
 src/WINDOWS/extra/fftw2/x64/FFTW2dll.lib           |  Bin 0 -> 9588 bytes
 src/WINDOWS/extra/fftw2/x64/FFTW2st.lib            |  Bin 0 -> 797762 bytes
 src/WINDOWS/extra/fftw2/x64/RFFTW2dll.dll          |  Bin 0 -> 411648 bytes
 src/WINDOWS/extra/fftw2/x64/RFFTW2dll.lib          |  Bin 0 -> 14618 bytes
 src/WINDOWS/extra/fftw2/x64/RFFTW2st.lib           |  Bin 0 -> 668694 bytes
 src/WINDOWS/extra/inttypes.h                       |  305 ++++
 src/WINDOWS/extra/sleep.cpp                        |   10 +
 src/WINDOWS/extra/sleep.h                          |    1 +
 src/WINDOWS/extra/stdint.h                         |  247 +++
 src/WINDOWS/extra/sys/time.h                       |   28 +
 src/WINDOWS/extra/unistd.h                         |    4 +
 src/abstract_mesh.h                                |    6 +-
 src/associative_pointer_array.h                    |   12 +-
 src/associative_pointer_array_I.h                  |   37 +-
 src/atom.cpp                                       |   26 +-
 src/atom.h                                         |    2 +-
 src/atom_vec_sph.cpp                               |    3 +-
 src/atom_vec_sph.h                                 |    3 +-
 src/atom_vec_sphere.cpp                            |    2 +
 src/bounding_box.cpp                               |   32 +-
 src/bounding_box.h                                 |   32 +-
 src/cfd_datacoupling_mpi.cpp                       |    4 +-
 src/cfd_datacoupling_mpi.h                         |    8 +-
 src/{properties.h => cfd_datacoupling_simple.h}    |   32 +-
 src/cfd_regionmodel_none.cpp                       |    4 +-
 src/change_box.cpp                                 |    4 +-
 src/cleanAllNonSpherical.sh                        |    2 +
 src/cleanAllParScale.sh                            |    3 +
 src/cohesion_model_easo_capillary_viscous.h        |  471 +++++
 src/cohesion_model_sjkr.h                          |    8 +-
 src/cohesion_model_sjkr2.h                         |    8 +-
 src/cohesion_model_washino_capillary_viscous.h     |  491 ++++++
 src/comm.cpp                                       |    4 +
 src/comm_I.h                                       |    4 +-
 src/compute_cna_atom.cpp                           |    4 +-
 ...{rotate.cpp => compute_erotate_multisphere.cpp} |   35 +-
 ..._stationary.h => compute_erotate_multisphere.h} |   35 +-
 src/compute_group_group.cpp                        |    2 +-
 ...{compute_com.cpp => compute_ke_multisphere.cpp} |   53 +-
 ...e_sph_stationary.h => compute_ke_multisphere.h} |   30 +-
 src/compute_pair_gran_local.cpp                    |  137 +-
 src/compute_pair_gran_local.h                      |   37 +-
 src/compute_rigid.cpp                              |  181 ++
 src/{fix_diam_max.h => compute_rigid.h}            |   31 +-
 src/compute_surface.cpp                            |    4 +-
 src/contact_interface.h                            |   20 +-
 src/contact_model_constants.h                      |    4 +-
 src/contact_models.cpp                             |    6 +-
 src/contact_models.h                               |  117 +-
 src/container.h                                    |    3 +-
 src/container_base.cpp                             |   39 +-
 src/container_base.h                               |   37 +-
 src/container_base_I.h                             |   13 +-
 src/create_atoms.cpp                               |   34 +-
 src/create_atoms.h                                 |    2 +
 src/custom_value_tracker.cpp                       |   21 +-
 src/custom_value_tracker.h                         |   21 +-
 src/custom_value_tracker_I.h                       |   75 +-
 src/debug_liggghts.h                               |    1 +
 src/displace_atoms.cpp                             |    4 +-
 src/domain_wedge_dummy.h                           |    3 +-
 src/dump_custom.cpp                                |    4 +-
 src/dump_custom_vtk.cpp                            |    4 +-
 src/dump_mesh_stl.cpp                              |   41 +-
 src/dump_mesh_stl.h                                |    3 +-
 src/dump_mesh_vtk.cpp                              |    1 +
 src/dump_movie.cpp                                 |    2 +-
 src/fix.cpp                                        |    7 +-
 src/fix.h                                          |    4 +-
 src/fix_ave_correlate.cpp                          |    2 +-
 src/fix_ave_euler.cpp                              |   23 +-
 src/fix_ave_histo.cpp                              |    2 +-
 src/fix_ave_spatial.cpp                            |    6 +-
 src/fix_ave_time.cpp                               |    2 +-
 src/fix_buoyancy.cpp                               |  327 ++++
 src/{fix_viscous.h => fix_buoyancy.h}              |   51 +-
 src/fix_cfd_coupling_convection_species.cpp        |  253 +++
 ...ion.h => fix_cfd_coupling_convection_species.h} |   35 +-
 src/fix_cfd_coupling_force.cpp                     |   93 +-
 src/fix_cfd_coupling_force.h                       |    7 +-
 src/fix_cfd_coupling_force_implicit.cpp            |   88 +-
 src/fix_cfd_coupling_force_implicit.h              |   10 +
 src/fix_check_timestep_gran.cpp                    |    4 +-
 src/fix_check_timestep_sph.cpp                     |    2 +-
 src/fix_contact_history.cpp                        |   14 +-
 src/fix_contact_history.h                          |   39 +-
 src/fix_deform.cpp                                 |    2 +-
 src/fix_dt_reset.cpp                               |    2 +-
 src/fix_dummy.h                                    |   78 -
 src/fix_freeze.cpp                                 |   14 +-
 src/fix_freeze.h                                   |    2 +
 src/fix_heat_gran.cpp                              |    6 +-
 src/fix_heat_gran_conduction.cpp                   |    4 +-
 src/fix_heat_gran_conduction.h                     |    2 +-
 src/fix_insert.cpp                                 |  149 +-
 src/fix_insert.h                                   |   22 +-
 src/fix_insert_pack.cpp                            |   48 +-
 src/fix_insert_pack.h                              |    8 +-
 src/fix_insert_stream.cpp                          |   52 +-
 src/fix_insert_stream.h                            |   15 +-
 src/fix_massflow_mesh.cpp                          |   14 +-
 src/fix_massflow_mesh.h                            |    2 +-
 src/fix_mesh.cpp                                   |  145 +-
 src/fix_mesh.h                                     |   17 +-
 src/fix_mesh_surface.cpp                           |   46 +-
 src/fix_mesh_surface.h                             |    3 +-
 src/fix_mesh_surface_stress.cpp                    |    4 +-
 src/fix_mesh_surface_stress_servo.cpp              |   13 +-
 src/fix_mesh_surface_stress_servo.h                |    3 +-
 src/fix_move.cpp                                   |    2 +-
 src/fix_move_mesh.cpp                              |    3 +-
 src/fix_move_mesh.h                                |    3 +-
 src/fix_multisphere.cpp                            | 1098 ++++++++++++
 src/fix_multisphere.h                              |  232 ++-
 src/fix_multisphere_comm_I.h                       |    1 +
 src/fix_neighlist_mesh.cpp                         |   25 +-
 src/fix_neighlist_mesh.h                           |    5 +-
 src/fix_nve_sphere.cpp                             |   34 +-
 src/fix_nve_sphere.h                               |    4 +
 src/fix_particledistribution_discrete.cpp          |   47 +-
 src/fix_particledistribution_discrete.h            |    7 +
 src/fix_print.cpp                                  |    2 +-
 src/fix_property_atom.cpp                          |    4 +-
 src/fix_property_atom.h                            |    8 +-
 src/fix_property_atom_tracer.cpp                   |    4 +
 src/fix_property_global.h                          |    8 +-
 src/fix_remove.h                                   |    1 +
 src/fix_rigid.cpp                                  |    2 +-
 src/fix_scalar_transport_equation.h                |    3 +
 src/fix_sph.cpp                                    |    2 +-
 src/fix_template_multiplespheres.cpp               |  564 ++++++
 ...ate_sphere.h => fix_template_multiplespheres.h} |  123 +-
 src/fix_template_multisphere.cpp                   |  656 +++++++
 ...sport_equation.h => fix_template_multisphere.h} |   96 +-
 src/fix_template_sphere.cpp                        |   37 +-
 src/fix_template_sphere.h                          |   13 +-
 src/fix_wall.cpp                                   |    2 +-
 src/fix_wall_gran.cpp                              |  132 +-
 src/fix_wall_gran.h                                |   10 +-
 src/fix_wall_gran_base.h                           |   34 +-
 src/general_container.h                            |   23 +-
 src/general_container_I.h                          |   62 +-
 src/global_properties.cpp                          |  136 +-
 src/global_properties.h                            |   16 +-
 src/granular_pair_style.cpp                        |    3 +-
 src/granular_pair_style.h                          |    5 +-
 src/granular_styles.cpp                            |    3 +-
 src/input.cpp                                      |   15 +-
 src/input_mesh_tet.cpp                             |    2 +-
 src/input_mesh_tri.cpp                             |   30 +-
 src/input_mesh_tri.h                               |    5 +-
 src/input_multisphere.cpp                          |  192 +++
 src/{input_mesh_tet.h => input_multisphere.h}      |   20 +-
 src/lammps.cpp                                     |   14 +-
 src/library_cfd_coupling.h                         |    4 +-
 src/lmpwindows.h                                   |   12 +-
 src/math_extra_liggghts.h                          |   51 +-
 src/memory.cpp                                     |    6 +-
 src/mesh_mover.cpp                                 |   32 +-
 src/mesh_mover.h                                   |   33 +-
 src/modify.cpp                                     |   12 +-
 src/mpi_liggghts.h                                 |    4 +-
 src/multi_node_mesh.h                              |   12 +-
 src/multi_node_mesh_I.h                            |   10 +-
 src/multi_vector_container.h                       |    3 +-
 src/multisphere.cpp                                |  623 +++++++
 src/multisphere.h                                  |  236 +++
 src/{cfd_regionmodel_none.cpp => multisphere_I.h}  |  158 +-
 src/multisphere_parallel.h                         |    2 +-
 src/neigh_bond.cpp                                 |   16 +-
 src/neigh_gran.cpp                                 |    9 +-
 src/neighbor.cpp                                   |    1 +
 src/normal_model_hertz.h                           |   65 +-
 src/normal_model_hertz_stiffness.h                 |   45 +-
 src/normal_model_hooke.h                           |   65 +-
 src/normal_model_hooke_hysteresis.h                |   44 +-
 src/normal_model_hooke_stiffness.h                 |   43 +-
 src/os_specific.h                                  |    3 +-
 src/pair_gran.cpp                                  |    6 +-
 src/pair_gran.h                                    |    5 +
 src/pair_gran_base.h                               |   85 +-
 src/pair_gran_proxy.cpp                            |   10 +-
 src/pair_gran_proxy.h                              |   11 +-
 src/pair_hybrid.cpp                                |    3 +
 src/pair_sph.cpp                                   |    3 +-
 src/pair_sph.h                                     |    3 +-
 src/particleToInsert.cpp                           |   77 +-
 src/particleToInsert.h                             |   18 +-
 src/particleToInsert_multisphere.cpp               |  287 ++++
 ...n_variable.h => particleToInsert_multisphere.h} |   57 +-
 src/primitive_wall.h                               |    3 +-
 src/primitive_wall_definitions.h                   |    3 +-
 src/properties.cpp                                 |  101 ++
 src/properties.h                                   |    6 +-
 src/property_registry.cpp                          |   16 +-
 src/property_registry.h                            |   14 +-
 src/read_data.cpp                                  |   10 +-
 src/read_restart.cpp                               |    4 +-
 src/reader.cpp                                     |    2 +-
 src/region.cpp                                     |   40 +-
 src/region.h                                       |    1 +
 src/region_mesh_tet.cpp                            |  528 +++++-
 src/region_mesh_tet.h                              |   40 +-
 src/region_neighbor_list.cpp                       |  519 ++++++
 src/region_neighbor_list.h                         |  174 ++
 src/region_wedge.cpp                               |    5 +-
 src/region_wedge.h                                 |    3 +-
 src/rolling_model_cdt.h                            |   27 +-
 src/rolling_model_epsd.h                           |  116 +-
 src/rolling_model_epsd2.h                          |   21 +-
 ...{rolling_model_epsd.h => rolling_model_epsd3.h} |   33 +-
 src/scalar_container.h                             |    3 +-
 src/set.cpp                                        |   49 +-
 src/settings.h                                     |    2 +-
 src/style_cohesion_model.h                         |    2 +
 src/style_compute.h                                |    3 +
 src/style_contact_model.h                          |  255 +++
 src/style_fix.h                                    |    5 +
 src/style_rolling_model.h                          |    1 +
 src/superquadric.h                                 |   48 -
 src/superquadric_flag.h                            |    5 +
 src/surface_mesh.h                                 |   25 +-
 src/surface_mesh_I.h                               |  210 ++-
 src/surface_model_default.h                        |   24 +-
 src/tangential_model_history.h                     |   98 +-
 src/tangential_model_no_history.h                  |   67 +-
 src/thermo.cpp                                     |   16 +-
 src/thermo.h                                       |    1 +
 src/tracking_mesh_I.h                              |    3 +-
 src/tri_mesh.h                                     |   30 +-
 src/tri_mesh_I.h                                   |    3 +-
 src/variable.cpp                                   |   17 +-
 src/vector_container.h                             |    7 +-
 src/vector_liggghts.h                              |   95 +-
 src/velocity.cpp                                   |  210 ++-
 src/velocity.h                                     |    3 +
 src/version_liggghts.h                             |    2 +-
 src/version_liggghts.txt                           |    2 +-
 src/write_data.cpp                                 |    2 +-
 src/write_restart.cpp                              |   14 +-
 445 files changed, 16432 insertions(+), 47947 deletions(-)
 create mode 100644 doc/compute_erotate_multisphere.html
 create mode 100644 doc/compute_erotate_multisphere.txt
 create mode 100644 doc/compute_ke_multisphere.html
 create mode 100644 doc/compute_ke_multisphere.txt
 create mode 100644 doc/fix_buoyancy.html
 create mode 100644 doc/fix_buoyancy.txt
 create mode 100644 doc/fix_multisphere.html
 create mode 100644 doc/fix_multisphere.txt
 create mode 100644 doc/fix_particletemplate_multisphere.html
 create mode 100644 doc/fix_particletemplate_multisphere.txt
 create mode 100644 doc/gran_cohesion_easo_capillary_viscous.html
 create mode 100644 doc/gran_cohesion_easo_capillary_viscous.txt
 create mode 100644 doc/gran_cohesion_washino_capillary_viscous.html
 create mode 100644 doc/gran_cohesion_washino_capillary_viscous.txt
 copy doc/{gran_rolling_friction_epsd.html => gran_rolling_friction_epsd3.html} (84%)
 copy doc/{gran_rolling_friction_epsd.txt => gran_rolling_friction_epsd3.txt} (83%)
 create mode 100644 doc/gran_surface_sphere.html
 create mode 100644 doc/gran_surface_sphere.txt
 create mode 100644 examples/LIGGGHTS/Tutorials_public/ParScale/heatTransferBed_paScal/pascal/settings/integrator.json
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/chute_wear/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/chute_wear/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/cohesion/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/cohesion/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/log.liggghts
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump0.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump10400.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump11200.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump12000.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump12800.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump13600.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump14400.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump15200.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump1600.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump16000.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump16800.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump17600.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump18400.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump19200.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump20000.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump2400.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump3200.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump4000.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump4800.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump5600.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump6400.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump7200.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump800.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump8000.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump8800.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/contactModels/post/dump9600.newModels
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/conveyor/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/conveyor/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/heatTransfer_1/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/heatTransfer_1/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/heatTransfer_2/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/heatTransfer_2/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/insert_stream/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/insert_stream/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/meshGran/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/meshGran/post/dummy
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/movingMeshGran/gmon.out
 delete mode 100644 examples/LIGGGHTS/Tutorials_public/movingMeshGran/post/dummy
 create mode 100644 examples/LIGGGHTS/Tutorials_public/multisphere_stone_restitution/data/stone1.multisphere
 create mode 100644 examples/LIGGGHTS/Tutorials_public/multisphere_stone_restitution/data/stone1.test
 create mode 100644 examples/LIGGGHTS/Tutorials_public/multisphere_stone_restitution/in.multisphere
 copy examples/LIGGGHTS/Tutorials_public/{ParScale/heatTransferBed_paScal => multisphere_stone_restitution}/post/.gitignore (100%)
 copy examples/LIGGGHTS/Tutorials_public/{sph_1 => multisphere_stone_restitution}/postscript (75%)
 rename src/MAKE/{Makefile.fedora_fpic_debug_vtk => Makefile.fedora_vtk_fpic_debug} (90%)
 copy src/MAKE/{Makefile.ubuntuVTK_fpic => Makefile.ubuntuVTK_fpic_debug} (89%)
 copy src/MAKE/{Makefile.ubuntuVTK_fpic => Makefile.ubuntu_15p10_vtk} (90%)
 copy src/MAKE/{Makefile.ubuntuVTK_fpic => Makefile.ubuntu_15p10_vtk_debug} (88%)
 copy src/MAKE/{Makefile.ubuntuVTK_fpic => Makefile.ubuntu_15p10_vtk_fpic} (94%)
 create mode 100644 src/WINDOWS/GenerateHeaders.bat
 create mode 100644 src/WINDOWS/extra/dirent.h
 create mode 100644 src/WINDOWS/extra/erf.h
 create mode 100644 src/WINDOWS/extra/erf_namd.c
 create mode 100644 src/WINDOWS/extra/fftw2/FFTW2dll.dll
 create mode 100644 src/WINDOWS/extra/fftw2/FFTW2dll.lib
 create mode 100644 src/WINDOWS/extra/fftw2/FFTW2st.lib
 create mode 100644 src/WINDOWS/extra/fftw2/RFFTW2dll.dll
 create mode 100644 src/WINDOWS/extra/fftw2/RFFTW2dll.lib
 create mode 100644 src/WINDOWS/extra/fftw2/RFFTW2st.lib
 create mode 100644 src/WINDOWS/extra/fftw2/fftw.h
 create mode 100644 src/WINDOWS/extra/fftw2/x64/FFTW2dll.dll
 create mode 100644 src/WINDOWS/extra/fftw2/x64/FFTW2dll.lib
 create mode 100644 src/WINDOWS/extra/fftw2/x64/FFTW2st.lib
 create mode 100644 src/WINDOWS/extra/fftw2/x64/RFFTW2dll.dll
 create mode 100644 src/WINDOWS/extra/fftw2/x64/RFFTW2dll.lib
 create mode 100644 src/WINDOWS/extra/fftw2/x64/RFFTW2st.lib
 create mode 100644 src/WINDOWS/extra/inttypes.h
 create mode 100644 src/WINDOWS/extra/sleep.cpp
 create mode 100644 src/WINDOWS/extra/sleep.h
 create mode 100644 src/WINDOWS/extra/stdint.h
 create mode 100644 src/WINDOWS/extra/sys/time.h
 create mode 100644 src/WINDOWS/extra/unistd.h
 copy src/{properties.h => cfd_datacoupling_simple.h} (78%)
 create mode 100644 src/cohesion_model_easo_capillary_viscous.h
 create mode 100644 src/cohesion_model_washino_capillary_viscous.h
 copy src/{rotate.cpp => compute_erotate_multisphere.cpp} (80%)
 copy src/{fix_nve_sph_stationary.h => compute_erotate_multisphere.h} (82%)
 copy src/{compute_com.cpp => compute_ke_multisphere.cpp} (74%)
 copy src/{fix_nve_sph_stationary.h => compute_ke_multisphere.h} (82%)
 create mode 100644 src/compute_rigid.cpp
 copy src/{fix_diam_max.h => compute_rigid.h} (85%)
 create mode 100644 src/fix_buoyancy.cpp
 copy src/{fix_viscous.h => fix_buoyancy.h} (81%)
 create mode 100644 src/fix_cfd_coupling_convection_species.cpp
 copy src/{fix_cfd_coupling_convection.h => fix_cfd_coupling_convection_species.h} (75%)
 create mode 100644 src/fix_multisphere.cpp
 create mode 100644 src/fix_multisphere_comm_I.h
 create mode 100644 src/fix_remove.h
 create mode 100644 src/fix_template_multiplespheres.cpp
 copy src/{fix_template_sphere.h => fix_template_multiplespheres.h} (61%)
 create mode 100644 src/fix_template_multisphere.cpp
 copy src/{fix_scalar_transport_equation.h => fix_template_multisphere.h} (61%)
 create mode 100644 src/input_multisphere.cpp
 copy src/{input_mesh_tet.h => input_multisphere.h} (86%)
 create mode 100644 src/multisphere.cpp
 copy src/{cfd_regionmodel_none.cpp => multisphere_I.h} (55%)
 create mode 100644 src/particleToInsert_multisphere.cpp
 copy src/{fix_region_variable.h => particleToInsert_multisphere.h} (67%)
 create mode 100644 src/region_neighbor_list.cpp
 create mode 100644 src/region_neighbor_list.h
 copy src/{rolling_model_epsd.h => rolling_model_epsd3.h} (91%)
 delete mode 100644 src/superquadric.h
 create mode 100644 src/superquadric_flag.h

-- 
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