Fixed several input parsing issues in pair granular; fixed issue with JKR... (18f8f68e) · Commits · 郑智淋 / lammps

src/GRANULAR/pair_gran_hertz_history.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ using namespace LAMMPS_NS;
		/* ---------------------------------------------------------------------- */

		PairGranHertzHistory::PairGranHertzHistory(LAMMPS *lmp) :
		PairGranHookeHistory(lmp, 3) {}
		PairGranHookeHistory(lmp) {}

		/* ---------------------------------------------------------------------- */

+5 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ PairGranHookeHistory::PairGranHookeHistory(LAMMPS *lmp) : Pair(lmp)
		single_enable = 1;
		no_virial_fdotr_compute = 1;
		history = 1;
		size_history = 3;
		fix_history = NULL;

		single_extra = 10;
		@@ -348,6 +349,10 @@ void PairGranHookeHistory::settings(int narg, char **arg)
		{
		if (narg != 6) error->all(FLERR,"Illegal pair_style command");





		kn = force->numeric(FLERR,arg[0]);
		if (strcmp(arg[1],"NULL") == 0) kt = kn * 2.0/7.0;
		else kt = force->numeric(FLERR,arg[1]);

+259 −173

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,9 +62,9 @@ public:

		virtual void allocate();
		int beyond_contact;
		int nondefault_history_transfer;

		private:
		int coeff_types;
		int size_history;

		//Per-type models