Commit 6a4213d8 authored by peastman's avatar peastman
Browse files

Minor improvements to manual

parent 1561f089
...@@ -38,17 +38,17 @@ Follow these instructions to install OpenMM. There also is an online ...@@ -38,17 +38,17 @@ Follow these instructions to install OpenMM. There also is an online
troubleshooting guide that describes common problems and how to fix them troubleshooting guide that describes common problems and how to fix them
(http://wiki.simtk.org/openmm/FAQApp). (http://wiki.simtk.org/openmm/FAQApp).
There are two ways to install OpenMM: using the Conda package manager (http://conda.pydata.org),
Installing with Conda or with standalone installers. (A third option is to compile it from source, which is
*********************
There are two ways to install OpenMM: using the Conda package manager, or with
standalone installers. (A third option is to compile it from source, which is
discussed in Chapter :ref:`compiling-openmm-from-source-code`.) Using Conda is discussed in Chapter :ref:`compiling-openmm-from-source-code`.) Using Conda is
the easier method, and is recommended for most users. It is described first, the easier method, and is recommended for most users. It is described first,
and then the following sections describe how to use the standalone installers and then the following sections describe how to use the standalone installers
for various platforms. for various platforms.
Installing with Conda
*********************
Conda is included as part of the Anaconda Python distribution, which you can Conda is included as part of the Anaconda Python distribution, which you can
download from http://docs.continuum.io/anaconda/install. This is a Python download from http://docs.continuum.io/anaconda/install. This is a Python
distribution specifically designed for scientific applications, with many of the distribution specifically designed for scientific applications, with many of the
...@@ -94,7 +94,8 @@ Installing on Mac OS X ...@@ -94,7 +94,8 @@ Installing on Mac OS X
OpenMM works on Mac OS X 10.7 or later. OpenCL is supported on OS X 10.10.5 or OpenMM works on Mac OS X 10.7 or later. OpenCL is supported on OS X 10.10.5 or
later. later.
1. Download the pre-compiled binary of OpenMM for Mac OS X, then double click 1. Download the pre-compiled binary of OpenMM for Mac OS X from
https://simtk.org/project/xml/downloads.xml?group_id=161, then double click
the .zip file to expand it. the .zip file to expand it.
2. If you have not already done so, install Apples Xcode developer tools from 2. If you have not already done so, install Apples Xcode developer tools from
...@@ -159,7 +160,8 @@ produce an error. You will only see this option if your laptop has two GPUs ...@@ -159,7 +160,8 @@ produce an error. You will only see this option if your laptop has two GPUs
Installing on Linux Installing on Linux
******************* *******************
1. Download the pre-compiled binary of OpenMM for Linux, then double click the 1. Download the pre-compiled binary of OpenMM for Linux from
https://simtk.org/project/xml/downloads.xml?group_id=161, then double click the
.zip file to expand it. .zip file to expand it.
2. Make sure you have Python 2.6 or higher (earlier versions will not work) and 2. Make sure you have Python 2.6 or higher (earlier versions will not work) and
...@@ -223,7 +225,8 @@ platforms produce consistent results. ...@@ -223,7 +225,8 @@ platforms produce consistent results.
Installing on Windows Installing on Windows
********************* *********************
1. Download the pre-compiled binary of OpenMM for Windows, then double click the 1. Download the pre-compiled binary of OpenMM for Windows from
https://simtk.org/project/xml/downloads.xml?group_id=161, then double click the
.zip file to expand it. Move the files to :file:`C:\\Program Files\\OpenMM`. .zip file to expand it. Move the files to :file:`C:\\Program Files\\OpenMM`.
2. Make sure you have the 64-bit version of Python 3.3 or 3.4 (other versions will not 2. Make sure you have the 64-bit version of Python 3.3 or 3.4 (other versions will not
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment