Unverified Commit 6443fa26 authored by Johannes Blaschke's avatar Johannes Blaschke Committed by GitHub
Browse files

Merge branch 'master' into mwm/refactor

parents dddbdd13 09532ff9

.travis.yml

+1 −5
Changes for .travis.yml: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -6,11 +6,7 @@ python: 
  - 3.6



install:

  - pip install --user sphinx  # sphinx_rtd_theme

    # pypi's sphinx_rtd_theme is outdated. Internet recommends using current

    # master. Note: at some point, it will be OK to add `sphinx_rtd_theme` to

    # the `pip install` above => remove line below:

  - python -m pip install --user https://github.com/rtfd/sphinx_rtd_theme/archive/master.zip -U

  - python -m pip install --user sphinx sphinx-rtd-theme



script: bash ./build_and_deploy.sh

docs/source/BuildingCMake.rst

+11 −6
Changes for docs/source/BuildingCMake.rst: 11 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -148,14 +148,19 @@ Next, configure, build and install AMReX as follows: 


.. code:: shell



    > cmake AMREX_CONFIG_OPTIONS -DENABLE_PARTICLES=1 -DENABLE_AMRDATA=1 -DENABLE_EB=1 -DCMAKE_INSTALL_PREFIX:PATH=/absolute/path/to/installdir .

    > cmake . AMREX_CONFIG_OPTIONS \

          -DENABLE_PARTICLES=1 \

          -DENABLE_AMRDATA=1 \

          -DENABLE_EB=1 \

          -DENABLE_3D_NODAL_MLMG=1 \

          -DCMAKE_INSTALL_PREFIX:PATH=/absolute/path/to/installdir



    > make install



Here,\ ``AMREX_CONFIG_OPTIONS`` are optional configure options for

AMReX. Please refer to the AMReX user guide for a list of all the

possible configuration options. The only options required are

**-DENABLE\_PARTICLES=1**, **-DENABLE\_AMRDATA=1**, and

**-DENABLE\_EB=1**.

Here,\ ``AMREX_CONFIG_OPTIONS`` are optional configure options for AMReX. Please

refer to the AMReX user guide for a list of all the possible configuration

options. The only options required are **-DENABLE\_PARTICLES=1**,

**-DENABLE\_AMRDATA=1**, **-DENABLE\_EB=1**, and **-DENABLE_3D_NODAL_MLMG=1**.



Building MFiX-Exa

~~~~~~~~~~~~~~~~~