From 0d3734ead4675913af5dde7bf10e945abdf45ee8 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Mon, 25 Jun 2012 23:41:39 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8399 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/create_atoms.cpp | 5 +++-- src/read_dump.cpp | 5 +++-- src/replicate.cpp | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/create_atoms.cpp b/src/create_atoms.cpp index 04e3283e64..1f493c6055 100644 --- a/src/create_atoms.cpp +++ b/src/create_atoms.cpp @@ -238,8 +238,9 @@ void CreateAtoms::command(int narg, char **arg) // add tags for newly created atoms if possible // if global map exists, reset it - if (atom->natoms > MAXTAGINT) atom->tag_enable = 0; - if (atom->natoms <= MAXTAGINT) atom->tag_extend(); + // change these to MAXTAGINT when allow tagint = bigint + if (atom->natoms > MAXSMALLINT) atom->tag_enable = 0; + if (atom->natoms <= MAXSMALLINT) atom->tag_extend(); if (atom->map_style) { atom->nghost = 0; diff --git a/src/read_dump.cpp b/src/read_dump.cpp index 85d333d40c..150bff5463 100644 --- a/src/read_dump.cpp +++ b/src/read_dump.cpp @@ -443,8 +443,9 @@ void ReadDump::atoms() MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_LMP_BIGINT,MPI_SUM,world); if (atom->natoms < 0 || atom->natoms > MAXBIGINT) error->all(FLERR,"Too many total atoms"); - if (atom->natoms > MAXTAGINT) atom->tag_enable = 0; - if (atom->natoms <= MAXTAGINT) atom->tag_extend(); + // change these to MAXTAGINT when allow tagint = bigint + if (atom->natoms > MAXSMALLINT) atom->tag_enable = 0; + if (atom->natoms <= MAXSMALLINT) atom->tag_extend(); } // if trimflag set, delete atoms not replaced by snapshot atoms diff --git a/src/replicate.cpp b/src/replicate.cpp index bfc92a780f..0110659c54 100644 --- a/src/replicate.cpp +++ b/src/replicate.cpp @@ -128,9 +128,10 @@ void Replicate::command(int narg, char **arg) // if atomic and new N > MAXTAGINT, turn off tags for existing and new atoms // new system cannot exceed MAXBIGINT - if (atom->molecular && (nrep*old->natoms < 0 || nrep*old->natoms > MAXTAGINT)) + // change these 2 to MAXTAGINT when allow tagint = bigint + if (atom->molecular && (nrep*old->natoms < 0 || nrep*old->natoms > MAXSMALLINT)) error->all(FLERR,"Replicated molecular system atom IDs are too big"); - if (nrep*old->natoms < 0 || nrep*old->natoms > MAXTAGINT) + if (nrep*old->natoms < 0 || nrep*old->natoms > MAXSMALLINT) atom->tag_enable = 0; if (atom->tag_enable == 0) for (int i = 0; i < atom->nlocal; i++)