[liggghts] 03/08: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Sun Jun 15 18:59:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit 82f797e46f303a9030141f832bb7373081ec9dcb
Merge: b745737 61a906b
Author: Anton Gladky <gladk at debian.org>
Date: Sun Jun 15 18:56:52 2014 +0200
Merge.
doc/Eqs/model_C2_part_1.jpg | Bin 0 -> 7207 bytes
doc/Eqs/model_C2_part_2.jpg | Bin 0 -> 9419 bytes
doc/Eqs/model_C3_part_1.jpg | Bin 0 -> 4545 bytes
doc/Eqs/model_C3_part_2.jpg | Bin 0 -> 10742 bytes
doc/Manual.pdf | Bin 6551572 -> 7933716 bytes
doc/fix.html | 2 +-
doc/fix.txt | 2 +-
doc/fix_heat_gran_conduction.html | 29 +-
doc/fix_heat_gran_conduction.txt | 27 +-
doc/fix_mesh_surface_stress_servo.html | 11 +-
doc/fix_mesh_surface_stress_servo.txt | 7 +-
doc/fix_wall_gran.html | 19 +-
doc/fix_wall_gran.txt | 17 +-
doc/gran_model_hertz.html | 13 +-
doc/gran_model_hertz.txt | 9 +
doc/gran_model_hertz_stiffness.html | 13 +-
doc/gran_model_hertz_stiffness.txt | 12 +
doc/gran_model_hooke.html | 19 +-
doc/gran_model_hooke.txt | 19 +-
doc/gran_model_hooke_stiffness.html | 16 +-
doc/gran_model_hooke_stiffness.txt | 15 +-
doc/liggghts_3.X_tutorial.html | 2 +-
doc/liggghts_3.X_tutorial.txt | 2 +-
doc/pair_gran.html | 2 +-
doc/pair_gran.txt | 2 +-
examples/LAMMPS/ASPHERE/README | 36 -
examples/LAMMPS/ASPHERE/box/box.py | 10 -
examples/LAMMPS/ASPHERE/box/data.box | 852 -
examples/LAMMPS/ASPHERE/box/in.box | 107 -
examples/LAMMPS/ASPHERE/box/in.box.mp | 108 -
examples/LAMMPS/ASPHERE/box/log.box.10Sep13 | 289 -
examples/LAMMPS/ASPHERE/box/log.box.mp.10Sep13 | 290 -
examples/LAMMPS/ASPHERE/dimer/data.dimer | 412 -
examples/LAMMPS/ASPHERE/dimer/dimer.py | 10 -
examples/LAMMPS/ASPHERE/dimer/in.dimer | 104 -
examples/LAMMPS/ASPHERE/dimer/in.dimer.mp | 105 -
examples/LAMMPS/ASPHERE/dimer/log.dimer.10Sep13 | 285 -
examples/LAMMPS/ASPHERE/dimer/log.dimer.mp.10Sep13 | 236 -
examples/LAMMPS/ASPHERE/ellipsoid/in.ellipsoid | 116 -
examples/LAMMPS/ASPHERE/ellipsoid/in.ellipsoid.mp | 117 -
.../LAMMPS/ASPHERE/ellipsoid/log.ellipsoid.10Sep13 | 296 -
.../ASPHERE/ellipsoid/log.ellipsoid.mp.10Sep13 | 247 -
examples/LAMMPS/ASPHERE/line/data.line | 713 -
examples/LAMMPS/ASPHERE/line/data.line.srd | 813 -
examples/LAMMPS/ASPHERE/line/in.line | 53 -
examples/LAMMPS/ASPHERE/line/in.line.srd | 105 -
examples/LAMMPS/ASPHERE/line/line.py | 14 -
examples/LAMMPS/ASPHERE/line/line.srd.py | 14 -
examples/LAMMPS/ASPHERE/line/line.srd.viz.py | 16 -
examples/LAMMPS/ASPHERE/line/line.viz.py | 13 -
examples/LAMMPS/ASPHERE/line/log.line.10Sep13 | 212 -
examples/LAMMPS/ASPHERE/line/log.line.srd.10Sep13 | 243 -
examples/LAMMPS/ASPHERE/poly/in.poly | 113 -
examples/LAMMPS/ASPHERE/poly/in.poly.mp | 114 -
examples/LAMMPS/ASPHERE/poly/log.poly.10Sep13 | 288 -
examples/LAMMPS/ASPHERE/poly/log.poly.mp.10Sep13 | 239 -
examples/LAMMPS/ASPHERE/star/data.star | 552 -
examples/LAMMPS/ASPHERE/star/in.star | 107 -
examples/LAMMPS/ASPHERE/star/in.star.mp | 108 -
examples/LAMMPS/ASPHERE/star/log.star.10Sep13 | 289 -
examples/LAMMPS/ASPHERE/star/log.star.mp.10Sep13 | 290 -
examples/LAMMPS/ASPHERE/star/star.py | 11 -
examples/LAMMPS/ASPHERE/tri/data.tri.srd | 3013 -
examples/LAMMPS/ASPHERE/tri/in.tri.srd | 105 -
examples/LAMMPS/ASPHERE/tri/log.tri.srd.10Sep13 | 242 -
examples/LAMMPS/ASPHERE/tri/tri.srd.py | 14 -
examples/LAMMPS/ASPHERE/tri/tri.srd.viz.py | 18 -
examples/LAMMPS/COUPLE/README | 40 -
examples/LAMMPS/COUPLE/fortran/README | 8 -
examples/LAMMPS/COUPLE/fortran/libfwrapper.c | 136 -
examples/LAMMPS/COUPLE/fortran2/LAMMPS-wrapper.cpp | 236 -
examples/LAMMPS/COUPLE/fortran2/LAMMPS-wrapper.h | 41 -
examples/LAMMPS/COUPLE/fortran2/LAMMPS.F90 | 942 -
examples/LAMMPS/COUPLE/fortran2/README | 265 -
examples/LAMMPS/COUPLE/fortran2/in.simple | 16 -
examples/LAMMPS/COUPLE/fortran2/makefile | 36 -
examples/LAMMPS/COUPLE/fortran2/simple.f90 | 111 -
examples/LAMMPS/COUPLE/lammps_quest/Makefile.g++ | 47 -
examples/LAMMPS/COUPLE/lammps_quest/README | 64 -
examples/LAMMPS/COUPLE/lammps_quest/in.lammps | 20 -
examples/LAMMPS/COUPLE/lammps_quest/lmppath.h | 1 -
examples/LAMMPS/COUPLE/lammps_quest/lmpqst.cpp | 264 -
examples/LAMMPS/COUPLE/lammps_quest/log.lammps.1 | 58 -
examples/LAMMPS/COUPLE/lammps_quest/log.lammps.4 | 58 -
examples/LAMMPS/COUPLE/lammps_quest/qstexe.h | 1 -
examples/LAMMPS/COUPLE/lammps_quest/si_111.in | 161 -
examples/LAMMPS/COUPLE/lammps_spparks/Makefile.g++ | 48 -
examples/LAMMPS/COUPLE/lammps_spparks/README | 74 -
examples/LAMMPS/COUPLE/lammps_spparks/in.lammps | 114 -
examples/LAMMPS/COUPLE/lammps_spparks/in.spparks | 23 -
examples/LAMMPS/COUPLE/lammps_spparks/lmppath.h | 1 -
examples/LAMMPS/COUPLE/lammps_spparks/lmpspk.cpp | 223 -
examples/LAMMPS/COUPLE/lammps_spparks/log.lammps.1 | 978 -
examples/LAMMPS/COUPLE/lammps_spparks/log.lammps.4 | 978 -
.../LAMMPS/COUPLE/lammps_spparks/log.spparks.1 | 271 -
.../LAMMPS/COUPLE/lammps_spparks/log.spparks.4 | 271 -
examples/LAMMPS/COUPLE/lammps_spparks/spkpath.h | 1 -
examples/LAMMPS/COUPLE/library/Makefile.g++ | 42 -
examples/LAMMPS/COUPLE/library/README | 16 -
examples/LAMMPS/COUPLE/library/error.cpp | 42 -
examples/LAMMPS/COUPLE/library/error.h | 19 -
examples/LAMMPS/COUPLE/library/files.cpp | 48 -
examples/LAMMPS/COUPLE/library/files.h | 2 -
examples/LAMMPS/COUPLE/library/irregular.cpp | 393 -
examples/LAMMPS/COUPLE/library/irregular.h | 58 -
.../LAMMPS/COUPLE/library/lammps_data_write.cpp | 249 -
examples/LAMMPS/COUPLE/library/lammps_data_write.h | 48 -
examples/LAMMPS/COUPLE/library/many2many.cpp | 316 -
examples/LAMMPS/COUPLE/library/many2many.h | 47 -
examples/LAMMPS/COUPLE/library/many2one.cpp | 103 -
examples/LAMMPS/COUPLE/library/many2one.h | 25 -
examples/LAMMPS/COUPLE/library/memory.cpp | 120 -
examples/LAMMPS/COUPLE/library/memory.h | 23 -
examples/LAMMPS/COUPLE/library/one2many.cpp | 76 -
examples/LAMMPS/COUPLE/library/one2many.h | 24 -
examples/LAMMPS/COUPLE/library/send2one.cpp | 83 -
examples/LAMMPS/COUPLE/library/send2one.h | 29 -
examples/LAMMPS/COUPLE/simple/README | 86 -
examples/LAMMPS/COUPLE/simple/in.lj | 26 -
examples/LAMMPS/COUPLE/simple/log.simple.c++.1 | 124 -
examples/LAMMPS/COUPLE/simple/log.simple.c++.4 | 124 -
examples/LAMMPS/COUPLE/simple/simple.c | 116 -
examples/LAMMPS/COUPLE/simple/simple.cpp | 122 -
examples/LAMMPS/COUPLE/simple/simple.f90 | 135 -
examples/LAMMPS/ELASTIC/Si.sw | 17 -
examples/LAMMPS/ELASTIC/displace.mod | 134 -
examples/LAMMPS/ELASTIC/displace_restart.mod | 134 -
examples/LAMMPS/ELASTIC/displace_reverse.mod | 162 -
examples/LAMMPS/ELASTIC/in.elastic | 185 -
examples/LAMMPS/ELASTIC/init.mod | 46 -
examples/LAMMPS/ELASTIC/potential.mod | 19 -
examples/LAMMPS/KAPPA/README | 89 -
examples/LAMMPS/KAPPA/in.heat | 76 -
examples/LAMMPS/KAPPA/in.heatflux | 79 -
examples/LAMMPS/KAPPA/in.langevin | 88 -
examples/LAMMPS/KAPPA/in.mp | 71 -
examples/LAMMPS/KAPPA/log.heat.12Sep13 | 195 -
examples/LAMMPS/KAPPA/log.heatflux.12Sep13 | 208 -
examples/LAMMPS/KAPPA/log.langevin.12Sep13 | 215 -
examples/LAMMPS/KAPPA/log.mp.12Sep13 | 200 -
examples/LAMMPS/KAPPA/profile.heat.12Sep13 | 423 -
examples/LAMMPS/KAPPA/profile.heatflux.12Sep13 | 10254 -
examples/LAMMPS/KAPPA/profile.langevin.12Sep13 | 423 -
examples/LAMMPS/KAPPA/profile.mp.12Sep13 | 843 -
examples/LAMMPS/README | 134 -
examples/LAMMPS/USER/atc/README | 245 -
.../LAMMPS/USER/atc/cauchy_born/Ar_CauchyBorn.mat | 7 -
.../USER/atc/cauchy_born/Ar_CauchyBorn_linear.mat | 7 -
.../LAMMPS/USER/atc/cauchy_born/Au_CauchyBorn.mat | 6 -
.../USER/atc/cauchy_born/Au_CauchyBorn_linear.mat | 6 -
examples/LAMMPS/USER/atc/cauchy_born/Au_eam.mat | 5 -
.../LAMMPS/USER/atc/cauchy_born/Au_eam_linear.mat | 6 -
.../LAMMPS/USER/atc/cauchy_born/Cu_CauchyBorn.mat | 5 -
.../LAMMPS/USER/atc/cauchy_born/cb_biaxial.screen | 402 -
.../LAMMPS/USER/atc/cauchy_born/cb_shear.screen | 386 -
.../USER/atc/cauchy_born/cb_unistrain.screen | 124 -
.../USER/atc/cauchy_born/cb_unistrain_eam.screen | 146 -
.../atc/cauchy_born/cb_unistrain_eam_linear.screen | 160 -
.../atc/cauchy_born/cb_unistrain_linear.screen | 163 -
.../USER/atc/cauchy_born/cb_volumetric.screen | 391 -
.../LAMMPS/USER/atc/cauchy_born/flying_cube.screen | 569 -
.../LAMMPS/USER/atc/cauchy_born/ftcb_constV.screen | 302 -
examples/LAMMPS/USER/atc/cauchy_born/in.cb_biaxial | 54 -
examples/LAMMPS/USER/atc/cauchy_born/in.cb_shear | 55 -
.../LAMMPS/USER/atc/cauchy_born/in.cb_unistrain | 46 -
.../USER/atc/cauchy_born/in.cb_unistrain_eam | 51 -
.../atc/cauchy_born/in.cb_unistrain_eam_linear | 51 -
.../USER/atc/cauchy_born/in.cb_unistrain_linear | 54 -
.../LAMMPS/USER/atc/cauchy_born/in.cb_volumetric | 49 -
.../LAMMPS/USER/atc/cauchy_born/in.flying_cube | 61 -
.../LAMMPS/USER/atc/cauchy_born/in.ftcb_constV | 74 -
examples/LAMMPS/USER/atc/cauchy_born/in.read_xref | 37 -
.../LAMMPS/USER/atc/cauchy_born/read_xref.screen | 84 -
.../LAMMPS/USER/atc/drift_diffusion/Ar_ddm.mat | 37 -
.../LAMMPS/USER/atc/drift_diffusion/CNT_ddm.mat | 41 -
.../LAMMPS/USER/atc/drift_diffusion/Cu_cddm.mat | 45 -
.../atc/drift_diffusion/SiGe_ddm_schrodinger.mat | 86 -
.../drift_diffusion/SiVacuum_cddm_schrodinger.mat | 64 -
.../drift_diffusion/SiVacuum_ddm_schrodinger.mat | 52 -
.../LAMMPS/USER/atc/drift_diffusion/Si_ddm.mat | 35 -
.../LAMMPS/USER/atc/drift_diffusion/Si_ddm_eq.mat | 44 -
.../atc/drift_diffusion/Si_ddm_schrodinger.mat | 41 -
.../atc/drift_diffusion/Si_ddm_thermopower.mat | 36 -
.../atc/drift_diffusion/convective_pulse.screen | 145 -
.../atc/drift_diffusion/ddm_schrodinger.screen | 79 -
.../USER/atc/drift_diffusion/finite_well.screen | 106 -
.../USER/atc/drift_diffusion/in.convective_pulse | 72 -
.../USER/atc/drift_diffusion/in.ddm_schrodinger | 66 -
.../LAMMPS/USER/atc/drift_diffusion/in.finite_well | 75 -
.../USER/atc/drift_diffusion/in.no_atoms_ddm | 65 -
.../USER/atc/drift_diffusion/in.null_material_ddm | 79 -
.../USER/atc/drift_diffusion/in.poisson1d_noatoms | 41 -
.../USER/atc/drift_diffusion/in.poisson2d_noatoms | 73 -
.../in.schrodinger-poisson2d_Jconstraint | 138 -
.../in.schrodinger-poisson2d_convective | 150 -
.../in.schrodinger-poisson2d_noatoms | 124 -
.../USER/atc/drift_diffusion/no_atoms_ddm.screen | 143 -
.../atc/drift_diffusion/null_material_ddm.screen | 159 -
.../atc/drift_diffusion/poisson1d_noatoms.screen | 42 -
.../atc/drift_diffusion/poisson2d_noatoms.screen | 110 -
.../schrodinger-poisson2d_Jconstraint.screen | 163 -
.../schrodinger-poisson2d_convective.screen | 220 -
.../schrodinger-poisson2d_noatoms.screen | 192 -
examples/LAMMPS/USER/atc/elastic/Ar_CauchyBorn.mat | 8 -
.../USER/atc/elastic/Ar_CauchyBornLinear.mat | 9 -
examples/LAMMPS/USER/atc/elastic/Ar_damped.mat | 37 -
examples/LAMMPS/USER/atc/elastic/Ar_elastic.mat | 29 -
.../LAMMPS/USER/atc/elastic/Ar_thermo_elastic.mat | 11 -
examples/LAMMPS/USER/atc/elastic/Au_elastic.mat | 18 -
examples/LAMMPS/USER/atc/elastic/CNT.mat | 1315 -
.../LAMMPS/USER/atc/elastic/CNT_electrostatic.mat | 18 -
.../LAMMPS/USER/atc/elastic/CNT_electrostatic2.mat | 21 -
examples/LAMMPS/USER/atc/elastic/CNT_id.mat | 11 -
examples/LAMMPS/USER/atc/elastic/bar1d.screen | 270 -
.../LAMMPS/USER/atc/elastic/bar1d_damped.screen | 385 -
examples/LAMMPS/USER/atc/elastic/bar1d_flux.screen | 281 -
.../LAMMPS/USER/atc/elastic/bar1d_frac_step.screen | 228 -
.../USER/atc/elastic/bar1d_ghost_flux.screen | 211 -
.../USER/atc/elastic/bar1d_thermo_elastic.screen | 113 -
.../USER/atc/elastic/cnt_electrostatic.screen | 1213 -
.../USER/atc/elastic/cnt_electrostatic2.screen | 215 -
.../USER/atc/elastic/cnt_fixed_charge.screen | 351 -
examples/LAMMPS/USER/atc/elastic/eam_energy.screen | 335 -
.../USER/atc/elastic/electron_density.screen | 267 -
.../USER/atc/elastic/electrostatic_bending.screen | 846 -
.../atc/elastic/electrostatic_bending_dos.screen | 633 -
examples/LAMMPS/USER/atc/elastic/in.bar1d | 91 -
examples/LAMMPS/USER/atc/elastic/in.bar1d_damped | 116 -
examples/LAMMPS/USER/atc/elastic/in.bar1d_flux | 98 -
.../LAMMPS/USER/atc/elastic/in.bar1d_frac_step | 99 -
.../LAMMPS/USER/atc/elastic/in.bar1d_ghost_flux | 101 -
.../USER/atc/elastic/in.bar1d_thermo_elastic | 139 -
.../LAMMPS/USER/atc/elastic/in.cnt_electrostatic | 107 -
.../LAMMPS/USER/atc/elastic/in.cnt_electrostatic2 | 118 -
.../LAMMPS/USER/atc/elastic/in.cnt_fixed_charge | 145 -
examples/LAMMPS/USER/atc/elastic/in.eam_energy | 80 -
.../LAMMPS/USER/atc/elastic/in.electron_density | 74 -
.../USER/atc/elastic/in.electrostatic_bending | 186 -
.../USER/atc/elastic/in.electrostatic_bending_dos | 164 -
examples/LAMMPS/USER/atc/elastic/in.no_atoms | 42 -
examples/LAMMPS/USER/atc/elastic/in.no_atoms_cb | 43 -
.../LAMMPS/USER/atc/elastic/in.no_atoms_cb_linear | 42 -
examples/LAMMPS/USER/atc/elastic/no_atoms.screen | 75 -
.../LAMMPS/USER/atc/elastic/no_atoms_cb.screen | 78 -
.../USER/atc/elastic/no_atoms_cb_linear.screen | 79 -
examples/LAMMPS/USER/atc/fluids/Ar_elastic.mat | 8 -
.../LAMMPS/USER/atc/fluids/Ar_electrostatic.mat | 8 -
examples/LAMMPS/USER/atc/fluids/Ar_liquid.mat | 8 -
examples/LAMMPS/USER/atc/fluids/Ar_species.mat | 5 -
examples/LAMMPS/USER/atc/fluids/Ar_species_dl.mat | 8 -
examples/LAMMPS/USER/atc/fluids/Ar_thermal.mat | 9 -
.../LAMMPS/USER/atc/fluids/Ar_visc_no_atoms.mat | 6 -
examples/LAMMPS/USER/atc/fluids/Ar_viscosity.mat | 9 -
.../LAMMPS/USER/atc/fluids/bar1d_fluids.screen | 263 -
.../LAMMPS/USER/atc/fluids/concentration.screen | 169 -
.../USER/atc/fluids/conducting_interface.screen | 184 -
examples/LAMMPS/USER/atc/fluids/dielectric.mat | 15 -
.../USER/atc/fluids/dielectric_interface.screen | 184 -
.../LAMMPS/USER/atc/fluids/double_layer.screen | 203 -
examples/LAMMPS/USER/atc/fluids/in.bar1d_fluids | 98 -
examples/LAMMPS/USER/atc/fluids/in.concentration | 172 -
.../LAMMPS/USER/atc/fluids/in.conducting_interface | 111 -
.../LAMMPS/USER/atc/fluids/in.dielectric_interface | 106 -
examples/LAMMPS/USER/atc/fluids/in.double_layer | 100 -
.../LAMMPS/USER/atc/fluids/in.liquid_electrostatic | 63 -
examples/LAMMPS/USER/atc/fluids/in.opp_force | 70 -
examples/LAMMPS/USER/atc/fluids/in.poisson | 69 -
examples/LAMMPS/USER/atc/fluids/in.shear_flow | 84 -
examples/LAMMPS/USER/atc/fluids/in.shear_no_atoms | 32 -
.../USER/atc/fluids/liquid_electrostatic.screen | 143 -
examples/LAMMPS/USER/atc/fluids/opp_force.screen | 146 -
examples/LAMMPS/USER/atc/fluids/poisson.screen | 260 -
examples/LAMMPS/USER/atc/fluids/shear_flow.screen | 65 -
.../LAMMPS/USER/atc/fluids/shear_no_atoms.screen | 91 -
examples/LAMMPS/USER/atc/hardy/consistency.screen | 843 -
.../USER/atc/hardy/eam_kernel_convergence.screen | 2455 -
.../USER/atc/hardy/eam_unistrain_cell.screen | 71 -
.../USER/atc/hardy/eam_unistrain_mesh.screen | 111 -
.../USER/atc/hardy/eam_unistrain_qcylinder.screen | 68 -
.../USER/atc/hardy/eam_unistrain_qsphere.screen | 68 -
.../USER/atc/hardy/eam_unistrain_step.screen | 110 -
.../USER/atc/hardy/eam_volume_stretch.screen | 114 -
.../LAMMPS/USER/atc/hardy/eshelby_static.screen | 1273 -
examples/LAMMPS/USER/atc/hardy/in.consistency | 60 -
.../USER/atc/hardy/in.eam_kernel_convergence | 51 -
.../LAMMPS/USER/atc/hardy/in.eam_unistrain_cell | 45 -
.../LAMMPS/USER/atc/hardy/in.eam_unistrain_mesh | 47 -
.../USER/atc/hardy/in.eam_unistrain_qcylinder | 44 -
.../LAMMPS/USER/atc/hardy/in.eam_unistrain_qsphere | 44 -
.../LAMMPS/USER/atc/hardy/in.eam_unistrain_step | 45 -
.../LAMMPS/USER/atc/hardy/in.eam_volume_stretch | 46 -
examples/LAMMPS/USER/atc/hardy/in.eshelby_static | 132 -
examples/LAMMPS/USER/atc/hardy/in.nvt | 38 -
examples/LAMMPS/USER/atc/hardy/nvt.data | 1020 -
examples/LAMMPS/USER/atc/hardy/nvt.screen | 92 -
examples/LAMMPS/USER/atc/mesh/Ar_ttm.mat | 35 -
examples/LAMMPS/USER/atc/mesh/Si.mat | 9 -
.../LAMMPS/USER/atc/mesh/gaussianIC1d_hex.screen | 108 -
.../LAMMPS/USER/atc/mesh/gaussianIC2d_hex.screen | 287 -
.../atc/mesh/gaussianIC2d_hex20_uniform.screen | 107 -
.../atc/mesh/gaussianIC2d_hex27_uniform.screen | 99 -
.../USER/atc/mesh/gaussianIC2d_hex_uniform.screen | 126 -
.../LAMMPS/USER/atc/mesh/gaussianIC2d_tet.screen | 102 -
examples/LAMMPS/USER/atc/mesh/in.gaussianIC1d_hex | 56 -
examples/LAMMPS/USER/atc/mesh/in.gaussianIC2d_hex | 69 -
.../USER/atc/mesh/in.gaussianIC2d_hex20_uniform | 37 -
.../USER/atc/mesh/in.gaussianIC2d_hex27_uniform | 37 -
examples/LAMMPS/USER/atc/mesh/in.gaussianIC2d_tet | 40 -
examples/LAMMPS/USER/atc/mesh/in.kernel2d_hex | 32 -
examples/LAMMPS/USER/atc/mesh/in.kernel2d_tet | 28 -
examples/LAMMPS/USER/atc/mesh/in.mesh2d_tet | 29 -
examples/LAMMPS/USER/atc/mesh/in.semicircle | 101 -
examples/LAMMPS/USER/atc/mesh/kernel2d_hex.screen | 81 -
examples/LAMMPS/USER/atc/mesh/kernel2d_tet.screen | 77 -
examples/LAMMPS/USER/atc/mesh/mesh2d_tet.screen | 78 -
examples/LAMMPS/USER/atc/mesh/semicircle.screen | 205 -
.../LAMMPS/USER/atc/molecule/harmonic_bonds.screen | 123 -
.../LAMMPS/USER/atc/molecule/in.harmonic_bonds | 55 -
examples/LAMMPS/USER/atc/molecule/in.polarize | 120 -
examples/LAMMPS/USER/atc/molecule/in.quartic_bonds | 60 -
examples/LAMMPS/USER/atc/molecule/in.water | 96 -
examples/LAMMPS/USER/atc/molecule/polarize.screen | 316 -
.../LAMMPS/USER/atc/molecule/quartic_bonds.screen | 116 -
examples/LAMMPS/USER/atc/molecule/water.mat | 5 -
examples/LAMMPS/USER/atc/molecule/water.screen | 100 -
examples/LAMMPS/USER/atc/thermal/Ar_thermal.mat | 14 -
examples/LAMMPS/USER/atc/thermal/bar1d.screen | 374 -
.../LAMMPS/USER/atc/thermal/bar1d_all_atoms.screen | 103 -
.../LAMMPS/USER/atc/thermal/bar1d_combined.screen | 165 -
examples/LAMMPS/USER/atc/thermal/bar1d_flux.screen | 252 -
.../LAMMPS/USER/atc/thermal/bar1d_frac_step.screen | 177 -
.../LAMMPS/USER/atc/thermal/bar1d_hoover.screen | 130 -
.../USER/atc/thermal/bar1d_interpolate.screen | 207 -
.../LAMMPS/USER/atc/thermal/bar1d_lumped.screen | 295 -
examples/LAMMPS/USER/atc/thermal/in.bar1d | 79 -
.../LAMMPS/USER/atc/thermal/in.bar1d_all_atoms | 101 -
examples/LAMMPS/USER/atc/thermal/in.bar1d_combined | 87 -
examples/LAMMPS/USER/atc/thermal/in.bar1d_flux | 79 -
.../LAMMPS/USER/atc/thermal/in.bar1d_frac_step | 80 -
examples/LAMMPS/USER/atc/thermal/in.bar1d_hoover | 138 -
.../LAMMPS/USER/atc/thermal/in.bar1d_interpolate | 80 -
examples/LAMMPS/USER/atc/thermal/in.bar1d_lumped | 85 -
examples/LAMMPS/USER/atc/thermal/in.no_atoms | 56 -
examples/LAMMPS/USER/atc/thermal/no_atoms.screen | 351 -
.../LAMMPS/USER/atc/two_temperature/Ar_ttm.mat | 35 -
.../LAMMPS/USER/atc/two_temperature/Cu_ttm.mat | 17 -
.../USER/atc/two_temperature/bar1d_ttm.screen | 447 -
.../LAMMPS/USER/atc/two_temperature/cutout.screen | 279 -
.../USER/atc/two_temperature/gaussianIC_ttm.screen | 169 -
.../LAMMPS/USER/atc/two_temperature/in.bar1d_ttm | 86 -
examples/LAMMPS/USER/atc/two_temperature/in.cutout | 87 -
.../USER/atc/two_temperature/in.gaussianIC_ttm | 94 -
.../LAMMPS/USER/atc/two_temperature/in.no_atoms | 61 -
.../LAMMPS/USER/atc/two_temperature/in.restart | 117 -
.../USER/atc/two_temperature/in.uniform_exchange | 66 -
.../USER/atc/two_temperature/in.uniform_heating | 53 -
.../USER/atc/two_temperature/no_atoms.screen | 203 -
.../LAMMPS/USER/atc/two_temperature/restart.screen | 160 -
.../atc/two_temperature/uniform_exchange.screen | 618 -
.../atc/two_temperature/uniform_heating.screen | 134 -
examples/LAMMPS/USER/awpmd/H/README | 1 -
examples/LAMMPS/USER/awpmd/H/data.h_atom | 18 -
examples/LAMMPS/USER/awpmd/H/data.h_molecule | 25 -
examples/LAMMPS/USER/awpmd/H/in.h_atom | 40 -
examples/LAMMPS/USER/awpmd/H/in.h_molecule | 40 -
examples/LAMMPS/USER/cg-cmm/README | 33 -
.../LAMMPS/USER/cg-cmm/peg-verlet/data.pegc12e8.gz | Bin 696097 -> 0 bytes
examples/LAMMPS/USER/cg-cmm/peg-verlet/in.pegc12e8 | 32 -
.../USER/cg-cmm/peg-verlet/in.pegc12e8-angle | 32 -
.../LAMMPS/USER/cg-cmm/peg-verlet/log.pegc12e8 | 146 -
.../USER/cg-cmm/peg-verlet/log.pegc12e8-angle | 146 -
.../LAMMPS/USER/cg-cmm/peg-verlet/parm.pegc12e8 | 42 -
.../USER/cg-cmm/peg-verlet/parm.pegc12e8-angle | 42 -
.../LAMMPS/USER/cg-cmm/peg-verlet/pegc12e8.psf.gz | Bin 209419 -> 0 bytes
examples/LAMMPS/USER/colvars/data.peptide | 6531 -
examples/LAMMPS/USER/colvars/in.peptide-colvars | 48 -
examples/LAMMPS/USER/colvars/in.peptide-colvars2 | 40 -
examples/LAMMPS/USER/colvars/log.peptide-colvars-1 | 516 -
examples/LAMMPS/USER/colvars/log.peptide-colvars-4 | 516 -
.../LAMMPS/USER/colvars/log.peptide-colvars2-1 | 182 -
.../LAMMPS/USER/colvars/log.peptide-colvars2-4 | 182 -
examples/LAMMPS/USER/colvars/out.colvars.state | 22 -
examples/LAMMPS/USER/colvars/out.colvars.traj | 102 -
examples/LAMMPS/USER/colvars/out2.colvars.state | 22 -
examples/LAMMPS/USER/colvars/out2.colvars.traj | 102 -
examples/LAMMPS/USER/colvars/peptide.colvars | 39 -
examples/LAMMPS/USER/colvars/peptide.colvars2 | 26 -
examples/LAMMPS/USER/colvars/peptide.psf | 126 -
.../LAMMPS/USER/colvars/peptide2.colvars.state | 17 -
examples/LAMMPS/USER/colvars/peptide2.colvars.traj | 102 -
examples/LAMMPS/USER/cuda/data.phosphate | 21922 --
examples/LAMMPS/USER/cuda/data.rhodo | 191072 ------------------
examples/LAMMPS/USER/cuda/in.melt_2.5.cuda | 34 -
examples/LAMMPS/USER/cuda/in.melt_5.0.cuda | 34 -
examples/LAMMPS/USER/cuda/in.phosphate.cuda | 32 -
examples/LAMMPS/USER/cuda/in.rhodo.cuda | 34 -
examples/LAMMPS/USER/eff/Auger-Adamantane/README | 9 -
.../USER/eff/Auger-Adamantane/data.adamantane | 119 -
.../eff/Auger-Adamantane/data.adamantane_ionized | 118 -
.../eff/Auger-Adamantane/in.adamantane_ionized.nve | 51 -
examples/LAMMPS/USER/eff/Be-solid/README | 3 -
examples/LAMMPS/USER/eff/Be-solid/data.Be-solid | 20176 --
examples/LAMMPS/USER/eff/Be-solid/in.Be-solid.spe | 30 -
examples/LAMMPS/USER/eff/CH4/README | 2 -
examples/LAMMPS/USER/eff/CH4/data.ch4 | 32 -
examples/LAMMPS/USER/eff/CH4/data.ch4_ionized | 31 -
examples/LAMMPS/USER/eff/CH4/in.ch4.dynamics | 40 -
examples/LAMMPS/USER/eff/CH4/in.ch4.min | 31 -
.../LAMMPS/USER/eff/CH4/in.ch4_ionized.dynamics | 41 -
examples/LAMMPS/USER/eff/ECP/README | 3 -
examples/LAMMPS/USER/eff/ECP/Si2H6/data.Si2H6 | 40 -
examples/LAMMPS/USER/eff/ECP/Si2H6/data.Si2H6.ang | 40 -
examples/LAMMPS/USER/eff/ECP/Si2H6/in.Si2H6 | 49 -
examples/LAMMPS/USER/eff/ECP/Si2H6/in.Si2H6.ang | 61 -
examples/LAMMPS/USER/eff/ECP/SiC/bulk/data.SiC | 5018 -
examples/LAMMPS/USER/eff/ECP/SiC/bulk/in.SiC | 41 -
examples/LAMMPS/USER/eff/ECP/SiH4/data.SiH4 | 31 -
examples/LAMMPS/USER/eff/ECP/SiH4/data.SiH4.ang | 31 -
examples/LAMMPS/USER/eff/ECP/SiH4/in.SiH4 | 50 -
examples/LAMMPS/USER/eff/ECP/SiH4/in.SiH4.ang | 49 -
examples/LAMMPS/USER/eff/H/README | 1 -
examples/LAMMPS/USER/eff/H/data.h_atom.ang | 21 -
examples/LAMMPS/USER/eff/H/data.h_atom.bohr | 19 -
examples/LAMMPS/USER/eff/H/in.h_atom.spe.ang | 34 -
examples/LAMMPS/USER/eff/H/in.h_atom.spe.bohr | 34 -
examples/LAMMPS/USER/eff/H2/README | 1 -
examples/LAMMPS/USER/eff/H2/data.h2 | 144 -
examples/LAMMPS/USER/eff/H2/in.h2 | 49 -
examples/LAMMPS/USER/eff/H_plasma/README | 2 -
examples/LAMMPS/USER/eff/H_plasma/data.h2bulk | 13734 --
examples/LAMMPS/USER/eff/H_plasma/data.h2bulk.ang | 13734 --
examples/LAMMPS/USER/eff/H_plasma/in.h2bulk.npt | 47 -
examples/LAMMPS/USER/eff/H_plasma/in.h2bulk.nve | 48 -
.../LAMMPS/USER/eff/H_plasma/in.h2bulk.nve.ang | 59 -
examples/LAMMPS/USER/eff/Li-dendritic/README | 2 -
.../LAMMPS/USER/eff/Li-dendritic/data.Li-dendritic | 3472 -
.../USER/eff/Li-dendritic/in.Li-dendritic.min | 37 -
.../USER/eff/Li-dendritic/in.Li-dendritic.nvt | 51 -
examples/LAMMPS/USER/eff/Li-solid/README | 3 -
examples/LAMMPS/USER/eff/Li-solid/data.Li.ang | 2016 -
examples/LAMMPS/USER/eff/Li-solid/data.Li.bohr | 2016 -
examples/LAMMPS/USER/eff/Li-solid/in.Li.ang | 57 -
examples/LAMMPS/USER/eff/Li-solid/in.Li.bohr | 46 -
examples/LAMMPS/USER/eff/README | 11 -
.../USER/eff/fixed-core/C2H6/data.C2H6fc.ang | 40 -
.../USER/eff/fixed-core/C2H6/data.C2H6fc.bohr | 40 -
.../LAMMPS/USER/eff/fixed-core/C2H6/in.C2H6fc.ang | 60 -
.../LAMMPS/USER/eff/fixed-core/C2H6/in.C2H6fc.bohr | 53 -
.../LAMMPS/USER/eff/fixed-core/CH4/data.CH4fc.ang | 31 -
.../LAMMPS/USER/eff/fixed-core/CH4/data.CH4fc.bohr | 31 -
.../LAMMPS/USER/eff/fixed-core/CH4/in.CH4fc.ang | 58 -
.../LAMMPS/USER/eff/fixed-core/CH4/in.CH4fc.bohr | 59 -
.../USER/eff/fixed-core/CH4/in.CH4fc.spe.ang | 39 -
.../USER/eff/fixed-core/CH4/in.CH4fc.spe.bohr | 39 -
examples/LAMMPS/USER/eff/fixed-core/README | 5 -
examples/LAMMPS/USER/gauss-diel/data.gauss-diel | 14134 --
examples/LAMMPS/USER/gauss-diel/in.gauss-diel | 93 -
examples/LAMMPS/USER/gauss-diel/in.gauss-diel-cg | 93 -
.../LAMMPS/USER/gauss-diel/in.gauss-diel-split | 96 -
examples/LAMMPS/USER/gauss-diel/log.gauss-diel | 75 -
examples/LAMMPS/USER/gauss-diel/log.gauss-diel-cg | 78 -
.../LAMMPS/USER/gauss-diel/log.gauss-diel-split | 78 -
examples/LAMMPS/USER/imd/README | 58 -
examples/LAMMPS/USER/imd/bucky-plus-cnt-mol.psf | 5421 -
examples/LAMMPS/USER/imd/bucky_cnt_imd.vmd | 43 -
examples/LAMMPS/USER/imd/data.bucky-plus-cnt | 11287 --
examples/LAMMPS/USER/imd/data.deca-ala-solv | 21892 --
examples/LAMMPS/USER/imd/deca-ala-solv.psf | 10178 -
.../LAMMPS/USER/imd/deca-ala-solv_imd-demo.vmd | 28 -
examples/LAMMPS/USER/imd/deca-ala.psf | 370 -
examples/LAMMPS/USER/imd/deca-ala_imd-demo.vmd | 16 -
examples/LAMMPS/USER/imd/falcon.tcl | 10 -
examples/LAMMPS/USER/imd/in.bucky-plus-cnt | 59 -
examples/LAMMPS/USER/imd/in.bucky-plus-cnt-gpu | 62 -
.../LAMMPS/USER/imd/in.deca-ala-solv-filter_imd | 33 -
examples/LAMMPS/USER/imd/in.deca-ala-solv_imd | 33 -
examples/LAMMPS/USER/imd/in.deca-ala_imd | 33 -
examples/LAMMPS/USER/imd/in.deca-ala_imd-gpu | 35 -
examples/LAMMPS/USER/imd/in.melt_imd | 28 -
examples/LAMMPS/USER/imd/in.melt_imd-gpu | 30 -
examples/LAMMPS/USER/imd/melt.psf | 4532 -
examples/LAMMPS/USER/imd/melt_imd-demo.vmd | 18 -
.../USER/lb/confined_colloid/in.confined_colloids | 108 -
.../LAMMPS/USER/lb/confined_colloid/results64.out | 41 -
.../LAMMPS/USER/lb/dragforce/data.one_radius16d2 | 330 -
.../LAMMPS/USER/lb/dragforce/defaultgamma_drag.out | 10035 -
.../LAMMPS/USER/lb/dragforce/in.defaultgamma_drag | 80 -
examples/LAMMPS/USER/lb/dragforce/in.setgamma_drag | 68 -
.../LAMMPS/USER/lb/dragforce/setgamma13d0_drag.out | 10035 -
examples/LAMMPS/USER/lb/fourspheres/data.four | 1290 -
.../fourspheres_velocity0d0001_defaultgamma.out | 15039 --
.../fourspheres_velocity0d0001_setgamma.out | 15039 --
.../lb/fourspheres/in.fourspheres_default_gamma | 84 -
.../USER/lb/fourspheres/in.fourspheres_set_gamma | 76 -
examples/LAMMPS/USER/lb/microrheology/data.two | 492 -
.../microrheology/in.microrheology_default_gamma | 119 -
.../lb/microrheology/in.microrheology_set_gamma | 113 -
.../microrheology/microrheology_defaultgamma.out | 50000 -----
.../lb/microrheology/microrheology_setgamma.out | 50000 -----
.../LAMMPS/USER/lb/planewall/data.one_radius16d2 | 330 -
.../USER/lb/planewall/in.planewall_default_gamma | 99 -
.../USER/lb/planewall/in.planewall_set_gamma | 92 -
.../LAMMPS/USER/lb/planewall/wall_defaultgamma.out | 20031 --
.../LAMMPS/USER/lb/planewall/wall_setgamma.out | 20031 --
examples/LAMMPS/USER/lb/polymer/data.polymer | 1040 -
examples/LAMMPS/USER/lb/polymer/in.polymer | 105 -
examples/LAMMPS/USER/lb/polymer/out.polymer | 19 -
examples/LAMMPS/USER/misc/basal/almg.liu | 708 -
examples/LAMMPS/USER/misc/basal/in.basal | 163 -
examples/LAMMPS/USER/misc/meam_sw_spline/Si/bcc.in | 33 -
.../USER/misc/meam_sw_spline/Si/bcc_relax.in | 37 -
examples/LAMMPS/USER/misc/meam_sw_spline/Si/dc.in | 34 -
.../LAMMPS/USER/misc/meam_sw_spline/Si/dc_relax.in | 38 -
.../Si/energy_conservation.meam.sw.in | 45 -
examples/LAMMPS/USER/misc/meam_sw_spline/Si/fcc.in | 34 -
.../USER/misc/meam_sw_spline/Si/fcc_relax.in | 38 -
.../USER/misc/meam_sw_spline/Si/hcp_relax.in | 40 -
examples/LAMMPS/USER/misc/meam_sw_spline/Si/sc.in | 34 -
.../LAMMPS/USER/misc/meam_sw_spline/Si/sc_relax.in | 38 -
.../USER/misc/meam_sw_spline/Si/single_atom.in | 27 -
.../LAMMPS/USER/misc/meam_sw_spline/Ti/alpha.in | 27 -
.../misc/meam_sw_spline/Ti/alpha_relaxation.in | 38 -
.../LAMMPS/USER/misc/meam_sw_spline/Ti/beta.in | 27 -
.../Ti/energy_conservation.meam.sw.in | 74 -
examples/LAMMPS/USER/misc/meam_sw_spline/Ti/fcc.in | 28 -
.../USER/misc/meam_sw_spline/Ti/hexagonal.in | 28 -
.../LAMMPS/USER/misc/meam_sw_spline/Ti/omega.in | 27 -
.../USER/misc/meam_sw_spline/Ti/single_atom.in | 27 -
examples/LAMMPS/USER/misc/ti/in.ti_rs | 64 -
examples/LAMMPS/USER/misc/ti/in.ti_spring | 64 -
examples/LAMMPS/USER/phonon/1-1D-mono/README | 39 -
examples/LAMMPS/USER/phonon/1-1D-mono/data.pos | 57 -
examples/LAMMPS/USER/phonon/1-1D-mono/disp.dat | 19 -
examples/LAMMPS/USER/phonon/1-1D-mono/in.Ana | 50 -
examples/LAMMPS/USER/phonon/1-1D-mono/in.disp | 9 -
.../USER/phonon/1-1D-mono/log.lammps.example | 146 -
examples/LAMMPS/USER/phonon/1-1D-mono/map.in | 18 -
examples/LAMMPS/USER/phonon/1-1D-mono/pdisp.eps | 776 -
.../USER/phonon/1-1D-mono/phonon.bin.2000000 | Bin 384 -> 0 bytes
examples/LAMMPS/USER/phonon/1-1D-mono/phonon.log | 110 -
examples/LAMMPS/USER/phonon/1-1D-mono/plot.disp | 20 -
examples/LAMMPS/USER/phonon/2-1D-diatomic/README | 37 -
examples/LAMMPS/USER/phonon/2-1D-diatomic/data.pos | 154 -
examples/LAMMPS/USER/phonon/2-1D-diatomic/disp.dat | 35 -
examples/LAMMPS/USER/phonon/2-1D-diatomic/in.Ana | 46 -
examples/LAMMPS/USER/phonon/2-1D-diatomic/in.disp | 9 -
.../USER/phonon/2-1D-diatomic/log.lammps.example | 113 -
examples/LAMMPS/USER/phonon/2-1D-diatomic/map.in | 66 -
.../LAMMPS/USER/phonon/2-1D-diatomic/pdisp.eps | 924 -
examples/LAMMPS/USER/phonon/2-1D-diatomic/pdos.dat | 203 -
.../USER/phonon/2-1D-diatomic/phonon.bin.2000000 | Bin 2196 -> 0 bytes
.../LAMMPS/USER/phonon/2-1D-diatomic/phonon.log | 206 -
.../LAMMPS/USER/phonon/2-1D-diatomic/plot.disp | 25 -
.../phonon/3-3D-FCC-Cu-EAM/CuPhonon.bin.6500000 | Bin 73872 -> 0 bytes
.../phonon/3-3D-FCC-Cu-EAM/CuPhonon.log.example | 1575 -
examples/LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/README | 47 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/cuu3.eam | 305 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/data.pos | 524 -
.../USER/phonon/3-3D-FCC-Cu-EAM/disp-expr.dat | 83 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/disp-ld.dat | 86 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/disp.dat | 47 -
.../USER/phonon/3-3D-FCC-Cu-EAM/dos-expr.dat | 164 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/dos-ld.dat | 101 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/dos.dat | 102 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/in.EAM3D | 40 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/in.disp | 21 -
examples/LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/in.dos | 11 -
.../USER/phonon/3-3D-FCC-Cu-EAM/log.lammps.example | 107 -
examples/LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/map.in | 514 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/pdisp.eps | 1207 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/pdos.eps | 985 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/plot.disp | 18 -
.../LAMMPS/USER/phonon/3-3D-FCC-Cu-EAM/plot.dos | 13 -
examples/LAMMPS/USER/sph/README | 1 -
.../LAMMPS/USER/sph/cavity_flow/cavity_flow.lmp | 63 -
.../USER/sph/heatconduction/compare_analytic.gpl | 24 -
.../sph/heatconduction/sph_heat_conduction_2d.lmp | 51 -
.../sph/heatconduction/sph_heat_conduction_3d.lmp | 49 -
.../LAMMPS/USER/sph/shock_tube/compare_exact.gpl | 6 -
.../LAMMPS/USER/sph/shock_tube/exact_solution.dat | 501 -
examples/LAMMPS/USER/sph/shock_tube/shock2d.lmp | 45 -
examples/LAMMPS/USER/sph/shock_tube/shock3d.lmp | 48 -
.../LAMMPS/USER/sph/water_collapse/data.initial | 31424 ---
.../USER/sph/water_collapse/water_collapse.lmp | 49 -
examples/LAMMPS/VISCOSITY/README | 80 -
examples/LAMMPS/VISCOSITY/in.gk.2d | 65 -
examples/LAMMPS/VISCOSITY/in.mp.2d | 76 -
examples/LAMMPS/VISCOSITY/in.nemd.2d | 83 -
examples/LAMMPS/VISCOSITY/in.wall.2d | 83 -
examples/LAMMPS/VISCOSITY/log.gk.2d.12Sep13 | 386 -
examples/LAMMPS/VISCOSITY/log.mp.2d.12Sep13 | 231 -
examples/LAMMPS/VISCOSITY/log.nemd.2d.12Sep13 | 264 -
examples/LAMMPS/VISCOSITY/log.wall.2d.12Sep13 | 216 -
examples/LAMMPS/VISCOSITY/profile.gk.2d.12Sep13 | 100654 ---------
examples/LAMMPS/VISCOSITY/profile.mp.2d.12Sep13 | 1473 -
examples/LAMMPS/VISCOSITY/profile.nemd.2d.12Sep13 | 318 -
examples/LAMMPS/VISCOSITY/profile.wall.2d.12Sep13 | 66 -
examples/LAMMPS/body/data.body | 549 -
examples/LAMMPS/body/in.body | 23 -
examples/LAMMPS/body/log.body.18Feb13.linux.1 | 70 -
examples/LAMMPS/body/log.body.18Feb13.linux.4 | 70 -
examples/LAMMPS/colloid/in.colloid | 47 -
.../LAMMPS/colloid/log.colloid.18Feb13.linux.1 | 125 -
.../LAMMPS/colloid/log.colloid.18Feb13.linux.4 | 125 -
examples/LAMMPS/comb/README | 24 -
examples/LAMMPS/comb/data.Cu2O | 1317 -
examples/LAMMPS/comb/data.CuaS | 4147 -
examples/LAMMPS/comb/data.c-HfO2 | 1521 -
examples/LAMMPS/comb/data.comb3-OHCCu | 695 -
examples/LAMMPS/comb/data.m-HfO2 | 1521 -
examples/LAMMPS/comb/data.t-HfO2 | 1521 -
examples/LAMMPS/comb/elastic.f90 | 184 -
examples/LAMMPS/comb/ffield.comb | 98 -
examples/LAMMPS/comb/ffield.comb3 | 349 -
examples/LAMMPS/comb/in.comb.Cu | 35 -
examples/LAMMPS/comb/in.comb.Cu2O.elastic | 97 -
examples/LAMMPS/comb/in.comb.HfO2 | 49 -
examples/LAMMPS/comb/in.comb.Si | 35 -
examples/LAMMPS/comb/in.comb.Si.elastic | 81 -
examples/LAMMPS/comb/in.comb3 | 34 -
examples/LAMMPS/comb/lib.comb3 | 24303 ---
examples/LAMMPS/comb/log.comb.Cu.18Feb13.linux.1 | 73 -
examples/LAMMPS/comb/log.comb.Cu.18Feb13.linux.4 | 73 -
.../comb/log.comb.Cu2O.elastic.18Feb13.linux.1 | 315 -
.../comb/log.comb.Cu2O.elastic.18Feb13.linux.4 | 315 -
examples/LAMMPS/comb/log.comb.HfO2.18Feb13.linux.1 | 259 -
examples/LAMMPS/comb/log.comb.HfO2.18Feb13.linux.4 | 259 -
examples/LAMMPS/comb/log.comb.Si.18Feb13.linux.1 | 73 -
examples/LAMMPS/comb/log.comb.Si.18Feb13.linux.4 | 73 -
.../comb/log.comb.Si.elastic.18Feb13.linux.1 | 274 -
.../comb/log.comb.Si.elastic.18Feb13.linux.4 | 274 -
examples/LAMMPS/comb/log.comb3.4Nov13.linux.1 | 72 -
examples/LAMMPS/comb/log.comb3.4Nov13.linux.4 | 72 -
examples/LAMMPS/crack/in.crack | 73 -
examples/LAMMPS/crack/log.crack.18Feb13.linux.1 | 135 -
examples/LAMMPS/crack/log.crack.18Feb13.linux.4 | 135 -
examples/LAMMPS/dipole/in.dipole | 41 -
examples/LAMMPS/dipole/log.dipole.18Feb13.linux.1 | 89 -
examples/LAMMPS/dipole/log.dipole.18Feb13.linux.4 | 89 -
examples/LAMMPS/dreiding/README | 5 -
examples/LAMMPS/dreiding/ch3oh.box.dreiding.bgf | 780 -
.../dreiding/ch3oh.box.dreiding.cerius2.eng.dat | 56 -
examples/LAMMPS/dreiding/data.dreiding | 1400 -
examples/LAMMPS/dreiding/in.dreiding | 39 -
.../LAMMPS/dreiding/log.dreiding.18Feb13.linux.1 | 98 -
.../LAMMPS/dreiding/log.dreiding.18Feb13.linux.4 | 98 -
examples/LAMMPS/eim/data.eim | 4020 -
examples/LAMMPS/eim/ffield.eim | 145 -
examples/LAMMPS/eim/in.eim | 30 -
examples/LAMMPS/eim/log.eim.18Feb13.linux.1 | 67 -
examples/LAMMPS/eim/log.eim.18Feb13.linux.4 | 67 -
examples/LAMMPS/ellipse/in.ellipse.gayberne | 62 -
examples/LAMMPS/ellipse/in.ellipse.resquared | 62 -
.../ellipse/log.ellipse.gayberne.18Feb13.linux.1 | 157 -
.../ellipse/log.ellipse.gayberne.18Feb13.linux.4 | 157 -
.../ellipse/log.ellipse.resquared.18Feb13.linux.1 | 157 -
.../ellipse/log.ellipse.resquared.18Feb13.linux.4 | 157 -
examples/LAMMPS/flow/in.flow.couette | 74 -
examples/LAMMPS/flow/in.flow.pois | 74 -
.../LAMMPS/flow/log.flow.couette.18Feb13.linux.1 | 127 -
.../LAMMPS/flow/log.flow.couette.18Feb13.linux.4 | 127 -
examples/LAMMPS/flow/log.flow.pois.18Feb13.linux.1 | 127 -
examples/LAMMPS/flow/log.flow.pois.18Feb13.linux.4 | 127 -
examples/LAMMPS/friction/in.friction | 86 -
.../LAMMPS/friction/log.friction.18Feb13.linux.1 | 145 -
.../LAMMPS/friction/log.friction.18Feb13.linux.4 | 145 -
examples/LAMMPS/gpu/data.phosphate | 21922 --
examples/LAMMPS/gpu/data.rhodo | 191072 ------------------
examples/LAMMPS/gpu/in.gpu.melt.2.5 | 34 -
examples/LAMMPS/gpu/in.gpu.melt.5.0 | 34 -
examples/LAMMPS/gpu/in.gpu.phosphate | 31 -
examples/LAMMPS/gpu/in.gpu.rhodo | 36 -
.../LAMMPS/gpu/log.gpu.melt.2.5.18Feb13.linux.1 | 77 -
.../LAMMPS/gpu/log.gpu.melt.2.5.18Feb13.linux.4 | 77 -
.../LAMMPS/gpu/log.gpu.melt.5.0.18Feb13.linux.1 | 77 -
.../LAMMPS/gpu/log.gpu.melt.5.0.18Feb13.linux.4 | 77 -
.../LAMMPS/gpu/log.gpu.phosphate.18Feb13.linux.1 | 75 -
.../LAMMPS/gpu/log.gpu.phosphate.18Feb13.linux.4 | 75 -
examples/LAMMPS/gpu/log.gpu.rhodo.18Feb13.linux.1 | 122 -
examples/LAMMPS/gpu/log.gpu.rhodo.18Feb13.linux.4 | 122 -
examples/LAMMPS/hugoniostat/in.hugoniostat | 177 -
.../hugoniostat/log.hugoniostat.18Feb13.linux.1 | 90 -
.../hugoniostat/log.hugoniostat.18Feb13.linux.4 | 90 -
examples/LAMMPS/indent/in.indent | 63 -
examples/LAMMPS/indent/in.indent.min | 76 -
examples/LAMMPS/indent/log.indent.18Feb13.linux.1 | 176 -
examples/LAMMPS/indent/log.indent.18Feb13.linux.4 | 176 -
.../LAMMPS/indent/log.indent.min.18Feb13.linux.1 | 386 -
.../LAMMPS/indent/log.indent.min.18Feb13.linux.4 | 383 -
examples/LAMMPS/kim/in.kim.lj | 35 -
examples/LAMMPS/kim/in.kim.lj.lmp | 35 -
examples/LAMMPS/kim/log.kim.lj.26Jul13.mac_mpi.1 | 29 -
examples/LAMMPS/kim/log.kim.lj.26Jul13.mac_mpi.4 | 29 -
.../LAMMPS/kim/log.kim.lj.lmp.26Jul13.mac_mpi.1 | 29 -
.../LAMMPS/kim/log.kim.lj.lmp.26Jul13.mac_mpi.4 | 29 -
examples/LAMMPS/meam/Ni.meam | 2 -
examples/LAMMPS/meam/SiC.meam | 11 -
examples/LAMMPS/meam/data.meam | 138 -
examples/LAMMPS/meam/in.meam | 26 -
examples/LAMMPS/meam/in.meam.shear | 75 -
examples/LAMMPS/meam/library.meam | 162 -
examples/LAMMPS/meam/log.meam.18Feb13.linux.1 | 63 -
examples/LAMMPS/meam/log.meam.18Feb13.linux.4 | 63 -
.../LAMMPS/meam/log.meam.shear.18Feb13.linux.1 | 169 -
.../LAMMPS/meam/log.meam.shear.18Feb13.linux.4 | 169 -
examples/LAMMPS/melt/in.melt | 29 -
examples/LAMMPS/melt/log.melt.18Feb13.linux.1 | 60 -
examples/LAMMPS/melt/log.melt.18Feb13.linux.4 | 60 -
examples/LAMMPS/micelle/data.micelle | 1530 -
examples/LAMMPS/micelle/def.micelle | 9 -
examples/LAMMPS/micelle/in.micelle | 69 -
.../LAMMPS/micelle/log.micelle.18Feb13.linux.1 | 209 -
.../LAMMPS/micelle/log.micelle.18Feb13.linux.4 | 209 -
examples/LAMMPS/min/in.min | 40 -
examples/LAMMPS/min/in.min.box | 46 -
examples/LAMMPS/min/log.min.18Feb13.linux.1 | 115 -
examples/LAMMPS/min/log.min.18Feb13.linux.4 | 115 -
examples/LAMMPS/min/log.min.box.18Feb13.linux.1 | 353 -
examples/LAMMPS/min/log.min.box.18Feb13.linux.4 | 353 -
examples/LAMMPS/msst/in.msst | 56 -
examples/LAMMPS/msst/log.msst.18Feb13.linux.1 | 135 -
examples/LAMMPS/msst/log.msst.18Feb13.linux.4 | 135 -
examples/LAMMPS/neb/README | 22 -
examples/LAMMPS/neb/final.hop1 | 2 -
examples/LAMMPS/neb/final.hop2 | 2 -
examples/LAMMPS/neb/in.neb.hop1 | 63 -
examples/LAMMPS/neb/in.neb.hop2 | 66 -
examples/LAMMPS/neb/log.neb.hop1.18Feb13.linux.4 | 11 -
examples/LAMMPS/neb/log.neb.hop2.18Feb13.linux.4 | 19 -
examples/LAMMPS/nemd/in.nemd | 34 -
examples/LAMMPS/nemd/log.nemd.18Feb13.linux.1 | 112 -
examples/LAMMPS/nemd/log.nemd.18Feb13.linux.4 | 112 -
examples/LAMMPS/obstacle/in.obstacle | 77 -
.../LAMMPS/obstacle/log.obstacle.18Feb13.linux.1 | 137 -
.../LAMMPS/obstacle/log.obstacle.18Feb13.linux.4 | 137 -
examples/LAMMPS/peptide/README | 8 -
examples/LAMMPS/peptide/data.peptide | 6531 -
examples/LAMMPS/peptide/in.peptide | 38 -
.../LAMMPS/peptide/log.peptide.18Feb13.linux.1 | 164 -
.../LAMMPS/peptide/log.peptide.18Feb13.linux.4 | 164 -
examples/LAMMPS/peri/in.peri | 41 -
examples/LAMMPS/peri/log.peri.18Feb13.linux.1 | 84 -
examples/LAMMPS/peri/log.peri.18Feb13.linux.4 | 84 -
examples/LAMMPS/prd/README | 5 -
examples/LAMMPS/prd/Si.sw | 17 -
examples/LAMMPS/prd/in.prd | 97 -
examples/LAMMPS/prd/log.prd.0.18Feb13.linux.4 | 631 -
examples/LAMMPS/prd/log.prd.1.18Feb13.linux.4 | 631 -
examples/LAMMPS/prd/log.prd.18Feb13.linux.4 | 12 -
examples/LAMMPS/prd/log.prd.2.18Feb13.linux.4 | 631 -
examples/LAMMPS/prd/log.prd.3.18Feb13.linux.4 | 631 -
examples/LAMMPS/reax/AB/README | 30 -
examples/LAMMPS/reax/AB/data.AB | 121 -
examples/LAMMPS/reax/AB/ffield.reax.AB | 151 -
examples/LAMMPS/reax/AB/in.AB | 23 -
examples/LAMMPS/reax/AB/lmp_control | 17 -
.../LAMMPS/reax/AB/log.reaxc.ab.18Feb11.linux.1 | 50 -
.../LAMMPS/reax/AB/log.reaxc.ab.18Feb11.linux.4 | 50 -
examples/LAMMPS/reax/AB/param.qeq | 3 -
examples/LAMMPS/reax/Au_O/README | 18 -
examples/LAMMPS/reax/Au_O/data.AuO | 976 -
examples/LAMMPS/reax/Au_O/ffield.reax.AuO | 105 -
examples/LAMMPS/reax/Au_O/in.AuO | 23 -
examples/LAMMPS/reax/Au_O/lmp_control | 17 -
.../LAMMPS/reax/Au_O/log.reaxc.auo.18Feb11.linux.1 | 50 -
.../LAMMPS/reax/Au_O/log.reaxc.auo.18Feb11.linux.4 | 50 -
examples/LAMMPS/reax/Au_O/param.qeq | 2 -
examples/LAMMPS/reax/CHO/README | 25 -
examples/LAMMPS/reax/CHO/data.CHO | 122 -
examples/LAMMPS/reax/CHO/ffield.reax.cho | 123 -
examples/LAMMPS/reax/CHO/in.CHO | 23 -
examples/LAMMPS/reax/CHO/lmp_control | 17 -
.../LAMMPS/reax/CHO/log.reaxc.cho.18Feb11.linux.1 | 50 -
.../LAMMPS/reax/CHO/log.reaxc.cho.18Feb11.linux.4 | 50 -
examples/LAMMPS/reax/CHO/param.qeq | 3 -
examples/LAMMPS/reax/Fe_O_H/README | 29 -
examples/LAMMPS/reax/Fe_O_H/data.FeOH3 | 122 -
examples/LAMMPS/reax/Fe_O_H/ffield.reax.Fe_O_C_H | 160 -
examples/LAMMPS/reax/Fe_O_H/in.FeOH3 | 23 -
examples/LAMMPS/reax/Fe_O_H/lmp_control | 17 -
.../reax/Fe_O_H/log.reaxc.feoh.18Feb11.linux.1 | 50 -
.../reax/Fe_O_H/log.reaxc.feoh.18Feb11.linux.4 | 50 -
examples/LAMMPS/reax/Fe_O_H/param.qeq | 3 -
examples/LAMMPS/reax/Fluorographene/README | 13 -
examples/LAMMPS/reax/Fluorographene/data.FC | 17296 --
examples/LAMMPS/reax/Fluorographene/dumpnpt.xyz | 17282 --
examples/LAMMPS/reax/Fluorographene/ffield.reax.FC | 361 -
examples/LAMMPS/reax/Fluorographene/in.FC | 32 -
examples/LAMMPS/reax/Fluorographene/log.FC | 290 -
examples/LAMMPS/reax/RDX/README | 40 -
examples/LAMMPS/reax/RDX/data.RDX | 123 -
examples/LAMMPS/reax/RDX/ffield.reax.rdx | 156 -
examples/LAMMPS/reax/RDX/in.RDX | 23 -
examples/LAMMPS/reax/RDX/lmp_control | 17 -
.../LAMMPS/reax/RDX/log.reaxc.rdx.18Feb11.linux.1 | 50 -
.../LAMMPS/reax/RDX/log.reaxc.rdx.18Feb11.linux.4 | 50 -
examples/LAMMPS/reax/RDX/param.qeq | 4 -
examples/LAMMPS/reax/README | 41 -
examples/LAMMPS/reax/V_O_H/README | 21 -
examples/LAMMPS/reax/V_O_H/data.VOH | 118 -
examples/LAMMPS/reax/V_O_H/ffield.reax.V_O_C_H | 166 -
examples/LAMMPS/reax/V_O_H/in.VOH | 23 -
examples/LAMMPS/reax/V_O_H/lmp_control | 17 -
.../reax/V_O_H/log.reaxc.voh.18Feb11.linux.1 | 50 -
.../reax/V_O_H/log.reaxc.voh.18Feb11.linux.4 | 50 -
examples/LAMMPS/reax/V_O_H/param.qeq | 4 -
examples/LAMMPS/reax/Zn_O_H/README | 28 -
examples/LAMMPS/reax/Zn_O_H/data.ZnOH2 | 122 -
examples/LAMMPS/reax/Zn_O_H/ffield.reax.ZnOH | 97 -
examples/LAMMPS/reax/Zn_O_H/in.ZnOH2 | 23 -
examples/LAMMPS/reax/Zn_O_H/lmp_control | 17 -
.../reax/Zn_O_H/log.reaxc.znoh.18Feb11.linux.1 | 50 -
.../reax/Zn_O_H/log.reaxc.znoh.18Feb11.linux.4 | 50 -
examples/LAMMPS/reax/Zn_O_H/param.qeq | 3 -
examples/LAMMPS/reax/control.reax_c.rdx | 17 -
examples/LAMMPS/reax/control.reax_c.tatb | 17 -
examples/LAMMPS/reax/data.rdx | 43 -
examples/LAMMPS/reax/data.tatb | 405 -
examples/LAMMPS/reax/ffield.reax | 156 -
examples/LAMMPS/reax/in.reax.rdx | 48 -
examples/LAMMPS/reax/in.reax.tatb | 49 -
examples/LAMMPS/reax/in.reaxc.rdx | 48 -
examples/LAMMPS/reax/in.reaxc.tatb | 51 -
examples/LAMMPS/reax/log.reax.rdx.18Feb13.linux.1 | 81 -
examples/LAMMPS/reax/log.reax.rdx.18Feb13.linux.4 | 81 -
examples/LAMMPS/reax/log.reax.tatb.18Feb13.linux.1 | 77 -
examples/LAMMPS/reax/log.reax.tatb.18Feb13.linux.4 | 77 -
examples/LAMMPS/reax/log.reaxc.rdx.18Feb13.linux.1 | 81 -
examples/LAMMPS/reax/log.reaxc.rdx.18Feb13.linux.4 | 81 -
.../LAMMPS/reax/log.reaxc.tatb.18Feb13.linux.1 | 79 -
.../LAMMPS/reax/log.reaxc.tatb.18Feb13.linux.4 | 79 -
examples/LAMMPS/rigid/data.rigid | 100 -
examples/LAMMPS/rigid/data.rigid.tnr | 7220 -
examples/LAMMPS/rigid/in.rigid | 77 -
examples/LAMMPS/rigid/in.rigid.poems | 77 -
examples/LAMMPS/rigid/in.rigid.poems2 | 77 -
examples/LAMMPS/rigid/in.rigid.tnr | 89 -
examples/LAMMPS/rigid/log.rigid.18Feb13.linux.1 | 310 -
examples/LAMMPS/rigid/log.rigid.18Feb13.linux.4 | 310 -
.../LAMMPS/rigid/log.rigid.poems.18Feb13.linux.1 | 310 -
.../LAMMPS/rigid/log.rigid.poems.18Feb13.linux.4 | 310 -
.../LAMMPS/rigid/log.rigid.poems2.18Feb13.linux.1 | 314 -
.../LAMMPS/rigid/log.rigid.poems2.18Feb13.linux.4 | 314 -
examples/LAMMPS/shear/Ni_u3.eam | 304 -
examples/LAMMPS/shear/in.shear | 75 -
examples/LAMMPS/shear/in.shear.void | 75 -
examples/LAMMPS/shear/log.shear.18Feb13.linux.1 | 165 -
examples/LAMMPS/shear/log.shear.18Feb13.linux.4 | 165 -
.../LAMMPS/shear/log.shear.void.18Feb13.linux.1 | 166 -
.../LAMMPS/shear/log.shear.void.18Feb13.linux.4 | 166 -
examples/LAMMPS/srd/in.srd.mixture | 104 -
examples/LAMMPS/srd/in.srd.pure | 50 -
.../LAMMPS/srd/log.srd.mixture.18Feb13.linux.1 | 142 -
.../LAMMPS/srd/log.srd.mixture.18Feb13.linux.4 | 142 -
examples/LAMMPS/srd/log.srd.pure.18Feb13.linux.1 | 592 -
examples/LAMMPS/srd/log.srd.pure.18Feb13.linux.4 | 592 -
examples/LAMMPS/tad/README | 5 -
examples/LAMMPS/tad/Si.sw | 17 -
examples/LAMMPS/tad/in.tad | 114 -
examples/LAMMPS/tad/log.tad.0.18Feb13.linux.3 | 12877 --
examples/LAMMPS/tad/log.tad.1.18Feb13.linux.3 | 7814 -
examples/LAMMPS/tad/log.tad.18Feb13.linux.3 | 114 -
examples/LAMMPS/tad/log.tad.2.18Feb13.linux.3 | 7814 -
examples/LAMMPS/tad/log.tad.neb.18Feb13.linux.3 | 1423 -
examples/LAMMPS/voronoi/in.voronoi | 154 -
examples/LAMMPS/voronoi/log.voronoi.4Aug13.macos.1 | 368 -
examples/LAMMPS/voronoi/log.voronoi.4Aug13.macos.4 | 368 -
examples/LIGGGHTS/Tutorials_public/sph_1/in.sph_1 | 9 +-
examples/LIGGGHTS/Tutorials_public/sph_2/in.sph_2 | 9 +-
src/MAKE/Makefile.fedora_debug | 4 +-
...file.fedora_debug => Makefile.fedora_debug_opt} | 6 +-
src/POEMS/fix_poems.cpp | 65 +-
src/POEMS/fix_poems.h | 2 +-
src/RIGID/fix_rigid.h | 8 +-
src/abstract_mesh.h | 1 +
src/cfd_datacoupling.cpp | 28 +
src/cohesion_model_sjkr.h | 2 +
src/cohesion_model_sjkr2.h | 3 +
src/compute_reduce.cpp | 20 +-
src/compute_reduce_region.cpp | 2 +-
src/contact_interface.h | 11 +-
src/contact_model_constants.h | 4 +
src/contact_models.cpp | 200 +
src/contact_models.h | 37 +-
src/custom_value_tracker.h | 2 +-
src/custom_value_tracker_I.h | 5 +-
src/dump_mesh_vtk.cpp | 9 +-
src/fix_ave_euler.cpp | 2 +-
src/fix_cfd_coupling_force.cpp | 20 +-
src/fix_cfd_coupling_force.h | 4 +
src/fix_contact_atom_counter.h | 1 +
src/fix_contact_atom_counter_dummy.h | 39 +
src/fix_contact_atom_counter_wall.h | 1 +
src/fix_contact_atom_counter_wall_dummy.h | 40 +
src/fix_contact_history.cpp | 77 +-
src/fix_contact_history_mesh.cpp | 44 +-
src/fix_contact_history_mesh.h | 3 +-
src/fix_contact_property_atom.h | 1 +
src/fix_contact_property_atom_dummy.h | 45 +
src/fix_contact_property_atom_wall.h | 1 +
src/fix_contact_property_atom_wall_dummy.h | 37 +
src/fix_dummy2.h | 6 +-
src/fix_gravity.cpp | 12 +-
src/fix_heat_gran.cpp | 3 +-
src/fix_heat_gran_conduction.cpp | 134 +-
src/fix_heat_gran_conduction.h | 15 +-
src/fix_mesh.h | 1 +
src/fix_mesh_surface.cpp | 49 +-
src/fix_mesh_surface.h | 15 +-
src/fix_mesh_surface_stress.h | 1 +
src/fix_mesh_surface_stress_servo.cpp | 8 +-
src/fix_neighlist_mesh.cpp | 7 +-
src/fix_neighlist_mesh.h | 16 +-
src/fix_property_atom.cpp | 5 +-
src/fix_property_atom_contact.h | 1 -
src/fix_sph_pressure.cpp | 13 +-
src/fix_wall_gran.cpp | 173 +-
src/fix_wall_gran.h | 102 +-
src/fix_wall_gran_base.h | 80 +-
src/force.cpp | 209 -
src/force.h | 36 -
src/global_properties.cpp | 12 +
src/global_properties.h | 2 +
src/granular_pair_style.cpp | 37 +
src/granular_pair_style.h | 41 +
src/granular_styles.cpp | 112 +
src/granular_wall.cpp | 37 +
src/granular_wall.h | 59 +
src/input.cpp | 31 +-
src/input.h | 1 +
src/modify.cpp | 7 -
src/modify.h | 3 +
src/modify_liggghts.cpp | 47 +-
src/mpi_liggghts.h | 135 +-
src/multi_node_mesh.h | 3 +
src/neighbor.cpp | 2 +
src/normal_model_hertz.h | 28 +-
src/normal_model_hertz_stiffness.h | 26 +-
src/normal_model_hooke.h | 35 +-
src/normal_model_hooke_hysteresis.h | 3 +
src/normal_model_hooke_stiffness.h | 27 +-
src/pair.cpp | 8 +-
src/pair.h | 2 +-
src/pair_gran.cpp | 76 +-
src/pair_gran.h | 60 +-
src/pair_gran_base.h | 77 +-
src/pair_gran_proxy.cpp | 76 +
src/pair_gran_proxy.h | 34 +
src/pair_sph_artvisc_tenscorr.cpp | 284 +-
src/pair_sph_artvisc_tenscorr.h | 20 +-
src/primitive_wall.h | 58 +-
src/primitive_wall_definitions.h | 19 +-
src/rolling_model_cdt.h | 3 +
src/rolling_model_epsd.h | 2 +
src/rolling_model_epsd2.h | 2 +
src/settings.h | 2 +-
src/style_pair.h | 1 +
src/surface_model_default.h | 3 +
src/tangential_model_history.h | 2 +
src/tangential_model_no_history.h | 3 +
src/tri_mesh_planar.cpp | 2 +-
src/utils.h | 66 +
src/vector_liggghts.h | 56 +-
src/version_liggghts.h | 10 +-
src/version_liggghts.txt | 10 +-
tools/restart2data.cpp | 0
966 files changed, 2301 insertions(+), 1124828 deletions(-)
diff --cc src/fix_neighlist_mesh.cpp
index 383b05d,5c590bd..6ff20ce
--- a/src/fix_neighlist_mesh.cpp
+++ b/src/fix_neighlist_mesh.cpp
@@@ -47,15 -47,11 +47,16 @@@ using namespace FixConst
FixNeighlistMesh::FixNeighlistMesh(LAMMPS *lmp, int narg, char **arg)
: Fix(lmp,narg,arg),
+<<<<<<< HEAD
+ contactList("contactList"),
+ numContacts("numContacts"),
+=======
fix_nneighs_(0),
fix_nneighs_name_(0),
+>>>>>>> upstream/3.0.0
buildNeighList(false),
numAllContacts_(0),
+ globalNumAllContacts_(false),
mbinx(0),
mbiny(0),
mbinz(0),
--
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