adapt fix neigh/history/omp to changes for dynamic exchange buffer size (eaf2b59b) · Commits · 郑智淋 / lammps

src/USER-OMP/fix_neigh_history_omp.cpp

+8 −3

Original line number	Diff line number	Diff line
		@@ -175,6 +175,8 @@ void FixNeighHistoryOMP::pre_exchange_onesided()
		}

		// set maxpartner = max # of partners of any owned atom
		// maxexchange = max # of values for any Comm::exchange() atom

		maxpartner = m = 0;
		for (i = lfrom; i < lto; i++)
		m = MAX(m,npartner[i]);
		@@ -184,7 +186,7 @@ void FixNeighHistoryOMP::pre_exchange_onesided()
		#endif
		{
		maxpartner = MAX(m,maxpartner);
		comm->maxexchange_fix =MAX(comm->maxexchange_fix,(dnum+1)*maxpartner+1);
		maxexchange = (dnum+1)*maxpartner+1;
		}
		}

		@@ -347,6 +349,7 @@ void FixNeighHistoryOMP::pre_exchange_newton()
		}

		// set maxpartner = max # of partners of any owned atom
		// maxexchange = max # of values for any Comm::exchange() atom
		m = 0;
		for (i = lfrom; i < lto; i++)
		m = MAX(m,npartner[i]);
		@@ -356,7 +359,7 @@ void FixNeighHistoryOMP::pre_exchange_newton()
		#endif
		{
		maxpartner = MAX(m,maxpartner);
		comm->maxexchange_fix = MAX(comm->maxexchange_fix,(dnum+1)*maxpartner+1);
		maxexchange = (dnum+1)*maxpartner+1;
		}
		}

		@@ -485,6 +488,8 @@ void FixNeighHistoryOMP::pre_exchange_no_newton()
		}

		// set maxpartner = max # of partners of any owned atom
		// maxexchange = max # of values for any Comm::exchange() atom

		m = 0;
		for (i = lfrom; i < lto; i++)
		m = MAX(m,npartner[i]);
		@@ -494,7 +499,7 @@ void FixNeighHistoryOMP::pre_exchange_no_newton()
		#endif
		{
		maxpartner = MAX(m,maxpartner);
		comm->maxexchange_fix = MAX(comm->maxexchange_fix,(dnum+1)*maxpartner+1);
		maxexchange = (dnum+1)*maxpartner+1;
		}
		}
		}

+1 −1

File changed.

Contains only whitespace changes.