[liggghts] 01/01: Merge tag 'upstream/3.4.0+repack1' into jessie-backports
Anton Gladky
gladk at moszumanska.debian.org
Wed Jun 15 21:34:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch jessie-backports
in repository liggghts.
commit 760cee036221db8b31d9b4c802a2f3eb22c96887
Merge: 759cbf7 6a5c2a8
Author: Anton Gladky <gladk at debian.org>
Date: Wed Jun 15 21:46:58 2016 +0200
Merge tag 'upstream/3.4.0+repack1' into jessie-backports
Upstream version 3.4.0+repack1
README | 2 +-
doc/Eqs/cna_cutoff1.tex | 28 +-
doc/Eqs/cna_cutoff2.tex | 24 +-
doc/Eqs/eff_ECP1.tex | 16 +-
doc/Eqs/fix_wall_lj1043.tex | 22 +-
doc/Eqs/gran_model_hooke_hysteresis_1.png | Bin 0 -> 1122 bytes
doc/Eqs/gran_model_hooke_hysteresis_1.tex | 9 +
doc/Eqs/gran_model_hooke_hysteresis_2.png | Bin 0 -> 2003 bytes
doc/Eqs/gran_model_hooke_hysteresis_2.tex | 12 +
doc/Eqs/heat_flux_k.tex | 22 +-
doc/Eqs/pair_comb1.tex | 14 +-
doc/Eqs/pair_comb2.tex | 44 +-
doc/JPG/hooke_hysteresis_luding1.png | Bin 0 -> 83485 bytes
doc/Manual.html | 240 +-
doc/Manual.pdf | Bin 3419668 -> 3387108 bytes
doc/Manual.txt | 42 +-
doc/Section_commands.html | 28 +-
doc/Section_commands.txt | 5 +-
doc/Section_commands_LAMMPS.html | 2 +-
doc/Section_commands_LAMMPS.txt | 2 +-
doc/Section_errors.html | 23 +-
doc/Section_errors.txt | 23 +-
doc/Section_gran_models.html | 42 +-
doc/Section_gran_models.txt | 42 +-
doc/Section_gran_models_prev.html | 2 +-
doc/Section_gran_models_prev.txt | 2 +-
doc/Section_howto.html | 2 +-
doc/Section_howto.txt | 2 +-
doc/Section_input_script.html | 6 +-
doc/Section_input_script.txt | 6 +-
doc/Section_intro.html | 2 +-
doc/Section_intro.txt | 2 +-
doc/Section_modify.html | 2 +-
doc/Section_modify.txt | 2 +-
doc/Section_packages.html | 2 +-
doc/Section_packages.txt | 2 +-
doc/Section_python.html | 2 +-
doc/Section_python.txt | 2 +-
doc/Section_start.html | 2 +-
doc/Section_start.txt | 2 +-
doc/atom_modify.html | 6 +-
doc/atom_modify.txt | 6 +-
doc/compute_coord_gran.txt | 4 +-
doc/compute_pair_gran_local.txt | 4 +-
doc/compute_rigid.txt | 4 +-
doc/dump.html | 4 +-
doc/dump.txt | 4 +-
doc/fix_insert_pack.html | 15 +-
doc/fix_insert_pack.txt | 15 +-
doc/fix_insert_rate_region.html | 17 +-
doc/fix_insert_rate_region.txt | 17 +-
doc/fix_insert_stream.html | 23 +-
doc/fix_insert_stream.txt | 23 +-
doc/fix_mesh_surface.html | 43 +-
doc/fix_mesh_surface.txt | 40 +-
doc/fix_mesh_surface_stress.html | 20 +-
doc/fix_mesh_surface_stress.txt | 16 +-
doc/fix_particletemplate_sphere.html | 26 +-
doc/fix_particletemplate_sphere.txt | 26 +-
doc/fix_poems.html | 123 +-
doc/fix_poems.txt | 68 +-
doc/fix_property_atom_timetracer.html | 82 +
doc/fix_property_atom_timetracer.txt | 73 +
doc/githubAccess_non-public.html | 8 +-
doc/githubAccess_non-public.txt | 9 +-
doc/githubAccess_public.html | 8 +-
doc/githubAccess_public.txt | 9 +-
doc/gran_cohesion_easo_capillary_viscous.html | 19 +-
doc/gran_cohesion_easo_capillary_viscous.txt | 17 +-
doc/gran_cohesion_sjkr.html | 19 +-
doc/gran_cohesion_sjkr.txt | 19 +-
doc/gran_cohesion_sjkr2.html | 18 +-
doc/gran_cohesion_sjkr2.txt | 17 +-
doc/gran_cohesion_washino_capillary_viscous.html | 37 +-
doc/gran_cohesion_washino_capillary_viscous.txt | 34 +-
doc/gran_model_hertz.html | 4 +-
doc/gran_model_hertz.txt | 4 +-
doc/gran_model_hertz_stiffness.html | 2 +-
doc/gran_model_hertz_stiffness.txt | 2 +-
doc/gran_model_hooke.html | 4 +-
doc/gran_model_hooke.txt | 4 +-
doc/gran_model_hooke_stiffness.html | 2 +-
doc/gran_model_hooke_stiffness.txt | 2 +-
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_sphere.html | 2 +-
doc/gran_surface_sphere.txt | 2 +-
doc/gran_tangential_history.html | 4 +-
doc/gran_tangential_history.txt | 4 +-
doc/gran_tangential_no_history.html | 2 +-
doc/gran_tangential_no_history.txt | 2 +-
doc/install_liggghts_windows.html | 34 +-
doc/install_liggghts_windows.txt | 33 +-
doc/pair_gran.html | 28 +-
doc/pair_gran.txt | 25 +-
doc/pair_sph.html | 252 +-
doc/rerun.html | 201 -
doc/rerun.txt | 193 -
doc/set.html | 4 +
doc/set.txt | 4 +
.../heatTransferBed_paScal/pascal/in.pascal | 2 +-
.../chute_wear/meshes/simple_chute.stl | 22628 +++++++++----------
.../Tutorials_public/conveyor/meshes/box.stl | 144 +-
.../Tutorials_public/conveyor/meshes/conveyor.stl | 24 +-
.../Tutorials_public/insert_stream/meshes/face.stl | 1208 +-
.../Tutorials_public/mesh_tet/data/test.vtk | 6370 +++---
.../movingMeshGran/meshes/bucket.stl | 396 +-
...kefile.ubuntuVTK_debug => Makefile.g++_mingw64} | 50 +-
src/MAKE/Makefile.ubuntuVTK_debug | 6 +-
src/PASCAL/Install.sh | 7 +-
src/abstract_mesh.h | 2 +
src/associative_pointer_array.h | 7 +-
src/associative_pointer_array_I.h | 60 +-
src/atom.cpp | 4 +
src/bounding_box.h | 3 +
src/cohesion_model_easo_capillary_viscous.h | 19 +-
src/cohesion_model_sjkr.h | 8 +-
src/cohesion_model_sjkr2.h | 8 +-
src/cohesion_model_washino_capillary_viscous.h | 43 +-
src/comm.h | 2 +
src/compute_ke.cpp | 5 +
src/compute_nparticles_tracer_region.cpp | 2 +-
src/compute_pair_gran_local.cpp | 101 +-
src/compute_pair_gran_local.h | 61 +-
src/contact_models.cpp | 8 +-
src/contact_models.h | 10 +-
src/container_base.cpp | 72 +-
src/container_base.h | 45 +-
src/custom_value_tracker.cpp | 31 +-
src/custom_value_tracker.h | 25 +-
src/custom_value_tracker_I.h | 88 +-
src/domain_I.h | 20 +-
src/dump.h | 3 +
src/dump_atom_vtk.h | 2 +-
src/dump_local_gran_vtk.cpp | 1029 +
src/dump_local_gran_vtk.h | 172 +
src/dump_mesh_vtk.cpp | 124 +-
src/dump_mesh_vtk.h | 3 +
src/fix_base_liggghts.cpp | 218 +
src/{properties.h => fix_base_liggghts.h} | 71 +-
src/fix_buoyancy.cpp | 40 +-
src/fix_buoyancy.h | 8 +-
src/fix_cfd_coupling_convection_impl.cpp | 294 +
...{rerun.h => fix_cfd_coupling_convection_impl.h} | 69 +-
src/fix_cfd_coupling_convection_species.cpp | 13 +
src/fix_cfd_coupling_force.cpp | 72 +-
src/fix_cfd_coupling_force.h | 9 +
src/fix_contact_history.cpp | 34 +-
src/fix_contact_history_mesh.cpp | 68 +-
src/fix_contact_history_mesh.h | 11 +-
src/fix_contact_history_mesh_I.h | 52 +-
src/fix_heat_gran.h | 2 +-
src/fix_heat_gran_conduction.cpp | 2 +-
src/fix_insert.cpp | 81 +-
src/fix_insert.h | 5 +-
src/fix_insert_pack.cpp | 4 +-
src/fix_insert_stream.cpp | 4 +-
src/fix_massflow_mesh.cpp | 51 +-
src/fix_massflow_mesh.h | 2 +
src/fix_mesh.cpp | 28 +-
src/fix_mesh.h | 7 +-
src/fix_multisphere.h | 12 +-
src/fix_neighlist_mesh.cpp | 138 +-
src/fix_neighlist_mesh.h | 3 +
src/fix_particledistribution_discrete.cpp | 10 +
src/fix_property_atom.cpp | 16 +-
src/fix_property_atom.h | 3 +-
src/fix_property_atom_timetracer.cpp | 232 +
...properties.h => fix_property_atom_timetracer.h} | 48 +-
src/fix_scalar_transport_equation.cpp | 212 +-
src/fix_scalar_transport_equation.h | 25 +
src/fix_template_multiplespheres.cpp | 51 +-
src/fix_template_multiplespheres.h | 5 +
src/fix_template_multisphere.cpp | 4 +-
src/fix_template_sphere.cpp | 13 +-
src/fix_wall_gran.cpp | 303 +-
src/fix_wall_gran.h | 108 +-
src/fix_wall_gran_base.h | 127 +-
src/general_container.h | 13 +-
src/general_container_I.h | 223 +-
src/global_properties.cpp | 88 +-
src/global_properties.h | 4 +
src/granular_pair_style.h | 2 +-
src/granular_wall.h | 5 +-
src/group.cpp | 39 +-
src/group.h | 3 +-
src/input.cpp | 30 +
src/input.h | 5 +
src/input_mesh_tri.cpp | 23 +-
src/input_mesh_tri.h | 10 +-
src/integrate.h | 2 +-
src/lammps.cpp | 7 +
src/lammps.h | 2 +
src/lmpwindows.h | 3 +
src/math_extra_liggghts.h | 15 +
src/modify.h | 1 +
src/multi_node_mesh.h | 8 +
src/multi_node_mesh_I.h | 11 +
src/multi_node_mesh_parallel_I.h | 10 +-
src/multisphere.h | 4 +
src/neigh_gran.cpp | 6 +-
src/normal_model_hertz.h | 17 +-
src/normal_model_hertz_stiffness.h | 2 +
src/normal_model_hooke.h | 2 +
src/normal_model_hooke_hysteresis.h | 2 +
src/normal_model_hooke_stiffness.h | 2 +
src/pair_gran.cpp | 1 +
src/pair_gran_base.h | 19 +-
src/pair_gran_proxy.cpp | 29 +-
src/pair_sph_artvisc_tenscorr.cpp | 4 +-
src/particleToInsert.cpp | 4 +-
src/particleToInsert.h | 4 +-
src/particleToInsert_multisphere.cpp | 2 +-
src/particleToInsert_multisphere.h | 2 +-
src/properties.cpp | 39 +-
src/properties.h | 12 +-
src/read_dump.cpp | 168 +-
src/read_dump.h | 5 +
src/reader_native.cpp | 25 +-
src/region.h | 3 +
src/region_mesh_tet.cpp | 12 +-
src/region_mesh_tet.h | 3 +-
src/region_neighbor_list.cpp | 481 +-
src/region_neighbor_list.h | 109 +-
..._neighbor_list.cpp => region_neighbor_list_I.h} | 361 +-
...r_list.h => region_neighbor_list_definitions.h} | 162 +-
src/rerun.cpp | 224 -
src/rolling_model_epsd.h | 36 +-
src/scalar_container.h | 4 +-
src/settings.h | 1 +
src/{input_mesh_tri.h => string_liggghts.h} | 47 +-
src/style_command.h | 1 -
src/style_dump.h | 1 +
src/style_fix.h | 3 +
src/surface_mesh.h | 8 +-
src/surface_mesh_I.h | 78 +-
src/surface_mesh_feature_remove.h | 1 +
src/surface_mesh_feature_remove_I.h | 1 +
src/tangential_model_history.h | 2 +
src/tracking_mesh_I.h | 5 +-
src/tri_mesh.h | 9 +-
src/tri_mesh_I.h | 22 +-
src/universe.cpp | 3 +-
src/update.cpp | 4 +-
src/update.h | 4 +
src/utils.h | 13 +
src/variable.h | 3 +
src/vector_container.h | 4 +-
src/vector_liggghts.h | 43 +-
src/velocity.cpp | 6 +-
src/version_liggghts.h | 2 +-
src/version_liggghts.txt | 2 +-
258 files changed, 21444 insertions(+), 18699 deletions(-)
diff --cc src/container_base.h
index 45930bb,9d48e78..6a44867
--- a/src/container_base.h
+++ b/src/container_base.h
@@@ -145,13 -162,13 +166,17 @@@ namespace LAMMPS_N
virtual int popElemFromBuffer(double *buf,int operation,
bool scale=false,bool translate=false, bool rotate=false) = 0;
+ // static elements
+ static const char * AVERAGESUFFIX;
+ static const char * MEANSQUARESUFFIX;
+
protected:
+<<<<<<< HEAD
+ ContainerBase(char *_id, char* _comm, char* _ref, char *_restart,int _scalePower);
+=======
ContainerBase(const char *_id, const char* _comm, const char* _ref, const char *_restart,int _scalePower);
+>>>>>>> upstream/3.0.0
ContainerBase(ContainerBase const &orig);
inline bool isScaleInvariant() const;
diff --cc src/general_container_I.h
index 9f3ad3b,8d9feda..7f6a6a5
--- a/src/general_container_I.h
+++ b/src/general_container_I.h
@@@ -49,17 -49,13 +49,17 @@@
------------------------------------------------------------------------- */
template<typename T, int NUM_VEC, int LEN_VEC>
+<<<<<<< HEAD
+ GeneralContainer<T,NUM_VEC,LEN_VEC>::GeneralContainer(char *_id)
+=======
GeneralContainer<T,NUM_VEC,LEN_VEC>::GeneralContainer(const char *_id)
+>>>>>>> upstream/3.0.0
: ContainerBase(_id),
numElem_(0),
- maxElem_(GROW),
+ maxElem_(GROW_CONTAINER()),
defaultValue_(0)
{
- create<T>(arr_,GROW,NUM_VEC,LEN_VEC);
+ create<T>(arr_,GROW_CONTAINER(),NUM_VEC,LEN_VEC);
}
template<typename T, int NUM_VEC, int LEN_VEC>
--
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