git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12484 f3b2605a-…

…c512-4ea7-a41b-209d697bcdaa

doc/accelerate_intel.html

@@ -44,7 +44,7 @@ <H4>5.3.3 USER-INTEL package
 <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

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

doc/accelerate_omp.html

@@ -48,12 +48,11 @@ <H4>5.3.5 USER-OMP package
 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

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

doc/accelerate_opt.html

@@ -42,8 +42,8 @@ <H4>5.3.6 OPT package
 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>

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:]