Skip to content

Commit a111a1e

Browse files
committed
Minor fixes to docs formatting, added sdc to compressible solver comparisons
1 parent a6cbc87 commit a111a1e

8 files changed

Lines changed: 38 additions & 21 deletions

File tree

docs/source/compressible_basics.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ pyro has several compressible solvers:
2424
* :py:mod:`compressible_fv4` uses a 4th order accurate method with RK4
2525
time integration
2626

27-
* :py:mod:`compressible_sdc` uses fourth-order compressible solver,
28-
with spectral-deferred correction (SDC) for the time integration.
27+
* :py:mod:`compressible_sdc` uses a 4th order accurate method
28+
with spectral-deferred correction (SDC) for the time integration
2929

3030
The implementations here have flattening at shocks, artificial
3131
viscosity, a simple gamma-law equation of state, and (in some cases) a

docs/source/compressible_compare.rst

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ The image below shows the KH problem initialized with McNally's test. It ran on
1515
./pyro.py compressible kh inputs.kh kh.vbulk=0
1616
./pyro.py compressible_rk kh inputs.kh kh.vbulk=0
1717
./pyro.py compressible_fv4 kh inputs.kh kh.vbulk=0
18+
./pyro.py compressible_sdc kh inputs.kh kh.vbulk=0
1819
1920
.. image:: ./solver_comparisons/kh.png
2021
:align: center
21-
22+
2223

2324
We vary the velocity in the positive y-direction (vbulk) to see how effective the solvers are at preserving the initial shape.
2425

@@ -28,20 +29,24 @@ Sedov
2829
The Sedov problem ran on a 128 x 128 grid, with gamma = 1.4, and until t = 0.1, which can be run as:
2930

3031
.. code-block:: none
31-
32+
3233
./pyro.py compressible sedov inputs.sedov
3334
./pyro.py compressible_rk sedov inputs.sedov
3435
./pyro.py compressible_fv4 sedov inputs.sedov
36+
./pyro.py compressible_sdc sedov inputs.sedov
3537
3638
.. image:: ./solver_comparisons/sedov.png
3739
:align: center
38-
40+
3941
.. image:: ./solver_comparisons/sedov_rk.png
4042
:align: center
41-
43+
4244
.. image:: ./solver_comparisons/sedov_fv4.png
4345
:align: center
44-
46+
47+
.. image:: ./solver_comparisons/sedov_sdc.png
48+
:align: center
49+
4550
Quad
4651
^^^^
4752
The quad problem ran on a 256 x 256 grid until t = 0.8, which can be run as:
@@ -51,17 +56,21 @@ The quad problem ran on a 256 x 256 grid until t = 0.8, which can be run as:
5156
./pyro.py compressible quad inputs.quad
5257
./pyro.py compressible_rk quad inputs.quad
5358
./pyro.py compressible_fv4 quad inputs.quad
59+
./pyro.py compressible_sdc quad inputs.quad
5460
5561
.. image:: ./solver_comparisons/quad.png
5662
:align: center
57-
63+
5864
.. image:: ./solver_comparisons/quad_rk.png
5965
:align: center
6066

6167
.. image:: ./solver_comparisons/quad_fv4.png
6268
:align: center
63-
64-
69+
70+
.. image:: ./solver_comparisons/quad_sdc.png
71+
:align: center
72+
73+
6574
Bubble
6675
^^^^^^
6776
The bubble problem ran on a 128 x 256 grid until t = 3.0, which can be run as:
@@ -71,6 +80,7 @@ The bubble problem ran on a 128 x 256 grid until t = 3.0, which can be run as:
7180
./pyro.py compressible bubble inputs.bubble
7281
./pyro.py compressible_rk bubble inputs.bubble
7382
./pyro.py compressible_fv4 bubble inputs.bubble
83+
./pyro.py compressible_sdc bubble inputs.bubble
7484
7585
.. image:: ./solver_comparisons/bubble.png
7686
:align: center
@@ -81,6 +91,9 @@ The bubble problem ran on a 128 x 256 grid until t = 3.0, which can be run as:
8191
.. image:: ./solver_comparisons/bubble_fv4.png
8292
:align: center
8393

