[liggghts] 01/05: Merge branch 'master' into jessie-backports

Anton Gladky gladk at moszumanska.debian.org
Sun Mar 19 10:53:44 UTC 2017


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

gladk pushed a commit to branch jessie-backports
in repository liggghts.

commit 4e802d30da1412b018fd50c720eb0ebbddbe8fad
Merge: 760cee0 c7bff95
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Mar 19 09:37:32 2017 +0100

    Merge branch 'master' into jessie-backports

 debian/changelog                                   |  82 +++
 debian/control                                     |   4 +-
 debian/copyright                                   |   4 +-
 debian/patches/01_add_cmake_files.patch            |  14 +-
 debian/patches/05_vtk6_support.patch               |   6 +-
 .../b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch |  16 +
 debian/patches/series                              |   1 +
 debian/rules                                       |   8 +-
 debian/tests/control                               |   1 +
 debian/tests/heat                                  |  13 +-
 debian/tests/packing                               |  14 +-
 doc/Makefile                                       | 177 +++++
 doc/Manual.pdf                                     | Bin 3387108 -> 3368441 bytes
 doc/Section_commands.html                          |  31 +-
 doc/Section_commands.txt                           |   5 +
 doc/Section_gran_models.html                       |  40 ++
 doc/Section_gran_models.txt                        |  40 ++
 doc/atom_style.html                                |   9 +-
 doc/atom_style.txt                                 |   9 +-
 doc/compute_pair_gran_local.html                   |  16 +-
 doc/compute_pair_gran_local.txt                    |  16 +-
 doc/conf.py                                        | 260 +++++++
 doc/fix_ave_correlate.html                         |   2 +-
 doc/fix_ave_correlate.txt                          |   2 +-
 doc/fix_ave_histo.html                             |   2 +-
 doc/fix_ave_histo.txt                              |   2 +-
 doc/fix_ave_time.html                              |   4 +-
 doc/fix_ave_time.txt                               |   4 +-
 doc/fix_box_relax.html                             |   7 +-
 doc/fix_box_relax.txt                              |   7 +-
 doc/fix_check_timestep_gran.html                   |  26 +-
 doc/fix_check_timestep_gran.txt                    |  21 +-
 doc/fix_continuum_weighted.html                    | 151 ++++
 doc/fix_continuum_weighted.txt                     | 133 ++++
 doc/fix_deform.html                                |   2 +
 doc/fix_deform.txt                                 |   2 +
 doc/fix_heat_gran_conduction.html                  |   2 +-
 doc/fix_heat_gran_conduction.txt                   |   2 +-
 doc/fix_insert_pack.html                           |   8 +-
 doc/fix_insert_pack.txt                            |   8 +-
 doc/fix_insert_rate_region.html                    |   8 +-
 doc/fix_insert_rate_region.txt                     |   8 +-
 doc/fix_insert_stream.html                         |   8 +-
 doc/fix_insert_stream.txt                          |   8 +-
 doc/fix_massflow_mesh_sieve.html                   |  81 +++
 doc/fix_massflow_mesh_sieve.txt                    |  68 ++
 doc/fix_mesh_surface_stress.html                   |   3 +-
 doc/fix_mesh_surface_stress.txt                    |   3 +-
 doc/fix_move_mesh.html                             |   2 +
 doc/fix_move_mesh.txt                              |   2 +
 doc/fix_multicontact_halfspace.html                |  89 +++
 doc/fix_multicontact_halfspace.txt                 |  72 ++
 doc/fix_multisphere.html                           |   6 +-
 doc/fix_multisphere.txt                            |   4 +-
 doc/fix_multisphere_break.html                     |  60 ++
 doc/fix_multisphere_break.txt                      |  54 ++
 doc/fix_wall_gran.html                             |  17 +-
 doc/fix_wall_gran.txt                              |  16 +-
 doc/gran_cohesion_easo_capillary_viscous.html      |   2 +-
 doc/gran_cohesion_easo_capillary_viscous.txt       |   2 +-
 doc/gran_cohesion_sjkr.html                        |   2 +-
 doc/gran_cohesion_sjkr.txt                         |   2 +-
 doc/gran_cohesion_sjkr2.html                       |   5 +-
 doc/gran_cohesion_sjkr2.txt                        |   3 +-
 doc/gran_cohesion_washino_capillary_viscous.html   |   4 +-
 doc/gran_cohesion_washino_capillary_viscous.txt    |   4 +-
 doc/gran_model_hertz.html                          |   9 +-
 doc/gran_model_hertz.txt                           |   7 +-
 doc/gran_model_hertz_stiffness.html                |   4 +-
 doc/gran_model_hertz_stiffness.txt                 |   4 +-
 doc/gran_model_hooke.html                          |   6 +-
 doc/gran_model_hooke.txt                           |   6 +-
 doc/gran_model_hooke_stiffness.html                |   4 +-
 doc/gran_model_hooke_stiffness.txt                 |   4 +-
 doc/gran_rolling_friction_cdt.html                 |   2 +-
 doc/gran_rolling_friction_cdt.txt                  |   2 +-
 doc/gran_rolling_friction_epsd.html                |   2 +-
 doc/gran_rolling_friction_epsd.txt                 |   2 +-
 doc/gran_rolling_friction_epsd2.html               |   2 +-
 doc/gran_rolling_friction_epsd2.txt                |   2 +-
 doc/gran_rolling_friction_epsd3.html               |   2 +-
 doc/gran_rolling_friction_epsd3.txt                |   2 +-
 doc/gran_surface_multicontact.html                 |  31 +
 doc/gran_surface_multicontact.txt                  |  27 +
 doc/gran_surface_sphere.html                       |   2 +-
 doc/gran_surface_sphere.txt                        |   2 +-
 doc/gran_tangential_history.html                   |   2 +-
 doc/gran_tangential_history.txt                    |   2 +-
 doc/gran_tangential_no_history.html                |   2 +-
 doc/gran_tangential_no_history.txt                 |   2 +-
 doc/info.html                                      |  91 +++
 doc/info.txt                                       |  86 +++
 doc/make.bat                                       | 242 +++++++
 doc/neigh_modify.html                              |  22 +-
 doc/neigh_modify.txt                               |  22 +-
 doc/read_data.html                                 |   1 +
 doc/read_data.txt                                  |   1 +
 .../ParScale/heatTransferBed_paScal/in.liggghts    |   9 +-
 .../Tutorials_public/chute_wear/in.chute_wear      |   9 +-
 .../LIGGGHTS/Tutorials_public/cohesion/in.cohesion |   7 +-
 .../Tutorials_public/cohesion/in.noCohesion        |   7 +-
 .../Tutorials_public/contactModels/in.newModels    |   7 +-
 .../Tutorials_public/contactModels/in.oldModels    |   1 -
 .../LIGGGHTS/Tutorials_public/conveyor/in.conveyor |  11 +-
 .../Tutorials_public/heatTransfer_1/in.heatGran    |   7 +-
 .../Tutorials_public/heatTransfer_2/in.heatGran    |   7 +-
 .../Tutorials_public/hysteresis/in.hysteresis      |   7 +-
 .../Tutorials_public/hysteresis/in.noHysteresis    |   7 +-
 .../insert_stream/in.insert_stream                 |  10 +-
 .../insert_stream/in.insert_stream_reset_timestep  |   9 +-
 .../LIGGGHTS/Tutorials_public/meshGran/in.meshGran |   7 +-
 .../LIGGGHTS/Tutorials_public/mesh_tet/in.mesh_tet |   1 -
 .../movingMeshGran/in.movingMeshGran               |   7 +-
 .../multisphere_stone_restitution/in.multisphere   |   7 +-
 .../LIGGGHTS/Tutorials_public/packing/in.packing   |   9 +-
 examples/LIGGGHTS/Tutorials_public/sph_1/in.sph_1  |   1 -
 examples/LIGGGHTS/Tutorials_public/sph_2/in.sph_2  |   1 -
 src/ASPHERE/compute_erotate_asphere.cpp            |   2 +-
 src/ASPHERE/fix_nve_asphere.cpp                    |   6 +-
 src/ASPHERE/fix_nve_asphere_noforce.cpp            |   6 +-
 src/ASPHERE/fix_nve_line.cpp                       |   6 +-
 src/ASPHERE/pair_line_lj.cpp                       |   8 +-
 src/MAKE/Makefile.ubuntu_convex_vtk5p10            | 116 +++
 src/MOLECULE/atom_vec_bond.cpp                     |   2 +-
 src/MOLECULE/atom_vec_full.cpp                     |   2 +-
 src/MOLECULE/atom_vec_molecular.cpp                |   2 +-
 src/MOLECULE/bond_harmonic.cpp                     |   4 +-
 src/MOLECULE/bond_harmonic.h                       |   2 +-
 src/Make.sh                                        |  14 +-
 src/PASCAL/fix_pascal_couple.cpp                   |  10 +-
 src/POEMS/fix_poems.cpp                            |  10 +-
 src/RIGID/fix_rigid.cpp                            |   8 +-
 src/STUBS/mpi.h                                    |   2 +-
 src/VORONOI/compute_voronoi_atom.cpp               |   6 +-
 src/WINDOWS/extra/inttypes.h                       |   2 +-
 src/angle.cpp                                      |   2 +-
 src/angle.h                                        |   2 +-
 src/angle_hybrid.cpp                               |   4 +-
 src/angle_hybrid.h                                 |   2 +-
 src/atom.cpp                                       |  30 +-
 src/atom.h                                         |   3 +
 src/atom_map.cpp                                   |   2 +-
 src/atom_vec.cpp                                   |   2 +-
 src/atom_vec.h                                     |   2 +-
 src/atom_vec_atomic.cpp                            |   2 +-
 src/atom_vec_charge.cpp                            |   2 +-
 src/atom_vec_ellipsoid.cpp                         |   2 +-
 src/atom_vec_hybrid.cpp                            |   4 +-
 src/atom_vec_hybrid.h                              |   2 +-
 src/atom_vec_line.cpp                              |   6 +-
 src/atom_vec_sph.cpp                               |   6 +-
 src/atom_vec_sph_var.cpp                           |   6 +-
 src/atom_vec_sphere.cpp                            |   6 +-
 src/bond.cpp                                       |   2 +-
 src/bond.h                                         |   2 +-
 src/bond_hybrid.cpp                                |   4 +-
 src/bond_hybrid.h                                  |   2 +-
 src/cfd_datacoupling.cpp                           |   6 +-
 src/cfd_datacoupling_file.cpp                      |   6 +-
 src/cfd_datacoupling_mpi.cpp                       |   6 +-
 src/cfd_datacoupling_mpi.h                         |  15 +-
 src/cfd_regionmodel_none.cpp                       |   6 +-
 src/change_box.cpp                                 |   8 +-
 src/citeme.h                                       |   2 +-
 src/cohesion_model_easo_capillary_viscous.h        |  43 +-
 src/cohesion_model_sjkr.h                          |   4 +-
 src/cohesion_model_sjkr2.h                         |   4 +-
 src/cohesion_model_washino_capillary_viscous.h     |  43 +-
 src/comm.cpp                                       |  10 +-
 src/compute.cpp                                    |   7 +-
 src/compute_atom_molecule.cpp                      |   4 +-
 src/compute_bond_local.cpp                         |   4 +-
 src/compute_centro_atom.cpp                        |   4 +-
 src/compute_cluster_atom.cpp                       |   6 +-
 src/compute_cna_atom.cpp                           |   6 +-
 src/compute_contact_atom.cpp                       |   6 +-
 src/compute_coord_atom.cpp                         |   9 +-
 src/compute_displace_atom.cpp                      |   4 +-
 src/compute_erotate_multisphere.cpp                |   4 +-
 src/compute_erotate_sphere.cpp                     |   2 +-
 src/compute_erotate_sphere_atom.cpp                |   2 +-
 src/compute_group_group.cpp                        |   6 +-
 src/compute_gyration.cpp                           |   2 +-
 src/compute_gyration_molecule.cpp                  |   4 +-
 src/compute_inertia_molecule.cpp                   |   6 +-
 src/compute_ke.cpp                                 |   2 +-
 src/compute_ke_atom.cpp                            |   2 +-
 src/compute_ke_multisphere.cpp                     |   4 +-
 src/compute_msd.cpp                                |   2 +-
 src/compute_nparticles_tracer_region.cpp           |   4 +-
 src/compute_pair_gran_local.cpp                    | 154 +++-
 src/compute_pair_gran_local.h                      |  20 +-
 src/compute_pe.cpp                                 |   4 +-
 src/compute_pe_atom.cpp                            |   2 +-
 src/compute_pressure.cpp                           |   6 +-
 src/compute_property_atom.cpp                      |   4 +-
 src/compute_property_local.cpp                     |   2 +-
 src/compute_property_molecule.cpp                  |   2 +-
 src/compute_rdf.cpp                                |   6 +-
 src/compute_rdf.h                                  |   2 +-
 src/compute_reduce.cpp                             |   6 +-
 src/compute_reduce_region.cpp                      |   4 +-
 src/compute_rigid.cpp                              |   4 +-
 src/compute_slice.cpp                              |   4 +-
 src/compute_stress_atom.cpp                        |   4 +-
 src/compute_surface.cpp                            |   6 +-
 src/compute_temp.cpp                               |   4 +-
 src/contact_interface.h                            |  83 ++-
 src/contact_models.cpp                             |  53 +-
 src/contact_models.h                               |  98 ++-
 src/container_base.cpp                             |   3 +-
 src/container_base.h                               |  56 +-
 src/container_base_I.h                             |  53 +-
 src/create_atoms.cpp                               |   6 +-
 src/create_box.cpp                                 |   4 +-
 src/custom_value_tracker.cpp                       |   9 -
 src/custom_value_tracker.h                         |   5 +-
 src/debug_liggghts.h                               |   4 +-
 src/delete_atoms.cpp                               |   4 +-
 src/delete_bonds.cpp                               |   6 +-
 src/dihedral.cpp                                   |   2 +-
 src/dihedral.h                                     |   2 +-
 src/dihedral_hybrid.cpp                            |   4 +-
 src/dihedral_hybrid.h                              |   2 +-
 src/displace_atoms.cpp                             |   6 +-
 src/domain.cpp                                     |  10 +-
 src/domain.h                                       |   3 +-
 src/domain_I.h                                     |  38 +-
 src/dump.cpp                                       |   8 +-
 src/dump.h                                         |   4 +-
 src/dump_atom_vtk.cpp                              |   2 +-
 src/dump_custom.cpp                                |   6 +-
 src/dump_custom_vtk.cpp                            | 190 ++++-
 src/dump_custom_vtk.h                              |  12 +
 src/dump_decomposition_vtk.cpp                     |   2 +-
 src/dump_euler_vtk.cpp                             |   2 +-
 src/dump_image.cpp                                 |   6 +-
 src/dump_local.cpp                                 |   6 +-
 src/dump_local_gran_vtk.cpp                        |  53 +-
 src/dump_local_gran_vtk.h                          |   2 +
 src/dump_mesh_stl.cpp                              |   2 +-
 src/dump_mesh_vtk.cpp                              |  16 +-
 src/dump_mesh_vtk.h                                |   2 +
 src/dump_movie.cpp                                 |   6 +-
 src/dump_xyz.cpp                                   |   2 +-
 src/error.cpp                                      |  27 +-
 src/error.h                                        |   1 +
 src/finish.cpp                                     |   8 +-
 src/fix.cpp                                        |   2 +-
 src/fix_adapt.cpp                                  |   6 +-
 src/fix_addforce.cpp                               |   4 +-
 src/fix_ave_atom.cpp                               |   4 +-
 src/fix_ave_atom.h                                 |   2 +-
 src/fix_ave_correlate.cpp                          |   4 +-
 src/fix_ave_correlate.h                            |   2 +-
 src/fix_ave_euler.cpp                              |   6 +-
 src/fix_ave_euler.h                                |   2 +-
 src/fix_ave_histo.cpp                              |   4 +-
 src/fix_ave_histo.h                                |   2 +-
 src/fix_ave_spatial.cpp                            |   4 +-
 src/fix_ave_spatial.h                              |   2 +-
 src/fix_ave_time.cpp                               |   4 +-
 src/fix_ave_time.h                                 |   2 +-
 src/fix_aveforce.cpp                               |   6 +-
 src/fix_base_liggghts.cpp                          |   6 +-
 src/fix_box_relax.cpp                              |   6 +-
 src/fix_buoyancy.cpp                               |   6 +-
 src/fix_cfd_coupling.cpp                           |   6 +-
 src/fix_cfd_coupling_convection.cpp                |   6 +-
 src/fix_cfd_coupling_convection_impl.cpp           |   6 +-
 src/fix_cfd_coupling_convection_species.cpp        |   6 +-
 src/fix_cfd_coupling_force.cpp                     |   6 +-
 src/fix_cfd_coupling_force_implicit.cpp            |   6 +-
 src/fix_cfd_coupling_force_implicit.h              |   2 +-
 src/fix_check_timestep_gran.cpp                    | 128 +++-
 src/fix_check_timestep_gran.h                      |   5 +-
 src/fix_check_timestep_sph.cpp                     |   6 +-
 src/fix_contact_history.cpp                        |  34 +-
 src/fix_contact_history_mesh.cpp                   |   6 +-
 src/fix_contact_history_mesh.h                     |  21 +-
 src/fix_contact_history_mesh_I.h                   |  16 +-
 src/fix_contact_property_atom.cpp                  | 461 ++++++++++++
 src/fix_contact_property_atom.h                    | 144 +++-
 src/fix_contact_property_atom_wall.cpp             | 157 +++++
 src/fix_contact_property_atom_wall.h               |  78 +-
 src/fix_continuum_weighted.cpp                     | 781 +++++++++++++++++++++
 src/{fix_print.h => fix_continuum_weighted.h}      |  89 ++-
 src/fix_deform.cpp                                 |   9 +-
 src/fix_deform_check.cpp                           |   6 +-
 src/fix_drag.cpp                                   |   6 +-
 src/fix_dt_reset.cpp                               |   6 +-
 src/fix_efield.cpp                                 |   6 +-
 src/fix_enforce2d.cpp                              |   2 +-
 src/fix_external.cpp                               |   6 +-
 src/fix_fiber_spring_simple.cpp                    |   6 +-
 src/fix_freeze.cpp                                 |   2 +-
 src/fix_gravity.cpp                                |  19 +-
 src/fix_gravity.h                                  |   1 +
 src/fix_heat_gran.cpp                              |  11 +-
 src/fix_heat_gran.h                                |   4 +
 src/fix_insert.cpp                                 |  57 +-
 src/fix_insert.h                                   |   2 +
 src/fix_insert_pack.cpp                            |  22 +-
 src/fix_insert_rate_region.cpp                     |   6 +-
 src/fix_insert_stream.cpp                          |  35 +-
 src/fix_lineforce.cpp                              |   6 +-
 src/fix_massflow_mesh.cpp                          |  22 +-
 src/fix_massflow_mesh.h                            |  14 +-
 src/fix_massflow_mesh_sieve.cpp                    | 306 ++++++++
 ...k_timestep_gran.h => fix_massflow_mesh_sieve.h} |  68 +-
 src/fix_mesh.cpp                                   |  34 +-
 src/fix_mesh.h                                     |   7 +-
 src/fix_mesh_surface.cpp                           |  98 ++-
 src/fix_mesh_surface.h                             |  27 +-
 src/fix_mesh_surface_stress.cpp                    |  21 +-
 src/fix_mesh_surface_stress.h                      |   4 +
 src/fix_mesh_surface_stress_servo.h                |   2 +-
 src/fix_minimize.cpp                               |   2 +-
 src/fix_momentum.cpp                               |   4 +-
 src/fix_move.cpp                                   |   6 +-
 src/fix_move.h                                     |   2 +-
 src/fix_move_mesh.h                                |   3 +
 src/fix_multicontact_halfspace.cpp                 | 480 +++++++++++++
 ...stress_servo.h => fix_multicontact_halfspace.h} | 146 ++--
 src/fix_multisphere.cpp                            | 101 ++-
 src/fix_multisphere.h                              |  11 +-
 src/fix_multisphere_break.cpp                      | 324 +++++++++
 ...operty_atom_dummy.h => fix_multisphere_break.h} |  44 +-
 src/fix_multisphere_comm.cpp                       | 670 ++++++++++++++++++
 src/fix_multisphere_comm_I.h                       |  84 ++-
 src/fix_neighlist_mesh.cpp                         |   5 +-
 src/fix_nve.cpp                                    |   4 +-
 src/fix_nve_limit.cpp                              |   8 +-
 src/fix_nve_noforce.cpp                            |   4 +-
 src/fix_nve_sph.cpp                                |   4 +-
 src/fix_nve_sph_stationary.cpp                     |   4 +-
 src/fix_nve_sphere.cpp                             |   6 +-
 src/fix_particledistribution_discrete.cpp          |   8 +-
 src/fix_particledistribution_discrete.h            |   5 +
 src/fix_planeforce.cpp                             |   6 +-
 src/fix_print.cpp                                  |   4 +-
 src/fix_print.h                                    |   2 +-
 src/fix_property_atom.cpp                          |   9 +-
 src/fix_property_atom.h                            |  12 +
 src/fix_property_atom_timetracer.cpp               |  28 +-
 src/fix_property_atom_tracer.cpp                   |   6 +-
 src/fix_property_atom_tracer_stream.cpp            |  15 +-
 src/fix_property_global.cpp                        |   6 +-
 src/fix_read_restart.cpp                           |   2 +-
 src/fix_region_variable.cpp                        |   8 +-
 src/fix_relax_contacts.h                           |   2 +
 src/fix_respa.cpp                                  |   2 +-
 src/fix_rigid.cpp                                  |   8 +-
 src/fix_scalar_transport_equation.cpp              |  11 +-
 src/fix_setforce.cpp                               |   4 +-
 src/fix_sph.cpp                                    |   8 +-
 src/fix_sph_density_continuity.cpp                 |   8 +-
 src/fix_sph_density_corr.cpp                       |   8 +-
 src/fix_sph_density_summation.cpp                  |   8 +-
 src/fix_sph_pressure.cpp                           |   8 +-
 src/fix_spring.cpp                                 |   6 +-
 src/fix_spring_rg.cpp                              |   6 +-
 src/fix_spring_self.cpp                            |   4 +-
 src/fix_store.cpp                                  |   4 +-
 src/fix_store_force.cpp                            |   2 +-
 src/fix_store_state.cpp                            |   4 +-
 src/fix_template_multiplespheres.cpp               |  10 +-
 src/fix_template_multisphere.cpp                   |  11 +-
 src/fix_template_sphere.cpp                        |   8 +-
 src/fix_template_sphere.h                          |   7 +
 src/fix_viscous.cpp                                |   6 +-
 src/fix_wall.cpp                                   |   6 +-
 src/fix_wall_gran.cpp                              | 218 +++++-
 src/fix_wall_gran.h                                |  50 +-
 src/fix_wall_gran_base.h                           |  62 +-
 src/fix_wall_region.cpp                            |   6 +-
 src/fix_wall_region_sph.cpp                        |   6 +-
 src/fix_wall_sph.cpp                               |   6 +-
 src/force.cpp                                      |   4 +-
 src/general_container.h                            |   1 +
 src/general_container_I.h                          |  26 +-
 src/global_properties.cpp                          |  51 +-
 src/global_properties.h                            |   6 +
 src/granular_pair_style.h                          |   3 +-
 src/granular_styles.cpp                            |  11 +-
 src/granular_wall.h                                |   4 +
 src/group.cpp                                      |  18 +-
 src/group.h                                        |   2 +-
 src/image.cpp                                      |   8 +-
 src/image.h                                        |   4 +-
 src/improper.cpp                                   |   2 +-
 src/improper.h                                     |   2 +-
 src/improper_hybrid.cpp                            |   4 +-
 src/improper_hybrid.h                              |   2 +-
 src/input.cpp                                      |  10 +-
 src/input.h                                        |   8 +-
 src/input_mesh_tet.cpp                             |  58 +-
 src/input_mesh_tet.h                               |   2 +-
 src/input_mesh_tri.cpp                             |  95 ++-
 src/input_mesh_tri.h                               |   6 +-
 src/input_multisphere.cpp                          |  17 +-
 src/input_multisphere.h                            |   2 +-
 src/integrate.cpp                                  |   2 +-
 src/irregular.cpp                                  |   6 +-
 src/kspace.cpp                                     |   4 +-
 src/lammps.cpp                                     |  10 +-
 src/lammps.h                                       |   2 +-
 src/lattice.cpp                                    |   6 +-
 src/library.cpp                                    |   6 +-
 src/library.h                                      |   2 +-
 src/library_cfd_coupling.cpp                       |   4 +-
 src/library_cfd_coupling.h                         |   2 +-
 src/lmptype.h                                      |   2 +-
 src/lmpwindows.h                                   |   4 +-
 src/main.cpp                                       |   4 +-
 src/math_extra.cpp                                 |   4 +-
 src/math_extra.h                                   |   6 +-
 src/math_extra_liggghts.h                          |  43 +-
 src/math_vector.h                                  |   4 +-
 src/memory.cpp                                     |   6 +-
 src/memory_ns.h                                    |   2 +-
 src/mesh_mover.cpp                                 |   2 +-
 src/min.cpp                                        |   6 +-
 src/min_cg.cpp                                     |   6 +-
 src/min_linesearch.cpp                             |   2 +-
 src/minimize.cpp                                   |   2 +-
 src/modify.cpp                                     |   4 +-
 src/modify.h                                       |   5 +-
 src/modify_liggghts.cpp                            |  43 +-
 src/mpi_liggghts.h                                 |  11 +-
 src/multi_node_mesh.h                              |   3 +
 src/multi_node_mesh_I.h                            |  49 +-
 src/multi_node_mesh_parallel_I.h                   |  34 +-
 src/multisphere.cpp                                |  21 +-
 src/multisphere.h                                  |  12 +
 src/multisphere_parallel.cpp                       | 307 ++++++++
 src/multisphere_parallel.h                         |  83 +++
 ...g_force_implicit.h => multisphere_parallel_I.h} |  79 ++-
 src/my_page.h                                      |   2 +-
 src/my_pool_chunk.h                                |   2 +-
 src/neighbor.cpp                                   |   9 +-
 src/nonspherical_flags.h                           |  18 +
 src/normal_model_hertz.h                           |  17 +-
 src/normal_model_hertz_stiffness.h                 |  14 +-
 src/normal_model_hooke.h                           |  14 +-
 src/normal_model_hooke_hysteresis.h                |  16 +-
 src/normal_model_hooke_stiffness.h                 |  10 +-
 src/output.cpp                                     |  15 +-
 src/pair.cpp                                       |  10 +-
 src/pair_gran.cpp                                  |  85 ++-
 src/pair_gran.h                                    |  81 ++-
 src/pair_gran_base.h                               | 110 ++-
 src/pair_gran_proxy.cpp                            |   8 +-
 src/pair_gran_proxy.h                              |   3 +-
 src/pair_hybrid.cpp                                |   6 +-
 src/pair_hybrid.h                                  |   2 +-
 src/pair_hybrid_overlay.cpp                        |   4 +-
 src/pair_soft.cpp                                  |   8 +-
 src/pair_sph.cpp                                   |   8 +-
 src/pair_sph_artvisc_tenscorr.cpp                  |   8 +-
 src/particleToInsert.cpp                           |   2 +-
 src/particleToInsert_multisphere.cpp               |   4 +-
 src/pointers.h                                     |   2 +-
 src/primitive_wall.h                               |   2 +-
 src/probability_distribution.h                     |   6 +-
 src/properties.cpp                                 |   6 +-
 src/{rotate.cpp => random.cpp}                     |  44 +-
 ...contact_property_atom_wall_dummy.h => random.h} |  14 +-
 src/random_mars.cpp                                |   4 +-
 src/random_mars.h                                  |   4 +-
 src/random_park.cpp                                |   4 +-
 src/random_park.h                                  |   4 +-
 src/read_data.cpp                                  |  10 +-
 src/read_data.h                                    |   2 +-
 src/read_dump.cpp                                  |   6 +-
 src/read_dump.h                                    |   2 +-
 src/read_restart.cpp                               |   6 +-
 src/read_restart.h                                 |   2 +-
 src/reader.cpp                                     |   4 +-
 src/reader_native.cpp                              |   4 +-
 src/reader_xyz.cpp                                 |   4 +-
 src/region.cpp                                     |   6 +-
 src/region_block.cpp                               |   4 +-
 src/region_cone.cpp                                |   6 +-
 src/region_cylinder.cpp                            |   6 +-
 src/region_intersect.cpp                           |   4 +-
 src/region_mesh_tet.cpp                            |  21 +-
 src/region_neighbor_list.h                         |   8 +-
 src/region_neighbor_list_I.h                       |  29 +-
 src/region_neighbor_list_definitions.h             |  16 +-
 src/region_plane.cpp                               |   6 +-
 src/region_prism.cpp                               |   6 +-
 src/region_sphere.cpp                              |   6 +-
 src/region_union.cpp                               |   4 +-
 src/region_wedge.cpp                               |   6 +-
 src/replicate.cpp                                  |   4 +-
 src/respa.cpp                                      |   4 +-
 src/rolling_model_cdt.h                            |   4 +-
 src/rolling_model_epsd.h                           |  16 +-
 src/rolling_model_epsd2.h                          |   4 +-
 src/rolling_model_epsd3.h                          |   2 +-
 src/rotate.cpp                                     |   4 +-
 src/run.cpp                                        |   4 +-
 src/set.cpp                                        |  32 +-
 src/special.cpp                                    |   4 +-
 src/style_contact_model.h                          | 375 ++++++++++
 src/style_fix.h                                    |   6 +
 src/style_surface_model.h                          |   1 +
 src/superquadric_flag.h                            |   7 +-
 src/surface_mesh.h                                 |  16 +-
 src/surface_mesh_I.h                               |   2 +-
 src/surface_model_default.h                        |   5 +-
 src/surface_model_multicontact.h                   | 210 ++++++
 src/tangential_model_history.h                     |  32 +-
 src/tangential_model_no_history.h                  |  30 +-
 src/thermo.cpp                                     |  40 +-
 src/thermo.h                                       |  10 +-
 src/timer.cpp                                      |   2 +-
 src/tri_mesh.h                                     |  18 +-
 src/tri_mesh_I.h                                   |  34 +-
 src/universe.cpp                                   |   8 +-
 src/universe.h                                     |   2 +-
 src/update.cpp                                     |   4 +-
 src/utils.h                                        |   4 +-
 src/variable.cpp                                   |   6 +-
 src/variable.h                                     |   2 +-
 src/vector_liggghts.h                              |  10 +-
 src/velocity.cpp                                   | 113 +--
 src/velocity.h                                     |   2 +-
 src/verlet.cpp                                     |   2 +-
 src/version_liggghts.h                             |   2 +-
 src/version_liggghts.txt                           |   2 +-
 src/write_data.cpp                                 |   4 +-
 src/write_data.h                                   |   2 +-
 src/write_dump.cpp                                 |   2 +-
 src/write_restart.cpp                              |   4 +-
 src/write_restart.h                                |   2 +-
 537 files changed, 10205 insertions(+), 2043 deletions(-)

