Merge pull request #1232 from akohlmey/collected-small-fixes (e4ca5b18) · Commits · 郑智淋 / lammps

doc/src/Errors_messages.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -279,12 +279,6 @@ multibody joint). The bodies you have defined exceed this limit. :dd
		This is an internal LAMMPS error. Please report it to the
		developers. :dd

		{Atom sorting has bin size = 0.0} :dt

		The neighbor cutoff is being used as the bin size, but it is zero.
		Thus you must explicitly list a bin size in the atom_modify sort
		command or turn off sorting. :dd

		{Atom style hybrid cannot have hybrid as an argument} :dt

		Self-explanatory. :dd

+2 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,8 @@ info), a map is used. The default map style is array if no atom ID is
		larger than 1 million, otherwise the default is hash. By default, a
		"first" group is not defined. By default, sorting is enabled with a
		frequency of 1000 and a binsize of 0.0, which means the neighbor
		cutoff will be used to set the bin size.
		cutoff will be used to set the bin size. If no neighbor cutoff is
		defined, sorting will be turned off.

		:line

+1 −0

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ struct POEMSChain{
		{
		delete childChains(i);
		}
		listOfNodes.DeleteValues();
		}
		//void printTreeStructure(int tabs);
		//void getTreeAsList(List<int> * temp);

+5 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,9 @@ struct POEMSNode {
		class SystemProcessor{
		private:
		Tree nodes;
		// List<POEMSNode> forDeletion;
		static void POEMSNodeDelete_cb(void *node) {
		delete (POEMSNode *) node;
		}
		List<POEMSChain> headsOfSystems;
		List<List<int> > ringsInSystem;
		POEMSNode * findSingleLink(TreeNode * aNode);
		@@ -65,6 +67,8 @@ public:
		};

		SystemProcessor::SystemProcessor(void){
		// register callback for deleting auxiliary data from tree nodes.
		nodes.SetDeleteAuxData(&POEMSNodeDelete_cb);
		}

		void SystemProcessor::processArray(int** links, int numLinks)