From 17a7fb2c98a2caa16719e0fe2a98b0362f733c63 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 11 Sep 2014 15:49:12 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12484
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 doc/accelerate_intel.html |  2 +-
 doc/accelerate_intel.txt  |  2 +-
 doc/accelerate_omp.html   | 11 +++++------
 doc/accelerate_omp.txt    | 11 +++++------
 doc/accelerate_opt.html   |  4 ++--
 doc/accelerate_opt.txt    |  4 ++--
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/doc/accelerate_intel.html b/doc/accelerate_intel.html
index a96a13b1d3..ea5bf80095 100644
--- a/doc/accelerate_intel.html
+++ b/doc/accelerate_intel.html
@@ -44,7 +44,7 @@ package is available.
 <P>Here is a quick overview of how to use the USER-INTEL package
 for CPU acceleration:
 </P>
-<UL><LI>specify these CCFLAGS in your Makefile.machine: -fopenmp, -DLAMMPS_MEMALIGN=64, and -restrict, -xHost
+<UL><LI>specify these CCFLAGS in your src/MAKE/Makefile.machine: -fopenmp, -DLAMMPS_MEMALIGN=64, -restrict, -xHost
 <LI>specify -fopenmp with LINKFLAGS in your Makefile.machine
 <LI>include the USER-INTEL package and (optionally) USER-OMP package and build LAMMPS
 <LI>if using the USER-OMP package, specify how many threads per MPI task to use
diff --git a/doc/accelerate_intel.txt b/doc/accelerate_intel.txt
index 64e14d2528..c27e6063d9 100644
--- a/doc/accelerate_intel.txt
+++ b/doc/accelerate_intel.txt
@@ -41,7 +41,7 @@ package is available.
 Here is a quick overview of how to use the USER-INTEL package
 for CPU acceleration:
 
-specify these CCFLAGS in your Makefile.machine: -fopenmp, -DLAMMPS_MEMALIGN=64, and -restrict, -xHost
+specify these CCFLAGS in your src/MAKE/Makefile.machine: -fopenmp, -DLAMMPS_MEMALIGN=64, -restrict, -xHost
 specify -fopenmp with LINKFLAGS in your Makefile.machine
 include the USER-INTEL package and (optionally) USER-OMP package and build LAMMPS
 if using the USER-OMP package, specify how many threads per MPI task to use
diff --git a/doc/accelerate_omp.html b/doc/accelerate_omp.html
index bc0b24c37c..e50d2d1627 100644
--- a/doc/accelerate_omp.html
+++ b/doc/accelerate_omp.html
@@ -48,12 +48,11 @@ MPI task running on a CPU.
 make yes-user-omp
 make machine 
 </PRE>
-<P>Your src/MAKE/Makefile.machine needs a flag for OpenMP support in both
-the CCFLAGS and LINKFLAGS variables.  For GNU and Intel compilers,
-this flag is "-fopenmp".  Without this flag the USER-OMP styles will
-still be compiled and work, but will not support multi-threading.
-</P>
-<P><B>Run with the USER-OMP package from the command line:</B>
+<P>The CCFLAGS setting in your src/MAKE/Makefile.machine needs "-fopenmp"
+to add OpenMP support.  This works for both the GNU and Intel
+compilers.  Without this flag the USER-OMP styles will still be
+compiled and work, but will not support multi-threading.  For the
+Intel compilers the CCFLAGS setting also needs to include "-restrict".
 </P>
 <P>The mpirun or mpiexec command sets the total number of MPI tasks used
 by LAMMPS (one or multiple per compute node) and the number of MPI
diff --git a/doc/accelerate_omp.txt b/doc/accelerate_omp.txt
index e2ededf5e7..768c7061f3 100644
--- a/doc/accelerate_omp.txt
+++ b/doc/accelerate_omp.txt
@@ -45,12 +45,11 @@ cd lammps/src
 make yes-user-omp
 make machine :pre
 
-Your src/MAKE/Makefile.machine needs a flag for OpenMP support in both
-the CCFLAGS and LINKFLAGS variables.  For GNU and Intel compilers,
-this flag is "-fopenmp".  Without this flag the USER-OMP styles will
-still be compiled and work, but will not support multi-threading.
-
-[Run with the USER-OMP package from the command line:]
+The CCFLAGS setting in your src/MAKE/Makefile.machine needs "-fopenmp"
+to add OpenMP support.  This works for both the GNU and Intel
+compilers.  Without this flag the USER-OMP styles will still be
+compiled and work, but will not support multi-threading.  For the
+Intel compilers the CCFLAGS setting also needs to include "-restrict".
 
 The mpirun or mpiexec command sets the total number of MPI tasks used
 by LAMMPS (one or multiple per compute node) and the number of MPI
diff --git a/doc/accelerate_opt.html b/doc/accelerate_opt.html
index 1293c2f637..73235407b8 100644
--- a/doc/accelerate_opt.html
+++ b/doc/accelerate_opt.html
@@ -42,8 +42,8 @@ input script.
 make yes-opt
 make machine 
 </PRE>
-<P>No additional compile/link flags are needed in your Makefile.machine
-in src/MAKE.
+<P>If you are using Intel compilers, then the CCFLAGS setting in your
+src/MAKE/Makefile.machine needs to include "-restrict".
 </P>
 <P><B>Run with the OPT package from the command line:</B>
 </P>
diff --git a/doc/accelerate_opt.txt b/doc/accelerate_opt.txt
index d7e9225720..0f5e9c5473 100644
--- a/doc/accelerate_opt.txt
+++ b/doc/accelerate_opt.txt
@@ -39,8 +39,8 @@ cd lammps/src
 make yes-opt
 make machine :pre
 
-No additional compile/link flags are needed in your Makefile.machine
-in src/MAKE.
+If you are using Intel compilers, then the CCFLAGS setting in your
+src/MAKE/Makefile.machine needs to include "-restrict".
 
 [Run with the OPT package from the command line:]