Skip to content
Snippets Groups Projects
Commit 8de62490 authored by Mads M. Pedersen's avatar Mads M. Pedersen
Browse files

Merge branch 'ref_conf_repo' into 'master'

Changing instructions to point to other repo

See merge request !47
parents 40d4146a 5e53bfc0
No related branches found
No related tags found
1 merge request!94Handle disabled mpi
...@@ -7,21 +7,21 @@ Installation ...@@ -7,21 +7,21 @@ Installation
There are three ways to use TOPFARM: There are three ways to use TOPFARM:
1. **Lightweight demo** 1. **Lightweight demo**
(`jump to install <file:///C:/Users/rink/Documents/git/topfarm/TopFarm2/docs/build/html/user_guide/installation.html#lightweight-demo>`__) (jump to install: `1. Lightweight Demo`_)
A small, light version of TOPFARM that is the easiest to install but is not A small, light version of TOPFARM that is the easiest to install but is not
appropriate for large problems. It utilizes a Docker image that comes with appropriate for large problems. It utilizes a Docker image that comes with
TOPFARM pre-installed in the image. TOPFARM pre-installed in the image.
2. **Normal installation** 2. **Normal installation**
(`jump to install <file:///C:/Users/rink/Documents/git/topfarm/TopFarm2/docs/build/html/user_guide/installation.html#normal-installation>`__) (jump to install: `2. Normal Installation`_)
The standard version for non-developers running larger problems. The The standard version for non-developers running larger problems. The
installation is done using Anaconda and requires a correctly configured installation is done using Anaconda and requires a correctly configured
gfortran compiler. gfortran compiler.
3. **Developer installation** 3. **Developer installation**
(`jump to install <file:///C:/Users/rink/Documents/git/topfarm/TopFarm2/docs/build/html/user_guide/installation.html#developer-installation>`__) (jump to install: `3. Developer Installation`_)
For people that want to implement new functionalities or fix bugs. It For people that want to implement new functionalities or fix bugs. It
follows a similar installation procedure as the normal installation, except follows a similar installation procedure as the normal installation, except
...@@ -53,13 +53,14 @@ Windows 7 ...@@ -53,13 +53,14 @@ Windows 7
This option will install TOPFARM using Anaconda. If you have a Windows This option will install TOPFARM using Anaconda. If you have a Windows
machine, then you must first ensure that your machine is configured to work machine, then you must first ensure that your machine is configured to work
with Anaconda and a gfortran compiler (see instructions with Anaconda and a gfortran compiler (see instructions
`here <file:///C:/Users/rink/Documents/git/topfarm/TopFarm2/docs/build/html/user_guide/installation.html#configuring-windows-for-full-installation>`__). `here <https://python-at-risoe.pages.windenergy.dtu.dk/compiling-on-windows/configuration.html>`__).
Windows 7 Windows 7
^^^^^^^^^ ^^^^^^^^^
1. Make sure your machine is correctly configured for a full installation (see below) 1. Make sure your machine is correctly configured to work with ``f2py`` and ``cython``.
See intructions `here <https://python-at-risoe.pages.windenergy.dtu.dk/compiling-on-windows/configuration.html>`__.
2. Open your Anaconda prompt. 2. Open your Anaconda prompt.
3. Change to the location where you want the TOPFARM files to be stored 3. Change to the location where you want the TOPFARM files to be stored
:: ::
...@@ -90,8 +91,9 @@ Windows 7 ...@@ -90,8 +91,9 @@ Windows 7
This option will install an editable version of TOPFARM using Anaconda. If you This option will install an editable version of TOPFARM using Anaconda. If you
have a Windows machine, then you must first ensure that your machine is have a Windows machine, then you must first ensure that your machine is
configured to work with Anaconda and a gfortran compiler (see instructions configured to work with Anaconda, a gfortran compiler, and a C compiler.
`here <file:///C:/Users/rink/Documents/git/topfarm/TopFarm2/docs/build/html/user_guide/installation.html#configuring-windows-for-full-installation>`__). Detailed instructions can be found
`here <https://python-at-risoe.pages.windenergy.dtu.dk/compiling-on-windows/configuration.html>`__.
These instructions are more terse because we expect developers to be slightly These instructions are more terse because we expect developers to be slightly
more knowledgeable about tools such as ``git``, ``pip``, etc. more knowledgeable about tools such as ``git``, ``pip``, etc.
...@@ -99,8 +101,8 @@ more knowledgeable about tools such as ``git``, ``pip``, etc. ...@@ -99,8 +101,8 @@ more knowledgeable about tools such as ``git``, ``pip``, etc.
Windows 7 Windows 7
^^^^^^^^^ ^^^^^^^^^
1. Make sure your machine is correctly configured for a full installation 1. Make sure your machine is correctly configured for a full installation.
(see below) See intructions `here <https://python-at-risoe.pages.windenergy.dtu.dk/compiling-on-windows/configuration.html>`__.
2. Create an environment for TOPFARM and activate it 2. Create an environment for TOPFARM and activate it
3. Clone TOPFARM to your computer 3. Clone TOPFARM to your computer
4. Clone and install (using pip) the WindIO and FUSED-Wake libraries (URLs can 4. Clone and install (using pip) the WindIO and FUSED-Wake libraries (URLs can
...@@ -118,55 +120,3 @@ Windows 7 ...@@ -118,55 +120,3 @@ Windows 7
pip install -e . pip install -e .
6. Run the mini-example 6. Run the mini-example
Configuring Windows for Full Installation
-----------------------------------------
In order for TOPFARM to work on a Windows machine, that machine should be
configured to have Anaconda with a correctly linked gfortran compiler.
The first step is to install `Anaconda <https://www.anaconda.com/download/>`_
for Python 3.6.
The second (and more complicated) step is to install a gfortran compiler
and configure it to work with Anaconda.
Windows 7
^^^^^^^^^
There are two options: an Intel Fortran compiler or the open-source MinGW-64.
* Install Intel Fortran compiler and activate it by entering the following
command into a command prompt:
::
"C:\\Program Files (x86)\\Intel\\Composer XE\\bin\\ifortvars.bat" intel64
* MinGW (instructions derived from `here <https://www.scivision.co/f2py-running-fortran-code-in-python-on-windows/>`__)
1. Install MinGW-w64 from `Source Forge <https://sourceforge.net/projects/mingw-w64/>`_
with the following options:
* Architecture: ``x86_64``
* Threads: ``posix``
* Exception: ``seh``
* Build revision: ``0``
* Destination folder: ``c:\mingw``
2. Add MinGW bin folder (``C:\mingw\mingw64\bin``) to your path variable
3. Verify you can use gcc by typing ``gcc`` into a new Anaconda prompt and
checking that there is a fatal error of ``no input files``
4. If you do not have a file called ``distutils.cfg`` in one of the following
locations, create it:
1. ``c:\Anaconda\Lib\distutils\distutils.cfg`` **or**
2. ``<user_folder>\AppData\Local\Continuum\Miniconda3\Lib\distutils\distutils.cfg``
5. Add text to the config file or modify the existing file to have the
following contents:
::
[build]
compiler=mingw32
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment