From 0c0691e433ffd7b707679bc295ca70dab8e8f66c Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 2 Jul 2016 06:17:21 -0400 Subject: [PATCH] anticipate change in upstream to avoid conflict with local change --- src/read_data.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/read_data.cpp b/src/read_data.cpp index c33ecd44e6..00dd39c02e 100644 --- a/src/read_data.cpp +++ b/src/read_data.cpp @@ -346,13 +346,10 @@ void ReadData::command(int narg, char **arg) natoms = ntypes = 0; nbonds = nangles = ndihedrals = nimpropers = 0; nbondtypes = nangletypes = ndihedraltypes = nimpropertypes = 0; + + boxlo[0] = boxlo[1] = boxlo[2] = -0.5; + boxhi[0] = boxhi[1] = boxhi[2] = 0.5; triclinic = 0; - boxlo[0] = boxlo[1] = boxlo[2] = 0.0; - boxhi[0] = boxhi[1] = boxhi[2] = 0.0; - if (domain->dimension == 2) { - boxlo[2] = -0.5; - boxhi[2] = 0.5; - } keyword[0] = '\0'; nlocal_previous = atom->nlocal;