new neighbor list changes

2016-09-07 13:42:58 -06:00
parent 0252347d43
commit c9c2ae6c61
259 changed files with 23076 additions and 14650 deletions
--- a/src/ntopo_improper_partial.cpp
+++ b/src/ntopo_improper_partial.cpp
@ -0,0 +1,108 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#include <mpi.h>
+#include "ntopo_improper_partial.h"
+#include "atom.h"
+#include "force.h"
+#include "domain.h"
+#include "update.h"
+#include "output.h"
+#include "thermo.h"
+#include "memory.h"
+#include "error.h"
+
+using namespace LAMMPS_NS;
+
+#define DELTA 10000
+
+/* ---------------------------------------------------------------------- */
+
+NTopoImproperPartial::NTopoImproperPartial(LAMMPS *lmp) : 
+  NTopo(lmp)
+{
+  allocate_improper();
+}
+
+/* ---------------------------------------------------------------------- */
+
+void NTopoImproperPartial::build()
+{
+  int i,m,atom1,atom2,atom3,atom4;
+
+  int nlocal = atom->nlocal;
+  int *num_improper = atom->num_improper;
+  tagint **improper_atom1 = atom->improper_atom1;
+  tagint **improper_atom2 = atom->improper_atom2;
+  tagint **improper_atom3 = atom->improper_atom3;
+  tagint **improper_atom4 = atom->improper_atom4;
+  int **improper_type = atom->improper_type;
+  int newton_bond = force->newton_bond;
+
+  int lostbond = output->thermo->lostbond;
+  int nmissing = 0;
+  nimproperlist = 0;
+
+  for (i = 0; i < nlocal; i++)
+    for (m = 0; m < num_improper[i]; m++) {
+      if (improper_type[i][m] <= 0) continue;
+      atom1 = atom->map(improper_atom1[i][m]);
+      atom2 = atom->map(improper_atom2[i][m]);
+      atom3 = atom->map(improper_atom3[i][m]);
+      atom4 = atom->map(improper_atom4[i][m]);
+      if (atom1 == -1 || atom2 == -1 || atom3 == -1 || atom4 == -1) {
+        nmissing++;
+        if (lostbond == ERROR) {
+          char str[128];
+          sprintf(str,"Improper atoms "
+                  TAGINT_FORMAT " " TAGINT_FORMAT " "
+                  TAGINT_FORMAT " " TAGINT_FORMAT
+                  " missing on proc %d at step " BIGINT_FORMAT,
+                  improper_atom1[i][m],improper_atom2[i][m],
+                  improper_atom3[i][m],improper_atom4[i][m],
+                  me,update->ntimestep);
+          error->one(FLERR,str);
+        }
+        continue;
+      }
+      atom1 = domain->closest_image(i,atom1);
+      atom2 = domain->closest_image(i,atom2);
+      atom3 = domain->closest_image(i,atom3);
+      atom4 = domain->closest_image(i,atom4);
+      if (newton_bond ||
+          (i <= atom1 && i <= atom2 && i <= atom3 && i <= atom4)) {
+        if (nimproperlist == maximproper) {
+          maximproper += DELTA;
+          memory->grow(improperlist,maximproper,5,"neigh_topo:improperlist");
+        }
+        improperlist[nimproperlist][0] = atom1;
+        improperlist[nimproperlist][1] = atom2;
+        improperlist[nimproperlist][2] = atom3;
+        improperlist[nimproperlist][3] = atom4;
+        improperlist[nimproperlist][4] = improper_type[i][m];
+        nimproperlist++;
+      }
+    }
+
+  if (cluster_check) dihedral_check(nimproperlist,improperlist);
+  if (lostbond == IGNORE) return;
+
+  int all;
+  MPI_Allreduce(&nmissing,&all,1,MPI_INT,MPI_SUM,world);
+  if (all) {
+    char str[128];
+    sprintf(str,
+            "Improper atoms missing at step " BIGINT_FORMAT,update->ntimestep);
+    if (me == 0) error->warning(FLERR,str);
+  }
+}