94+
.. image:: ./solver_comparisons/bubble_sdc.png
95+
:align: center
96+
8497

8598
Rayleigh-Taylor
8699
^^^^^^^^^^^^^^^
@@ -91,12 +104,16 @@ The Rayleigh-Taylor problem ran on a 64 x 192 grid until t = 3.0, which can be r
91104
./pyro.py compressible rt inputs.rt
92105
./pyro.py compressible_rk rt inputs.rt
93106
./pyro.py compressible_fv4 rt inputs.rt
107+
./pyro.py compressible_sdc rt inputs.rt
94108
95109
.. image:: ./solver_comparisons/rt.png
96110
:align: center
97111

98112
.. image:: ./solver_comparisons/rt_rk.png
99113
:align: center
100-
114+
101115
.. image:: ./solver_comparisons/rt_fv4.png
102116
:align: center
117+
118+
.. image:: ./solver_comparisons/rt_sdc.png
119+
:align: center

docs/source/design.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ The overall structure is:
4343
* ``advection_fv4/``: The fourth-order accurate finite-volume advection
4444
solver that uses RK4 time integration.
4545

46-
* ``problems/``: The problem setups for the fourth-order advection solver.
47-
* ``tests/``: Reference advection output files for comparison and regression testing.
46+
* ``problems/``: The problem setups for the fourth-order advection solver.
47+
* ``tests/``: Reference advection output files for comparison and regression testing.
4848

4949
* ``advection_nonuniform/``: The solver for advection with a non-uniform velocity field.
5050

51-
* ``problems/``: The problem setups for the non-uniform advection solver.
52-
* ``tests/``: Reference advection output files for comparison and regression testing.
51+
* ``problems/``: The problem setups for the non-uniform advection solver.
52+
* ``tests/``: Reference advection output files for comparison and regression testing.
5353

5454
* ``advection_rk/``: The linear advection equation solver using the
5555
method-of-lines approach.
@@ -65,8 +65,8 @@ The overall structure is:
6565
* ``analysis/``: Various analysis scripts for processing pyro output files.
6666

6767
* ``compressible/``: The fourth-order accurate finite-volume compressible
68-
hydro solver that uses RK4 time integration. This is built from the
69-
method of McCourquodale and Colella (2011).
68+
hydro solver that uses RK4 time integration. This is built from the
69+
method of McCourquodale and Colella (2011).
7070

7171
* ``problems/``: The problem setups for the fourth-order compressible hydrodynamics solver.
7272
* ``tests/``: Reference compressible hydro output for regression testing.
@@ -83,7 +83,7 @@ The overall structure is:
8383
* ``tests/``: Reference compressible hydro output for regression testing.
8484

8585
* ``compressible_sdc/``: The fourth-order compressible solver,
86-
using spectral-deferred correction (SDC) for the time integration.
86+
using spectral-deferred correction (SDC) for the time integration.
8787

8888
* ``problems/``: This is a symbolic link to the compressible/problems/ directory.
8989
* ``tests/``: Reference compressible hydro output for regression testing.

docs/source/running.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Pyro class
5050
----------
5151

5252
Alternatively, pyro can be run using the :func:`Pyro <pyro.Pyro>` class. This provides
53-
an interface that enables simulations to be set up and run in a Jupyter notebook - see
53+
an interface that enables simulations to be set up and run in a Jupyter notebook -- see
5454
``examples/examples.ipynb`` for an example notebook. A simulation can be set up and run
5555
by carrying out the following steps:
5656

@@ -72,8 +72,8 @@ Instead of using an inputs file to define the problem parameters, we can define
7272
dictionary of parameters and pass them into the :func:`initialize_problem
7373
<pyro.Pyro.initialize_problem>` function using the keyword argument ``inputs_dict``.
7474
If an inputs file is also passed into the function, the parameters in the dictionary
75-
will override any parameters in the file. For example, if we wished to turn off
76-
visualization for the previous example, we would do:
75+
will override any parameters in the file. For example, if we wished to turn off
76+
visualization for the previous example, we would do:
7777

7878
.. code-block:: python
7979
46.2 KB
Loading
-14.3 KB
Loading
56 KB
Loading
59.7 KB
Loading

0 commit comments

Comments
 (0)