ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2016-07-15 23:14:13 +00:00
parent 472fe29a89
commit ea39843564
5 changed files with 117 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/neighbor.cpp
View File

@ -104,14 +104,6 @@ Neighbor::Neighbor(LAMMPS *lmp) : Pointers(lmp)
maxbin = 0;
bins = NULL;
// USER-DPD SSA AIR binning
maxbin_ssa = 0;
bins_ssa = NULL;
binhead_ssa = NULL;
gbinhead_ssa = NULL;
maxhead_ssa = 0;
// pair exclusion list info
includegroup = 0;
@ -186,10 +178,6 @@ Neighbor::~Neighbor()
memory->destroy(binhead);
memory->destroy(bins);
memory->destroy(gbinhead_ssa);
memory->destroy(binhead_ssa);
memory->destroy(bins_ssa);
memory->destroy(ex1_type);
memory->destroy(ex2_type);
memory->destroy(ex_type);
@ -391,15 +379,6 @@ void Neighbor::init()
maxbin = maxhead = 0;
binhead = NULL;
bins = NULL;
// for USER-DPD Shardlow Splitting Algorithm (SSA)
memory->destroy(bins_ssa);
memory->destroy(binhead_ssa);
memory->destroy(gbinhead_ssa);
maxbin_ssa = maxhead_ssa = 0;
bins_ssa = NULL;
binhead_ssa = NULL;
gbinhead_ssa = NULL;
}
// 1st time allocation of xhold and bins
@ -724,6 +703,9 @@ void Neighbor::init()
lists[i]->ghostflag = 0;
if (requests[i]->ghost) lists[i]->ghostflag = 1;
if (requests[i]->ghost && !requests[i]->occasional) anyghostlist = 1;
lists[i]->ssaflag = 0;
if (requests[i]->ssa) lists[i]->ssaflag = 1;
} else init_list_flags1_kokkos(i);
}
@ -2254,9 +2236,6 @@ bigint Neighbor::memory_usage()
if (style != NSQ) {
bytes += memory->usage(bins,maxbin);
bytes += memory->usage(binhead,maxhead);
bytes += memory->usage(bins_ssa,maxbin_ssa);
bytes += memory->usage(binhead_ssa,maxhead_ssa);
bytes += memory->usage(gbinhead_ssa,maxhead_ssa);
}
for (int i = 0; i < nrequest; i++)