change -mpi to -mpicolor

doc/src/Howto_client_server.txt

@@ -119,12 +119,13 @@ For message exchange in {mpi/one} mode:
 
 Launch both codes in a single mpirun command:
 
-mpirun -np 2 lmp_mpi -mpi 2 -in in.message.client -log log.client : -np 4 lmp_mpi -mpi 2 -in in.message.server -log log.server
+mpirun -np 2 lmp_mpi -mpicolor 0 -in in.message.client -log log.client : -np 4 lmp_mpi -mpicolor 1 -in in.message.server -log log.server
 
 The two -np values determine how many procs the client and the server
 run on.
 
-A LAMMPS executable run in this manner must use the -mpi P
+A LAMMPS executable run in this manner must use the -mpicolor color
-command-line option as their first option, where P is the number of
+command-line option as their its option, where color is an integer
-processors the first code in the mpirun command (client or server) is
+label that will be used to distinguish one executable from another in
-running on.
+the multiple executables that the mpirun command launches.  In this
+example the client was colored with a 0, and the server with a 1.

doc/src/Run_options.txt

@@ -18,7 +18,7 @@ letter abbreviation can be used:
 "-i or -in"_#file
 "-k or -kokkos"_#run-kokkos
 "-l or -log"_#log
-"-m or -mpi"_#mpi
+"-m or -mpicolor"_#mpicolor
 "-nc or -nocite"_#nocite
 "-pk or -package"_#package
 "-p or -partition"_#partition
@@ -176,7 +176,7 @@ Option -plog will override the name of the partition log files file.N.
 
 :line
 
-[-mpi] color :link(mpi)
+[-mpicolor] color :link(mpi)
 
 If used, this must be the first command-line argument after the LAMMPS
 executable name.  It is only used when LAMMPS is launched by an mpirun

doc/src/message.txt

@@ -105,12 +105,12 @@ mode on a parallel machine, e.g. a cluster with many nodes.
 For mode {mpi/one}, the 2 codes communicate via MPI and are launched
 by the same mpirun command, e.g. with this syntax for OpenMPI:
 
-mpirun -np 2 lmp_mpi -mpi 2 -in in.client -log log.client : -np 4 othercode args  # LAMMPS is client
+mpirun -np 2 lmp_mpi -mpicolor 0 -in in.client -log log.client : -np 4 othercode args  # LAMMPS is client
-mpirun -np 2 othercode args : -np 4 lmp_mpi -mpi 2 -in in.server  # LAMMPS is server :pre
+mpirun -np 2 othercode args : -np 4 lmp_mpi -mpicolor 1 -in in.server  # LAMMPS is server :pre
 
-Note the use of the "-mpi P" command-line argument with LAMMPS.  See
+Note the use of the "-mpicolor color" command-line argument with
-the "command-line args"_Run_options.html doc page for further
+LAMMPS.  See the "command-line args"_Run_options.html doc page for
-explanation.
+further explanation.
 
 For mode {mpi/two}, the 2 codes communicate via MPI, but are launched
 be 2 separate mpirun commands.  The specified {filename} argument is a

examples/message/README

@@ -105,13 +105,13 @@ Mpi/one mode of messaging:
 
 Launch LAMMPS twice in a single mpirun command:
 
-% mpirun -np 2 lmp_mpi -mpi 0 -in in.message.client -v mode mpione -log log.client : -np 4 lmp_mpi -mpi 1 -in in.message.server -v mode mpione -log log.server
+% mpirun -np 2 lmp_mpi -mpicolor 0 -in in.message.client -v mode mpione -log log.client : -np 4 lmp_mpi -mpicolor 1 -in in.message.server -v mode mpione -log log.server
 
 Or run with in.message.tilt.client/server.
 
 The two -np values determine how many procs the client and the server
 run on.
 
-A LAMMPS executable run in this manner must use the -mpi color
+A LAMMPS executable run in this manner must use the -mpicolor color
-command-line option as their first option, where color is set to
+command-line option as its first option, where color is set to one
-one integer value for the 1st app, and another value for the 2nd app.
+integer value for the 1st app, and another value for the 2nd app.

examples/message/Script.sh

@@ -13,7 +13,7 @@ mpirun -np 1 lmp_mpi -v mode zmq -log log.message.server.zmq.g++.1 < in.message.
 mpirun -np 1 lmp_mpi -v mode mpitwo -log log.message.client.mpitwo.g++.1 < in.message.client & 
 mpirun -np 1 lmp_mpi -v mode mpitwo -log log.message.server.mpitwo.g++.1 < in.message.server
 
