Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
1 merge request!2Build both Doxygen and Sphinx in the Makefile
...@@ -6,11 +6,7 @@ python: ...@@ -6,11 +6,7 @@ python:
- 3.6 - 3.6
install: install:
- pip install --user sphinx # sphinx_rtd_theme - python -m 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
script: bash ./build_and_deploy.sh script: bash ./build_and_deploy.sh
......
...@@ -148,14 +148,19 @@ Next, configure, build and install AMReX as follows: ...@@ -148,14 +148,19 @@ Next, configure, build and install AMReX as follows:
.. code:: shell .. 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 > make install
Here,\ ``AMREX_CONFIG_OPTIONS`` are optional configure options for Here,\ ``AMREX_CONFIG_OPTIONS`` are optional configure options for AMReX. Please
AMReX. Please refer to the AMReX user guide for a list of all the refer to the AMReX user guide for a list of all the possible configuration
possible configuration options. The only options required are options. The only options required are **-DENABLE\_PARTICLES=1**,
**-DENABLE\_PARTICLES=1**, **-DENABLE\_AMRDATA=1**, and **-DENABLE\_AMRDATA=1**, **-DENABLE\_EB=1**, and **-DENABLE_3D_NODAL_MLMG=1**.
**-DENABLE\_EB=1**.
Building MFiX-Exa Building MFiX-Exa
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment