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

Disable trim from OPENMP and INTEL packages

Browse Source
This commit is contained in:
Stan Gerald Moore
2022-07-12 08:25:20 -06:00
parent 4cb38038c8
commit 56dc342b5b
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/neighbor.cpp
View File

@ -1383,16 +1383,21 @@ void Neighbor::morph_halffull()
if (jrq->occasional) continue; if (jrq->occasional) continue;
if (!jrq->full) continue; if (!jrq->full) continue;
// trim a list with longer cutoff // trim a list with longer cutoff (not yet supported by OPENMP or INTEL)
if (irq->cut) icut = irq->cutoff; if (irq->omp || irq->intel) {
else icut = cutneighmax; if (irq->cut != jrq->cut) continue;
if (irq->cutoff != jrq->cutoff) continue;
} else {
if (irq->cut) icut = irq->cutoff;
else icut = cutneighmax;
if (jrq->cut) jcut = jrq->cutoff; if (jrq->cut) jcut = jrq->cutoff;
else jcut = cutneighmax; else jcut = cutneighmax;
if (icut > jcut) continue; if (icut > jcut) continue;
else if (icut != jcut) trim_flag = 1; else if (icut != jcut) trim_flag = 1;
}
// these flags must be same, // these flags must be same,
// else 2 lists do not store same pairs // else 2 lists do not store same pairs
@ -1461,16 +1466,21 @@ void Neighbor::morph_copy_trim()
if (jrq->copy && jrq->copylist == i) continue; if (jrq->copy && jrq->copylist == i) continue;
// trim a list with longer cutoff // trim a list with longer cutoff (not yet supported by OPENMP or INTEL)
if (irq->cut) icut = irq->cutoff; if (irq->omp || irq->intel) {
else icut = cutneighmax; if (irq->cut != jrq->cut) continue;
if (irq->cutoff != jrq->cutoff) continue;
} else {
if (irq->cut) icut = irq->cutoff;
else icut = cutneighmax;
if (jrq->cut) jcut = jrq->cutoff; if (jrq->cut) jcut = jrq->cutoff;
else jcut = cutneighmax; else jcut = cutneighmax;
if (icut > jcut) continue; if (icut > jcut) continue;
else if (icut != jcut) trim_flag = 1; else if (icut != jcut) trim_flag = 1;
}
// other list (jrq) to copy from must be perpetual // other list (jrq) to copy from must be perpetual
// list that becomes a copy list (irq) can be perpetual or occasional // list that becomes a copy list (irq) can be perpetual or occasional