-mpirun -np 1 lmp_mpi -mpi 0 -in in.message.client -v mode mpione -log log.message.client.mpione.g++.1 : -np 1 lmp_mpi -mpi 1 -in in.message.server -v mode mpione -log log.message.server.mpione.g++.1 
+mpirun -np 1 lmp_mpi -m 0 -in in.message.client -v mode mpione -log log.message.client.mpione.g++.1 : -np 1 lmp_mpi -m 1 -in in.message.server -v mode mpione -log log.message.server.mpione.g++.1 
 
 # message on 2/4 procs each
 
@@ -28,7 +28,7 @@ mpirun -np 4 lmp_mpi -v mode zmq -log log.message.server.zmq.g++.4 < in.message.
 mpirun -np 2 lmp_mpi -v mode mpitwo -log log.message.client.mpitwo.g++.2 < in.message.client & 
 mpirun -np 4 lmp_mpi -v mode mpitwo -log log.message.server.mpitwo.g++.4 < in.message.server
 
-mpirun -np 2 lmp_mpi -mpi 0 -in in.message.client -v mode mpione -log log.message.client.mpione.g++.2 : -np 4 lmp_mpi -mpi 1 -in in.message.server -v mode mpione -log log.message.server.mpione.g++.4
+mpirun -np 2 lmp_mpi -m 0 -in in.message.client -v mode mpione -log log.message.client.mpione.g++.2 : -np 4 lmp_mpi -m 1 -in in.message.server -v mode mpione -log log.message.server.mpione.g++.4
 
 # message.tilt on 1 proc each
 
@@ -40,7 +40,7 @@ mpirun -np 1 lmp_mpi -v mode zmq -log log.message.tilt.server.zmq.g++.1 < in.mes
 mpirun -np 1 lmp_mpi -v mode mpitwo -log log.message.tilt.client.mpitwo.g++.1 < in.message.tilt.client & 
 mpirun -np 1 lmp_mpi -v mode mpitwo -log log.message.tilt.server.mpitwo.g++.1 < in.message.tilt.server
 
-mpirun -np 1 lmp_mpi -mpi 0 -in in.message.tilt.client -v mode mpione -log log.message.tilt.client.mpione.g++.1 : -np 1 lmp_mpi -mpi 1 -in in.message.tilt.server -v mode mpione -log log.message.tilt.server.mpione.g++.1 
+mpirun -np 1 lmp_mpi -m 0 -in in.message.tilt.client -v mode mpione -log log.message.tilt.client.mpione.g++.1 : -np 1 lmp_mpi -m 1 -in in.message.tilt.server -v mode mpione -log log.message.tilt.server.mpione.g++.1 
 
 # message.tilt on 2/4 procs each
 
@@ -52,4 +52,4 @@ mpirun -np 4 lmp_mpi -v mode zmq -log log.message.tilt.server.zmq.g++.4 < in.mes
 mpirun -np 2 lmp_mpi -v mode mpitwo -log log.message.tilt.client.mpitwo.g++.2 < in.message.tilt.client & 
 mpirun -np 4 lmp_mpi -v mode mpitwo -log log.message.tilt.server.mpitwo.g++.4 < in.message.tilt.server
 
-mpirun -np 2 lmp_mpi -mpi 0 -in in.message.tilt.client -v mode mpione -log log.message.tilt.client.mpione.g++.2 : -np 4 lmp_mpi -mpi 1 -in in.message.tilt.server -v mode mpione -log log.message.tilt.server.mpione.g++.4
+mpirun -np 2 lmp_mpi -m 0 -in in.message.tilt.client -v mode mpione -log log.message.tilt.client.mpione.g++.2 : -np 4 lmp_mpi -m 1 -in in.message.tilt.server -v mode mpione -log log.message.tilt.server.mpione.g++.4

src/lammps.cpp

@@ -879,6 +879,7 @@ void LAMMPS::help()
           "-in filename                : read input from file, not stdin (-i)\n"
           "-kokkos on/off ...          : turn KOKKOS mode on or off (-k)\n"
           "-log none/filename          : where to send log output (-l)\n"
+          "-mpicolor color             : which exe in a multi-exe mpirun cmd (-m)\n"
           "-nocite                     : disable writing log.cite file (-nc)\n"
           "-package style ...          : invoke package command (-pk)\n"
           "-partition size1 size2 ...  : assign partition sizes (-p)\n"