diff --cc debian/changelog
index a3b5ccc,ebd8da5..bde15c0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,85 +1,93 @@@
+ liggghts (3.5.0+repack1-10) unstable; urgency=medium
+ 
+   * [e2a6253] Better fix for the bug, fixed in previous upload.
+               Thanks, Graham
+ 
+  -- Anton Gladky <gladk at debian.org>  Thu, 19 Jan 2017 18:58:57 +0100
+ 
+ liggghts (3.5.0+repack1-9) unstable; urgency=medium
+ 
+   * [a879ac6] Do not fail on mpi-errors. (Closes: #851726)
+ 
+  -- Anton Gladky <gladk at debian.org>  Wed, 18 Jan 2017 22:46:29 +0100
+ 
+ liggghts (3.5.0+repack1-8) unstable; urgency=medium
+ 
+   * [2219bae] Fix variable name in d/rules.
+ 
+  -- Anton Gladky <gladk at debian.org>  Fri, 30 Dec 2016 08:26:31 +0100
+ 
+ liggghts (3.5.0+repack1-7) unstable; urgency=medium
+ 
+   * [6079250] Disable test on mips64el (unstable).
+ 
+  -- Anton Gladky <gladk at debian.org>  Fri, 30 Dec 2016 00:24:51 +0100
+ 
+ liggghts (3.5.0+repack1-6) unstable; urgency=medium
+ 
+   * [96fa01f] Add mips64el to disable_auto_test_archs_mpi in d/rules.
+ 
+  -- Anton Gladky <gladk at debian.org>  Thu, 29 Dec 2016 20:02:34 +0100
+ 
+ liggghts (3.5.0+repack1-5) unstable; urgency=medium
+ 
+   [ Graham Inggs ]
+   * [fe1b4d7] Replace OMPI_MCA_orte_rsh_agent by OMPI_MCA_plm_rsh_agent
+               for autopkgtests too
+   * [5037eeb] Allow --oversubscribe for autopkgtests
+ 
+  -- Anton Gladky <gladk at debian.org>  Wed, 28 Dec 2016 19:01:44 +0100
+ 
+ liggghts (3.5.0+repack1-4) unstable; urgency=medium
+ 
+   [ Graham Inggs ]
+   * Restrictions: allow-stderr on the tests, for compatibility with current
+     openmpi.
+   * Update autopkgtests with examples from 3.5.0.
+ 
+   [ Anton Gladky ]
+   * Use --parallel build again
+ 
+  -- Anton Gladky <gladk at debian.org>  Tue, 08 Nov 2016 20:25:41 +0100
+ 
+ liggghts (3.5.0+repack1-2) unstable; urgency=medium
+ 
+   * [8031b0e] Do not use parallel build. Fails on some platforms.
+   * [6a2a7ed] Fix autotests.
+ 
+  -- Anton Gladky <gladk at debian.org>  Sat, 05 Nov 2016 15:46:43 +0100
+ 
+ liggghts (3.5.0+repack1-1) unstable; urgency=medium
+ 
+   * [784df99] New upstream version 3.5.0+repack1
+   * [4101537] Refresh patches.
+ 
+  -- Anton Gladky <gladk at debian.org>  Thu, 27 Oct 2016 23:04:19 +0200
+ 
+ liggghts (3.4.0+repack1-2) unstable; urgency=medium
+ 
+   * [ead3d70] Disable mpi-test on powerpc.
+   * [6492a8e] Apply cme fix dpkg.
+ 
+  -- Anton Gladky <gladk at debian.org>  Wed, 27 Jul 2016 00:44:20 +0200
+ 
+ liggghts (3.4.0+repack1-1) unstable; urgency=medium
+ 
+   * [6a5c2a8] Imported Upstream version 3.4.0+repack1
+   * [157da23] Refresh patches.
+   * [9a184e0] Apply cme fix dpkg.
+   * [ea651a2] Update d/copyright.
+ 
+  -- Anton Gladky <gladk at debian.org>  Wed, 15 Jun 2016 22:12:40 +0200
+ 
 +liggghts (3.3.1+repack1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * [1771c68] Remove some components for VTK, which are not available
 +              in Jessie.
 +
 + -- Anton Gladky <gladk at debian.org>  Tue, 26 Jan 2016 21:35:38 +0100
 +
  liggghts (3.3.1+repack1-1) unstable; urgency=medium
  
    * [3697863] Imported Upstream version 3.3.1+repack1

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