Homec4science
Diffusion lammps 5be330aa8f9f

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
5be330aa8f9f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 3 2014, 19:39.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Feb 3 2014, 19:39
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS036f4f8dbfe9: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11450 f3b2605a-c512-4ea7…
rLAMMPS6f99bf9132da: fix a few more cases of incorrect markup
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5be330aa8f9f: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 3 2014, 19:39

Merged Changes

CommitAuthorDetailsCommitted
036f4f8dbfe9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11450 f3b2605a-c512-4ea7… 
Feb 1 2014
d5d663a10511sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11449 f3b2605a-c512-4ea7… 
Feb 1 2014
19e47c5264ecsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11448 f3b2605a-c512-4ea7… 
Feb 1 2014
a16612ffbee5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11447 f3b2605a-c512-4ea7… 
Feb 1 2014
09f02ddf7cb0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11446 f3b2605a-c512-4ea7… 
Feb 1 2014
532dd7c50003sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11444 f3b2605a-c512-4ea7… 
Feb 1 2014
47632aab2296sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11443 f3b2605a-c512-4ea7… 
Feb 1 2014
9be41fa46b79sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11442 f3b2605a-c512-4ea7… 
Feb 1 2014
634881f8cecasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11441 f3b2605a-c512-4ea7… 
Feb 1 2014
7bf0ad314c6esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11440 f3b2605a-c512-4ea7… 
Feb 1 2014
8031ade7de10sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11439 f3b2605a-c512-4ea7… 
Feb 1 2014
e9f63600bef4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11437 f3b2605a-c512-4ea7… 
Feb 1 2014
c137068c4700sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11436 f3b2605a-c512-4ea7… 
Feb 1 2014
f6d1f6822ce1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11435 f3b2605a-c512-4ea7… 
Feb 1 2014
ceb4da003907sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11434 f3b2605a-c512-4ea7… 
Feb 1 2014
57b7ebbef002sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11433 f3b2605a-c512-4ea7… 
Feb 1 2014

Changes (88)

Path
Mdoc/Eqs/pair_comb1.jpg
Mdoc/Eqs/pair_comb2.jpg
Mdoc/Eqs/pair_comb2.tex
Mdoc/Manual.html
Mdoc/Manual.txt
Mdoc/pair_comb.html
Mdoc/pair_comb.txt
Mexamples/KAPPA/in.heat
Mexamples/KAPPA/in.heatflux
Mexamples/comb/data.comb3-OHCCu
Mexamples/comb/in.comb3
Mpotentials/ffield.comb3
Mpotentials/lib.comb3
Msrc/MANYBODY/pair_comb3.cpp
Msrc/MANYBODY/pair_comb3.h
Msrc/version.h
Mtools/moltemplate/common/amber/amberparm2lt.sh
Mtools/moltemplate/common/amber/amberparm_pair_to_lt.py
Mtools/moltemplate/common/gaff.lt
Mtools/moltemplate/examples/CG_biomolecules/membrane+protein/moltemplate_files/calc_table/calc_CGLipidTableINTvsINT.py
Mtools/moltemplate/examples/CG_biomolecules/membrane+protein/run.in.npt
Mtools/moltemplate/examples/CG_biomolecules/membrane+protein/run.in.nvt
Mtools/moltemplate/examples/CG_biomolecules/membrane_BranniganPRE2005/moltemplate_files/calc_table/calc_table.py
Mtools/moltemplate/examples/CG_biomolecules/protein_folding_examples/1beadProtSci2010/moltemplate_files/system.lt
Mtools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/moltemplate_files/calc_table/calc_CGLipidTableINTvsINT.py
Mtools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/packmol_files/README.sh
Mtools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/run.in.min
Mtools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/run.in.nvt
Mtools/moltemplate/examples/CG_misc/translocation/run.in.nvt
Mtools/moltemplate/examples/CG_solvent/cyclododecane+watMW/run.in.npt
Mtools/moltemplate/examples/CG_solvent/cyclododecane+watMW/run.in.nvt
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/WARNING.TXT
A(dir)tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README.TXT
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_run.sh
Ptools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_setup.sh
Copied from tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/README_setup.sh
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_visualize.txt
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/WARNING.TXT
A(dir)tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/images/
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/images/hexadecane_12x12x2_t=0_LR.jpg
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/images/hexadecane_12x12x2_t=10ps_npt_LR.jpg
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/images/hexadecane_LR.jpg
A(dir)tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/ch2group.lt
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/ch3group.lt
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/hexadecane.lt
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/system.lt
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/run.in.npt
Atools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/run.in.nvt
Ptools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/README_setup.sh
Copied to tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_setup.sh
Mtools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/moltemplate_files/system.lt
Mtools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/run.in.npt
Mtools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/run.in.nvt
Atools/moltemplate/examples/all_atom_examples/convert_LAMMPS_to_LT_examples/cnad-cnt/cnt.lt
A(dir)tools/moltemplate/examples/all_atom_examples/hexadecane/
Atools/moltemplate/examples/all_atom_examples/hexadecane/README.TXT
Atools/moltemplate/examples/all_atom_examples/hexadecane/README_run.sh
Atools/moltemplate/examples/all_atom_examples/hexadecane/README_setup.sh
Atools/moltemplate/examples/all_atom_examples/hexadecane/README_visualize.txt
Atools/moltemplate/examples/all_atom_examples/hexadecane/WARNING.TXT
A(dir)tools/moltemplate/examples/all_atom_examples/hexadecane/images/
Atools/moltemplate/examples/all_atom_examples/hexadecane/images/hexadecane_12x12x2_t=0_LR.jpg
Atools/moltemplate/examples/all_atom_examples/hexadecane/images/hexadecane_12x12x2_t=10ps_npt_LR.jpg
Atools/moltemplate/examples/all_atom_examples/hexadecane/images/hexadecane_LR.jpg
A(dir)tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/
Atools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/alkanes.lt
Atools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/ch2group.lt
Atools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/ch3group.lt
Atools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/hexadecane.lt
Atools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/system.lt
Atools/moltemplate/examples/all_atom_examples/hexadecane/run.in.npt
Atools/moltemplate/examples/all_atom_examples/hexadecane/run.in.nvt
Mtools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/nanotube.lt
Mtools/moltemplate/examples/all_atom_examples/nanotube+water/run.in.npt
Mtools/moltemplate/examples/all_atom_examples/nanotube+water/run.in.nvt
Ptools/moltemplate/examples/all_atom_examples/read_PDB_file_examples/waterSPCE_from_PDBfile/run.in.npt
Copied from tools/moltemplate/examples/all_atom_examples/waterSPCE+Na+Cl/run.in.npt
Ptools/moltemplate/examples/all_atom_examples/read_PDB_file_examples/waterSPCE_from_PDBfile/run.in.nvt
Copied from tools/moltemplate/examples/all_atom_examples/waterSPCE+Na+Cl/run.in.nvt
Ptools/moltemplate/examples/all_atom_examples/waterSPCE+Na+Cl/run.in.npt
Copied to tools/moltemplate/examples/all_atom_examples/read_PDB_file_examples/waterSPCE_from_PDBfile/run.in.npt
Ptools/moltemplate/examples/all_atom_examples/waterSPCE+Na+Cl/run.in.nvt
Copied to tools/moltemplate/examples/all_atom_examples/read_PDB_file_examples/waterSPCE_from_PDBfile/run.in.nvt
Mtools/moltemplate/src/dump2data.py
Mtools/moltemplate/src/lttree.py
Mtools/moltemplate/src/lttree_check.py
Mtools/moltemplate/src/moltemplate.sh
Mtools/moltemplate/src/nbody_by_type.py
Dtools/moltemplate/src/nbody_by_type_lib_old.py
Mtools/moltemplate/src/postprocess_input_script.py
Mtools/moltemplate/src/raw2data.py
Mtools/moltemplate/src/ttree.py

rLAMMPS5be330aa8f9f

View Options

doc/Eqs/pair_comb1.jpg

Loading...
View Options

