Merge pull request #1924 from akohlmey/rename-user-meso (3be6347a) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ set(LAMMPS_API_DEFINES)
		set(DEFAULT_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE
		GRANULAR KSPACE LATTE MANYBODY MC MESSAGE MISC MOLECULE PERI POEMS QEQ
		REPLICA RIGID SHOCK SPIN SNAP SRD KIM PYTHON MSCG MPIIO VORONOI
		USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-MESO USER-CGSDK USER-COLVARS
		USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-MESODPD USER-CGSDK USER-COLVARS
		USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP USER-H5MD USER-LB
		USER-MANIFOLD USER-MEAMC USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE
		USER-NETCDF USER-PHONON USER-PLUMED USER-PTM USER-QTB USER-REACTION

doc/src/Commands_pair.rst

+4 −4

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ OPT.
		* :doc:`eam/fs (gikot) <pair_eam>`
		* :doc:`edip (o) <pair_edip>`
		* :doc:`edip/multi <pair_edip>`
		* :doc:`edpd <pair_meso>`
		* :doc:`edpd <pair_mesodpd>`
		* :doc:`eff/cut <pair_eff>`
		* :doc:`eim (o) <pair_eim>`
		* :doc:`exp6/rx (k) <pair_exp6_rx>`
		@@ -171,8 +171,8 @@ OPT.
		* :doc:`lubricate/poly (o) <pair_lubricate>`
		* :doc:`lubricateU <pair_lubricateU>`
		* :doc:`lubricateU/poly <pair_lubricateU>`
		* :doc:`mdpd <pair_meso>`
		* :doc:`mdpd/rhosum <pair_meso>`
		* :doc:`mdpd <pair_mesodpd>`
		* :doc:`mdpd/rhosum <pair_mesodpd>`
		* :doc:`meam/c <pair_meamc>`
		* :doc:`meam/spline (o) <pair_meam_spline>`
		* :doc:`meam/sw/spline <pair_meam_sw_spline>`
		@@ -242,7 +242,7 @@ OPT.
		* :doc:`sw (giko) <pair_sw>`
		* :doc:`table (gko) <pair_table>`
		* :doc:`table/rx (k) <pair_table_rx>`
		* :doc:`tdpd <pair_meso>`
		* :doc:`tdpd <pair_mesodpd>`
		* :doc:`tersoff (giko) <pair_tersoff>`
		* :doc:`tersoff/mod (gko) <pair_tersoff_mod>`
		* :doc:`tersoff/mod/c (o) <pair_tersoff_mod>`

doc/src/Packages_details.rst

+10 −10

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ page gives those details.
		* :ref:`USER-LB <PKG-USER-LB>`
		* :ref:`USER-MANIFOLD <PKG-USER-MANIFOLD>`
		* :ref:`USER-MEAMC <PKG-USER-MEAMC>`
		* :ref:`USER-MESO <PKG-USER-MESO>`
		* :ref:`USER-MESODPD <PKG-USER-MESODPD>`
		* :ref:`USER-MGPT <PKG-USER-MGPT>`
		* :ref:`USER-MISC <PKG-USER-MISC>`
		* :ref:`USER-MOFFF <PKG-USER-MOFFF>`
		@@ -1793,10 +1793,10 @@ Sandia.
		----------


		.. _PKG-USER-MESO:
		.. _PKG-USER-MESODPD:

		USER-MESO package
		-----------------
		USER-MESODPD package
		--------------------

		Contents:

		@@ -1812,14 +1812,14 @@ algorithm.

		Supporting info:

		* src/USER-MESO: filenames -> commands
		* src/USER-MESO/README
		* src/USER-MESODPD: filenames -> commands
		* src/USER-MESODPD/README
		* :doc:`atom_style edpd <atom_style>`
		* :doc:`pair_style edpd <pair_meso>`
		* :doc:`pair_style mdpd <pair_meso>`
		* :doc:`pair_style tdpd <pair_meso>`
		* :doc:`pair_style edpd <pair_mesodpd>`
		* :doc:`pair_style mdpd <pair_mesodpd>`
		* :doc:`pair_style tdpd <pair_mesodpd>`
		* :doc:`fix mvv/dpd <fix_mvv_dpd>`
		* examples/USER/meso
		* examples/USER/mesodpd
		* http://lammps.sandia.gov/movies.html#mesodpd

doc/src/Packages_user.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ package:
		+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
		\| :ref:`USER-MEAMC <PKG-USER-MEAMC>` \| modified EAM potential (C++) \| :doc:`pair_style meam/c <pair_meamc>` \| meamc \| no \|
		+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
		\| :ref:`USER-MESO <PKG-USER-MESO>` \| mesoscale DPD models \| :doc:`pair_style edpd <pair_meso>` \| USER/meso \| no \|
		\| :ref:`USER-MESODPD <PKG-USER-MESODPD>` \| mesoscale DPD models \| :doc:`pair_style edpd <pair_mesodpd>` \| USER/mesodpd \| no \|
		+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
		\| :ref:`USER-MGPT <PKG-USER-MGPT>` \| fast MGPT multi-ion potentials \| :doc:`pair_style mgpt <pair_mgpt>` \| USER/mgpt \| no \|
		+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+

doc/src/atom_style.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ The electron style is part of the USER-EFF package for :doc:`electronic force
		The dpd style is part of the USER-DPD package for dissipative
		particle dynamics (DPD).

		The edpd\ , mdpd\ , and tdpd styles are part of the USER-MESO package
		The edpd\ , mdpd\ , and tdpd styles are part of the USER-MESODPD package
		for energy-conserving dissipative particle dynamics (eDPD), many-body
		dissipative particle dynamics (mDPD), and transport dissipative particle
		dynamics (tDPD), respectively.

Admin message