move enum{LAYOUT_UNIFORM,LAYOUT_NONUNIFORM,LAYOUT_TILED}; to Comm class (71e1867d) · Commits · 郑智淋 / lammps

src/GRANULAR/fix_pour.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ using namespace MathConst;

		enum{ATOM,MOLECULE};
		enum{ONE,RANGE,POLY};
		enum{LAYOUT_UNIFORM,LAYOUT_NONUNIFORM,LAYOUT_TILED}; // several files

		#define EPSILON 0.001
		#define SMALL 1.0e-10
		@@ -609,7 +608,7 @@ void FixPour::pre_exchange()
		newcoord[1] >= sublo[1] && newcoord[1] < subhi[1] &&
		newcoord[2] >= sublo[2] && newcoord[2] < subhi[2]) flag = 1;
		else if (dimension == 3 && newcoord[2] >= domain->boxhi[2]) {
		if (comm->layout != LAYOUT_TILED) {
		if (comm->layout != Comm::LAYOUT_TILED) {
		if (comm->myloc[2] == comm->procgrid[2]-1 &&
		newcoord[0] >= sublo[0] && newcoord[0] < subhi[0] &&
		newcoord[1] >= sublo[1] && newcoord[1] < subhi[1]) flag = 1;
		@@ -619,7 +618,7 @@ void FixPour::pre_exchange()
		newcoord[1] >= sublo[1] && newcoord[1] < subhi[1]) flag = 1;
		}
		} else if (dimension == 2 && newcoord[1] >= domain->boxhi[1]) {
		if (comm->layout != LAYOUT_TILED) {
		if (comm->layout != Comm::LAYOUT_TILED) {
		if (comm->myloc[1] == comm->procgrid[1]-1 &&
		newcoord[0] >= sublo[0] && newcoord[0] < subhi[0]) flag = 1;
		} else {

+0 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,6 @@ using namespace LAMMPS_NS;

		#define DELTA_PROCS 16

		enum{LAYOUT_UNIFORM,LAYOUT_NONUNIFORM,LAYOUT_TILED}; // several files

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

		CommTiledKokkos::CommTiledKokkos(LAMMPS *lmp) : CommTiled(lmp)

+2 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ using namespace FixConst;
		using namespace MathConst;

		enum{ATOM,MOLECULE};
		enum{LAYOUT_UNIFORM,LAYOUT_NONUNIFORM,LAYOUT_TILED}; // several files
		enum{DIST_UNIFORM,DIST_GAUSSIAN};

		#define EPSILON 1.0e6
		@@ -506,7 +505,7 @@ void FixDeposit::pre_exchange()
		newcoord[1] >= sublo[1] && newcoord[1] < subhi[1] &&
		newcoord[2] >= sublo[2] && newcoord[2] < subhi[2]) flag = 1;
		else if (dimension == 3 && newcoord[2] >= domain->boxhi[2]) {
		if (comm->layout != LAYOUT_TILED) {
		if (comm->layout != Comm::LAYOUT_TILED) {
		if (comm->myloc[2] == comm->procgrid[2]-1 &&
		newcoord[0] >= sublo[0] && newcoord[0] < subhi[0] &&
		newcoord[1] >= sublo[1] && newcoord[1] < subhi[1]) flag = 1;
		@@ -516,7 +515,7 @@ void FixDeposit::pre_exchange()
		newcoord[1] >= sublo[1] && newcoord[1] < subhi[1]) flag = 1;
		}
		} else if (dimension == 2 && newcoord[1] >= domain->boxhi[1]) {
		if (comm->layout != LAYOUT_TILED) {
		if (comm->layout != Comm::LAYOUT_TILED) {
		if (comm->myloc[1] == comm->procgrid[1]-1 &&
		newcoord[0] >= sublo[0] && newcoord[0] < subhi[0]) flag = 1;
		} else {

+1 −3

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@
		using namespace LAMMPS_NS;
		using namespace FixConst;

		enum{LAYOUT_UNIFORM,LAYOUT_NONUNIFORM,LAYOUT_TILED}; // several files

		#define BIG 1.0e30
		#define EPSILON 1.0e-6

		@@ -417,7 +415,7 @@ void FixAppendAtoms::pre_exchange()
		if (spatflag==1) if (get_spatial()==0) return;

		int addflag = 0;
		if (comm->layout != LAYOUT_TILED) {
		if (comm->layout != Comm::LAYOUT_TILED) {
		if (comm->myloc[2] == comm->procgrid[2]-1) addflag = 1;
		} else {
		if (comm->mysplit[2][1] == 1.0) addflag = 1;

+1 −5

Original line number	Diff line number	Diff line
		@@ -40,10 +40,6 @@ using namespace Eigen;
		using namespace std;
		#define DELTA 16384
		#define EPSILON 1.0e-6
		enum {
		LAYOUT_UNIFORM, LAYOUT_NONUNIFORM, LAYOUT_TILED
		};
		// several files

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

		@@ -151,7 +147,7 @@ void FixSMDWallSurface::setup(int vflag) {
		subhi[2] = domain->subhi_lamda[2];
		}

		if (comm->layout != LAYOUT_TILED) {
		if (comm->layout != Comm::LAYOUT_TILED) {
		if (domain->xperiodic) {
		if (comm->myloc[0] == 0)
		sublo[0] -= epsilon[0];