doc/Eqs/pair_comb2.jpg

Loading...
View Options

doc/Eqs/pair_comb2.tex

Loading...
View Options

doc/Manual.html

Loading...
View Options

doc/Manual.txt

Loading...
View Options

doc/pair_comb.html

Loading...
View Options

doc/pair_comb.txt

Loading...
View Options

examples/KAPPA/in.heat

Loading...
View Options

examples/KAPPA/in.heatflux

Loading...
View Options

examples/comb/data.comb3-OHCCu

Loading...
View Options

examples/comb/in.comb3

Loading...
View Options

potentials/ffield.comb3

Loading...
View Options

potentials/lib.comb3

Loading...
View Options

src/MANYBODY/pair_comb3.cpp

Loading...
View Options

src/MANYBODY/pair_comb3.h

Loading...
View Options

src/version.h

Loading...
View Options

tools/moltemplate/common/amber/amberparm2lt.sh

Loading...
View Options

tools/moltemplate/common/amber/amberparm_pair_to_lt.py

Loading...
View Options

tools/moltemplate/common/gaff.lt

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/membrane+protein/moltemplate_files/calc_table/calc_CGLipidTableINTvsINT.py

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/membrane+protein/run.in.npt

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/membrane+protein/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/membrane_BranniganPRE2005/moltemplate_files/calc_table/calc_table.py

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/protein_folding_examples/1beadProtSci2010/moltemplate_files/system.lt

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/moltemplate_files/calc_table/calc_CGLipidTableINTvsINT.py

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/packmol_files/README.sh

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/run.in.min

Loading...
View Options

tools/moltemplate/examples/CG_biomolecules/vesicle_Brannigan2005+Bellesia2010/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/CG_misc/translocation/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/CG_solvent/cyclododecane+watMW/run.in.npt

Loading...
View Options

tools/moltemplate/examples/CG_solvent/cyclododecane+watMW/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/WARNING.TXT

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README.TXT

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_run.sh

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_setup.sh

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_visualize.txt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/WARNING.TXT

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/images/hexadecane_12x12x2_t=0_LR.jpg

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/images/hexadecane_12x12x2_t=10ps_npt_LR.jpg

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/images/hexadecane_LR.jpg

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/ch2group.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/ch3group.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/hexadecane.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/system.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/run.in.npt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/README_setup.sh

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/moltemplate_files/system.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/run.in.npt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/convert_LAMMPS_to_LT_examples/cnad-cnt/cnt.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/README.TXT

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/README_run.sh

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/README_setup.sh

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/README_visualize.txt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/WARNING.TXT

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/images/hexadecane_12x12x2_t=0_LR.jpg

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/images/hexadecane_12x12x2_t=10ps_npt_LR.jpg

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/images/hexadecane_LR.jpg

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/alkanes.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/ch2group.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/ch3group.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/hexadecane.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/system.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/run.in.npt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/hexadecane/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/nanotube+water/moltemplate_files/nanotube.lt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/nanotube+water/run.in.npt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/nanotube+water/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/read_PDB_file_examples/waterSPCE_from_PDBfile/run.in.npt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/read_PDB_file_examples/waterSPCE_from_PDBfile/run.in.nvt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/waterSPCE+Na+Cl/run.in.npt

Loading...
View Options

tools/moltemplate/examples/all_atom_examples/waterSPCE+Na+Cl/run.in.nvt

Loading...
View Options

tools/moltemplate/src/dump2data.py

Loading...
View Options

tools/moltemplate/src/lttree.py

Loading...
View Options

tools/moltemplate/src/lttree_check.py

Loading...
View Options

tools/moltemplate/src/moltemplate.sh

Loading...
View Options

tools/moltemplate/src/nbody_by_type.py

Loading...
View Options

tools/moltemplate/src/nbody_by_type_lib_old.py

Loading...
View Options

tools/moltemplate/src/postprocess_input_script.py

Loading...
View Options

tools/moltemplate/src/raw2data.py

Loading...
View Options

tools/moltemplate/src/ttree.py

Loading...
c4science · Help