From b16daa15d8daf038eb6f87ee9579fbc80850824b Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 18 Aug 2009 18:43:28 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3113
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/lammps.cpp   | 15 ++++++++-------
 src/universe.cpp |  1 +
 src/universe.h   |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/lammps.cpp b/src/lammps.cpp
index 1ec7478296..77babb81f0 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -58,6 +58,7 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
 
   while (iarg < narg) {
     if (strcmp(arg[iarg],"-partition") == 0) {
+      universe->existflag = 1;
       if (iarg+2 > narg) 
 	error->universe_all("Invalid command-line argument");
       iarg++;
@@ -91,18 +92,18 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
     } else error->universe_all("Invalid command-line argument");
   }
 
-  // if procs was not a command-line switch, universe is one world w/ all procs
+  // if no partition command-line switch, universe is one world w/ all procs
 
-  if (universe->nworlds == 0) universe->add_world(NULL);
+  if (universe->existflag == 0) universe->add_world(NULL);
 
   // sum of procs in all worlds must equal total # of procs
 
   if (!universe->consistent())
     error->universe_all("Processor partitions are inconsistent");
 
-  // multiple-world universe must define input file
+  // universe cannot use stdin for input file
 
-  if (universe->nworlds > 1 && inflag == 0)
+  if (universe->existflag && inflag == 0)
     error->universe_all("Must use -in switch with multiple partitions");
 
   // set universe screen and logfile
@@ -136,12 +137,12 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
     universe->ulogfile = NULL;
   }
 
-  // universe is single world
+  // universe does not exist on its own, only a single world
   // inherit settings from universe
   // set world screen, logfile, communicator, infile
   // open input script if from file
 
-  if (universe->nworlds == 1) {
+  if (universe->existflag == 0) {
     screen = universe->uscreen;
     logfile = universe->ulogfile;
     world = universe->uworld;
@@ -162,7 +163,7 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
       if (logfile) fprintf(logfile,"LAMMPS (%s)\n",universe->version);
     }
 
-  // universe is multiple worlds
+  // universe is one or more worlds
   // split into separate communicators
   // set world screen, logfile, communicator, infile
   // open input script
diff --git a/src/universe.cpp b/src/universe.cpp
index 9909a80dc6..2a432c7250 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -35,6 +35,7 @@ Universe::Universe(LAMMPS *lmp, MPI_Comm communicator) : Pointers(lmp)
   uscreen = stdout;
   ulogfile = NULL;
 
+  existflag = 0;
   nworlds = 0;
   procs_per_world = NULL;
   root_proc = NULL;
diff --git a/src/universe.h b/src/universe.h
index c23059885e..6a0a855bd3 100644
--- a/src/universe.h
+++ b/src/universe.h
@@ -30,6 +30,7 @@ class Universe : protected Pointers {
   FILE *uscreen;          // universe screen output
   FILE *ulogfile;         // universe logfile
 
+  int existflag;          // 1 if universe exists due to -partition flag
   int nworlds;            // # of worlds in universe
   int iworld;             // which world I am in
   int *procs_per_world;   // # of procs in each world