move enum{NO_REMAP,X_REMAP,V_REMAP} to Domain class in domain.h (3682bc47) · Commits · 郑智淋 / lammps

src/COLLOID/pair_lubricate.cpp

+1 −5

Original line number	Diff line number	Diff line
		@@ -43,10 +43,6 @@
		using namespace LAMMPS_NS;
		using namespace MathConst;

		// same as fix_deform.cpp

		enum{NO_REMAP,X_REMAP,V_REMAP};

		// same as fix_wall.cpp

		enum{EDGE,CONSTANT,VARIABLE};
		@@ -570,7 +566,7 @@ void PairLubricate::init_style()
		for (int i = 0; i < modify->nfix; i++){
		if (strcmp(modify->fix[i]->style,"deform") == 0) {
		shearing = flagdeform = 1;
		if (((FixDeform *) modify->fix[i])->remapflag != V_REMAP)
		if (((FixDeform *) modify->fix[i])->remapflag != Domain::V_REMAP)
		error->all(FLERR,"Using pair lubricate with inconsistent "
		"fix deform remap option");
		}

+2 −7

Original line number	Diff line number	Diff line
		@@ -44,11 +44,6 @@
		using namespace LAMMPS_NS;
		using namespace MathConst;

		// same as fix_deform.cpp

		enum{NO_REMAP,X_REMAP,V_REMAP};


		// same as fix_wall.cpp

		enum{EDGE,CONSTANT,VARIABLE};
		@@ -474,7 +469,7 @@ void PairLubricatePoly::init_style()
		for (int i = 0; i < modify->nfix; i++){
		if (strcmp(modify->fix[i]->style,"deform") == 0) {
		shearing = flagdeform = 1;
		if (((FixDeform *) modify->fix[i])->remapflag != V_REMAP)
		if (((FixDeform *) modify->fix[i])->remapflag != Domain::V_REMAP)
		error->all(FLERR,"Using pair lubricate with inconsistent "
		"fix deform remap option");
		}
		@@ -550,7 +545,7 @@ void PairLubricatePoly::init_style()
		for (int i = 0; i < modify->nfix; i++)
		if (strcmp(modify->fix[i]->style,"deform") == 0) {
		shearing = 1;
		if (((FixDeform *) modify->fix[i])->remapflag != V_REMAP)
		if (((FixDeform *) modify->fix[i])->remapflag != Domain::V_REMAP)
		error->all(FLERR,"Using pair lubricate/poly with inconsistent "
		"fix deform remap option");
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -41,10 +41,6 @@ using namespace MathConst;
		enum{NONE,FINAL,DELTA,SCALE,VEL,ERATE,TRATE,VOLUME,WIGGLE,VARIABLE};
		enum{ONE_FROM_ONE,ONE_FROM_TWO,TWO_FROM_ONE};

		// same as domain.cpp, fix_nvt_sllod.cpp, compute_temp_deform.cpp

		enum{NO_REMAP,X_REMAP,V_REMAP};

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

		FixDeformKokkos::FixDeformKokkos(LAMMPS lmp, int narg, char *arg) : FixDeform(lmp, narg, arg)
		@@ -315,7 +311,7 @@ void FixDeformKokkos::end_of_step()

		// convert atoms and rigid bodies to lamda coords

		if (remapflag == X_REMAP) {
		if (remapflag == Domain::X_REMAP) {
		int nlocal = atom->nlocal;

		domainKK->x2lamda(nlocal);
		@@ -355,7 +351,7 @@ void FixDeformKokkos::end_of_step()

		// convert atoms and rigid bodies back to box coords

		if (remapflag == X_REMAP) {
		if (remapflag == Domain::X_REMAP) {
		int nlocal = atom->nlocal;

		domainKK->lamda2x(nlocal);

+1 −3

Original line number	Diff line number	Diff line
		@@ -52,8 +52,6 @@ enum{BIG_MOVE,SRD_MOVE,SRD_ROTATE};
		enum{CUBIC_ERROR,CUBIC_WARN};
		enum{SHIFT_NO,SHIFT_YES,SHIFT_POSSIBLE};

		enum{NO_REMAP,X_REMAP,V_REMAP}; // same as fix_deform.cpp

		#define EINERTIA 0.2 // moment of inertia prefactor for ellipsoid

		#define ATOMPERBIN 30
		@@ -384,7 +382,7 @@ void FixSRD::init()
		if (strcmp(modify->fix[i]->style,"deform") == 0) {
		deformflag = 1;
		FixDeform deform = (FixDeform ) modify->fix[i];
		if (deform->box_change_shape && deform->remapflag != V_REMAP)
		if (deform->box_change_shape && deform->remapflag != Domain::V_REMAP)
		error->all(FLERR,"Using fix srd with inconsistent "
		"fix deform remap option");
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@

		using namespace LAMMPS_NS;

		enum{NO_REMAP,X_REMAP,V_REMAP}; // same as fix_deform.cpp

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

		ComputeTempDeformEff::ComputeTempDeformEff(LAMMPS lmp, int narg, char *arg) :
		@@ -76,7 +74,7 @@ void ComputeTempDeformEff::init()
		int i;
		for (i = 0; i < modify->nfix; i++)
		if (strcmp(modify->fix[i]->style,"deform") == 0) {
		if (((FixDeform *) modify->fix[i])->remapflag == X_REMAP &&
		if (((FixDeform *) modify->fix[i])->remapflag == Domain::X_REMAP &&
		comm->me == 0)
		error->warning(FLERR,"Using compute temp/deform/eff with inconsistent "
		"fix deform remap option");