lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8368 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2012-06-21 16:56:29 +00:00
parent dc17d79635
commit 63f63e4567
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/balance.cpp
View File

@ -31,7 +31,7 @@ using namespace LAMMPS_NS;
enum{NONE,UNIFORM,USER,DYNAMIC}; enum{NONE,UNIFORM,USER,DYNAMIC};
enum{X,Y,Z}; enum{X,Y,Z};
#define BALANCE_DEBUG 1 //#define BALANCE_DEBUG 1
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

2
src/fix_balance.cpp
View File

@ -218,7 +218,7 @@ void FixBalance::rebalance()
if (domain->triclinic) domain->lamda2x(atom->nlocal); if (domain->triclinic) domain->lamda2x(atom->nlocal);
// NOTE: still to be implemented // NOTE: still to be implemented
// check that sub-domains are valid with KSpace constraints // check that new sub-domains are valid with KSpace constraints
// if (kspace_flag) force->kspace->check(); // if (kspace_flag) force->kspace->check();
// imbfinal = final imbalance based on final nlocal // imbfinal = final imbalance based on final nlocal

9
src/irregular.cpp
View File

@ -168,8 +168,6 @@ void Irregular::migrate_atoms()
int Irregular::migrate_check() int Irregular::migrate_check()
{ {
return 1;
// subbox bounds for orthogonal or triclinic box // subbox bounds for orthogonal or triclinic box
// other comm/domain data used by coord2proc() // other comm/domain data used by coord2proc()
@ -225,7 +223,7 @@ int Irregular::migrate_check()
if (glo < 0) glo = procgrid[1] - 1; if (glo < 0) glo = procgrid[1] - 1;
if (ghi >= procgrid[1]) ghi = 0; if (ghi >= procgrid[1]) ghi = 0;
} }
if (igx != myloc[1] && igx != glo && igx != ghi) flag = 1; if (igy != myloc[1] && igy != glo && igy != ghi) flag = 1;
glo = myloc[2] - 1; glo = myloc[2] - 1;
ghi = myloc[2] + 1; ghi = myloc[2] + 1;
@ -233,12 +231,15 @@ int Irregular::migrate_check()
if (glo < 0) glo = procgrid[2] - 1; if (glo < 0) glo = procgrid[2] - 1;
if (ghi >= procgrid[2]) ghi = 0; if (ghi >= procgrid[2]) ghi = 0;
} }
if (igx != myloc[2] && igx != glo && igx != ghi) flag = 1; if (igz != myloc[2] && igz != glo && igz != ghi) flag = 1;
} }
} }
int flagall; int flagall;
MPI_Allreduce(&flag,&flagall,1,MPI_INT,MPI_MAX,world); MPI_Allreduce(&flag,&flagall,1,MPI_INT,MPI_MAX,world);
if (comm->me == 0) printf("MIGRATE CHECK %d\n",flagall);
return flagall; return flagall;
} }