Skip to content

Commit 395760d

Browse files
authored
update docs: pyro.py -> pyro_sim.py (#118)
1 parent 8da816a commit 395760d

12 files changed

+57
-54
lines changed

docs/source/advection_basics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ disagreement is our numerical error. This is run as:
120120

121121
.. code-block:: none
122122
123-
./pyro.py advection smooth inputs.smooth
123+
./pyro_sim.py advection smooth inputs.smooth
124124
125125
126126
.. raw:: html

docs/source/compressible_basics.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ Because it is one-dimensional, we run it in narrow domains in the x- or y-direct
102102

103103
.. code-block:: none
104104
105-
./pyro.py compressible sod inputs.sod.x
106-
./pyro.py compressible sod inputs.sod.y
105+
./pyro_sim.py compressible sod inputs.sod.x
106+
./pyro_sim.py compressible sod inputs.sod.y
107107
108108
A simple script, ``sod_compare.py`` in ``analysis/`` will read a pyro output
109109
file and plot the solution over the exact Sod solution. Below we see
@@ -128,7 +128,7 @@ is run as:
128128

129129
.. code-block:: none
130130
131-
./pyro.py compressible sedov inputs.sedov
131+
./pyro_sim.py compressible sedov inputs.sedov
132132
133133
The video below shows the output from a 128 x 128 grid with the energy
134134
put in a radius of 0.0125 surrounding the center of the domain. A
@@ -165,7 +165,7 @@ online by Pawel Artymowicz). It is run as:
165165

166166
.. code-block:: none
167167
168-
./pyro.py compressible quad inputs.quad
168+
./pyro_sim.py compressible quad inputs.quad
169169
170170
.. image:: quad.png
171171
:align: center
@@ -181,7 +181,7 @@ escape the domain. It is run as:
181181

182182
.. code-block:: none
183183
184-
./pyro.py compressible rt inputs.rt
184+
./pyro_sim.py compressible rt inputs.rt
185185
186186
.. raw:: html
187187

@@ -199,7 +199,7 @@ watches it buoyantly rise and roll up. This is run as:
199199

200200
.. code-block:: none
201201
202-
./pyro.py compressible bubble inputs.bubble
202+
./pyro_sim.py compressible bubble inputs.bubble
203203
204204
205205
.. image:: bubble.png

docs/source/compressible_compare.rst

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ The image below shows the KH problem initialized with McNally's test. It ran on
1212

1313
.. code-block:: none
1414
15-
./pyro.py compressible kh inputs.kh kh.vbulk=0
16-
./pyro.py compressible_rk kh inputs.kh kh.vbulk=0
17-
./pyro.py compressible_fv4 kh inputs.kh kh.vbulk=0
18-
./pyro.py compressible_sdc kh inputs.kh kh.vbulk=0
15+
./pyro_sim.py compressible kh inputs.kh kh.vbulk=0
16+
./pyro_sim.py compressible_rk kh inputs.kh kh.vbulk=0
17+
./pyro_sim.py compressible_fv4 kh inputs.kh kh.vbulk=0
18+
./pyro_sim.py compressible_sdc kh inputs.kh kh.vbulk=0
1919
2020
.. image:: ./solver_comparisons/kh.png
2121
:align: center
@@ -30,10 +30,10 @@ The Sedov problem ran on a 128 x 128 grid, with gamma = 1.4, and until t = 0.1,
3030

3131
.. code-block:: none
3232
33-
./pyro.py compressible sedov inputs.sedov
34-
./pyro.py compressible_rk sedov inputs.sedov
35-
./pyro.py compressible_fv4 sedov inputs.sedov
36-
./pyro.py compressible_sdc sedov inputs.sedov
33+
./pyro_sim.py compressible sedov inputs.sedov
34+
./pyro_sim.py compressible_rk sedov inputs.sedov
35+
./pyro_sim.py compressible_fv4 sedov inputs.sedov
36+
./pyro_sim.py compressible_sdc sedov inputs.sedov
3737
3838
.. image:: ./solver_comparisons/sedov.png
3939
:align: center
@@ -53,10 +53,10 @@ The quad problem ran on a 256 x 256 grid until t = 0.8, which can be run as:
5353

5454
.. code-block:: none
5555
56-
./pyro.py compressible quad inputs.quad
57-
./pyro.py compressible_rk quad inputs.quad
58-
./pyro.py compressible_fv4 quad inputs.quad
59-
./pyro.py compressible_sdc quad inputs.quad
56+
./pyro_sim.py compressible quad inputs.quad
57+
./pyro_sim.py compressible_rk quad inputs.quad
58+
./pyro_sim.py compressible_fv4 quad inputs.quad
59+
./pyro_sim.py compressible_sdc quad inputs.quad
6060
6161
.. image:: ./solver_comparisons/quad.png
6262
:align: center
@@ -77,10 +77,10 @@ The bubble problem ran on a 128 x 256 grid until t = 3.0, which can be run as:
7777

7878
.. code-block:: none
7979
80-
./pyro.py compressible bubble inputs.bubble
81-
./pyro.py compressible_rk bubble inputs.bubble
82-
./pyro.py compressible_fv4 bubble inputs.bubble
83-
./pyro.py compressible_sdc bubble inputs.bubble
80+
./pyro_sim.py compressible bubble inputs.bubble
81+
./pyro_sim.py compressible_rk bubble inputs.bubble
82+
./pyro_sim.py compressible_fv4 bubble inputs.bubble
83+
./pyro_sim.py compressible_sdc bubble inputs.bubble
8484
8585
.. image:: ./solver_comparisons/bubble.png
8686
:align: center
@@ -101,10 +101,10 @@ The Rayleigh-Taylor problem ran on a 64 x 192 grid until t = 3.0, which can be r
101101

102102
.. code-block:: none
103103
104-
./pyro.py compressible rt inputs.rt
105-
./pyro.py compressible_rk rt inputs.rt
106-
./pyro.py compressible_fv4 rt inputs.rt
107-
./pyro.py compressible_sdc rt inputs.rt
104+
./pyro_sim.py compressible rt inputs.rt
105+
./pyro_sim.py compressible_rk rt inputs.rt
106+
./pyro_sim.py compressible_fv4 rt inputs.rt
107+
./pyro_sim.py compressible_sdc rt inputs.rt
108108
109109
.. image:: ./solver_comparisons/rt.png
110110
:align: center

docs/source/design.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ top-level ``pyro2/`` directory.
3030
The overall structure is:
3131

3232
* ``pyro2/``: This is the top-level directory. The main driver,
33-
``pyro.py``, is here, and all pyro simulations should be run from
33+
``pyro_sim.py``, is here, and all pyro simulations should be run from
3434
this directory.
3535

3636
* ``advection/``: The linear advection equation solver using the CTU
@@ -148,7 +148,7 @@ simulation.
148148
Main driver
149149
-----------
150150

151-
All the solvers use the same driver, the main ``pyro.py`` script. The
151+
All the solvers use the same driver, the main ``pyro_sim.py`` script. The
152152
flowchart for the driver is:
153153

154154
* parse runtime parameters

docs/source/diffusion_basics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ compare our solver to the analytic solution. This is run as:
2929

3030
.. code-block:: none
3131
32-
./pyro.py diffusion gaussian inputs.gaussian
32+
./pyro_sim.py diffusion gaussian inputs.gaussian
3333
3434
.. image:: gauss_diffusion.png
3535
:align: center

docs/source/incompressible_basics.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ number of papers, for example, Bell, Colella, & Glaz (1989) and Martin
3434

3535
.. code-block:: none
3636
37-
./pyro.py incompressible shear inputs.shear
37+
./pyro_sim.py incompressible shear inputs.shear
3838
3939
4040
.. image:: shear.png
@@ -57,9 +57,9 @@ shown below are run as:
5757

5858
.. code-block:: none
5959
60-
./pyro.py incompressible converge inputs.converge.32 vis.dovis=0
61-
./pyro.py incompressible converge inputs.converge.64 vis.dovis=0
62-
./pyro.py incompressible converge inputs.converge.128 vis.dovis=0
60+
./pyro_sim.py incompressible converge inputs.converge.32 vis.dovis=0
61+
./pyro_sim.py incompressible converge inputs.converge.64 vis.dovis=0
62+
./pyro_sim.py incompressible converge inputs.converge.128 vis.dovis=0
6363
6464
The error is measured by comparing with the analytic solution using
6565
the routine ``incomp_converge_error.py`` in ``analysis/``.

docs/source/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following steps are needed before running pyro:
2222
* add ``pyro/`` to your ``PYTHONPATH`` environment variable (note this
2323
is only needed if you wish to use pyro as a python module - this
2424
step is not necessary if you only run pyro via the commandline using
25-
the ``pyro.py`` script). For the bash shell, this is done as:
25+
the ``pyro_sim.py`` script). For the bash shell, this is done as:
2626

2727
.. code-block:: none
2828
@@ -42,7 +42,7 @@ Run the advection solver to quickly test if things are setup correctly:
4242

4343
.. code-block:: none
4444
45-
./pyro.py advection smooth inputs.smooth
45+
./pyro_sim.py advection smooth inputs.smooth
4646
4747
You should see a plot window pop up with a smooth pulse advecting
4848
diagonally through the periodic domain.

docs/source/lowmach_basics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ rises. This is run as:
3333

3434
.. code-block:: none
3535
36-
./pyro.py lm_atm bubble inputs.bubble
36+
./pyro_sim.py lm_atm bubble inputs.bubble
3737

docs/source/multigrid_basics.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ There are three solvers:
2525
We simply use V-cycles in our implementation, and restrict ourselves
2626
to square grids with zoning a power of 2.
2727

28-
The multigrid solver is not controlled through pyro.py since there is no time-dependence in pure elliptic problems. Instead, there are a few scripts in the multigrid/ subdirectory that demonstrate its use.
28+
The multigrid solver is not controlled through ``pyro_sim.py`` since
29+
there is no time-dependence in pure elliptic problems. Instead, there
30+
are a few scripts in the multigrid/ subdirectory that demonstrate its
31+
use.
2932

3033
Examples
3134
--------

docs/source/running.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Running
22
=======
33

4-
Pyro can be run in two ways: either from the commandline, using the ``pyro.py``
4+
Pyro can be run in two ways: either from the commandline, using the ``pyro_sim.py``
55
script and passing in the solver, problem and inputs as arguments, or by using
6-
the :func:`Pyro <pyro.Pyro>` class.
6+
the :func:`Pyro <pyro_sim.pyro>` class.
77

88
Commandline
99
------------
1010

11-
The ``pyro.py`` script takes 3
11+
The ``pyro_sim.py`` script takes 3
1212
arguments: the solver name, the problem setup to run with that solver
1313
(this is defined in the solver's ``problems/`` sub-directory), and the
1414
inputs file (again, usually from the solver's ``problems/``
@@ -18,7 +18,7 @@ For example, to run the Sedov problem with the compressible solver we would do:
1818

1919
.. code-block:: none
2020
21-
./pyro.py compressible sedov inputs.sedov
21+
./pyro_sim.py compressible sedov inputs.sedov
2222
2323
This knows to look for ``inputs.sedov`` in ``compressible/problems/``
2424
(alternately, you can specify the full path for the inputs file).
@@ -27,15 +27,15 @@ To run the smooth Gaussian advection problem with the advection solver, we would
2727

2828
.. code-block:: none
2929
30-
./pyro.py advection smooth inputs.smooth
30+
./pyro_sim.py advection smooth inputs.smooth
3131
3232
Any runtime parameter can also be specified on the command line, after
3333
the inputs file. For example, to disable runtime visualization for the
3434
above run, we could do:
3535

3636
.. code-block:: none
3737
38-
./pyro.py advection smooth inputs.smooth vis.dovis=0
38+
./pyro_sim.py advection smooth inputs.smooth vis.dovis=0
3939
4040
4141
.. note::
@@ -49,12 +49,12 @@ above run, we could do:
4949
Pyro class
5050
----------
5151

52-
Alternatively, pyro can be run using the :func:`Pyro <pyro.Pyro>` class. This provides
52+
Alternatively, pyro can be run using the :func:`Pyro <pyro_sim.pyro>` class. This provides
5353
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

57-
* create a :func:`Pyro <pyro.Pyro>` object, initializing it with a specific solver
57+
* create a :func:`Pyro <pyro_sim.pyro>` object, initializing it with a specific solver
5858
* initialize the problem, passing in runtime parameters and inputs
5959
* run the simulation
6060

@@ -71,7 +71,7 @@ Kelvin-Helmholtz problem ``kh``, we would do the following:
7171
7272
Instead of using an inputs file to define the problem parameters, we can define a
7373
dictionary of parameters and pass them into the :func:`initialize_problem
74-
<pyro.Pyro.initialize_problem>` function using the keyword argument ``inputs_dict``.
74+
<pyro_sim.pyro.initialize_problem>` function using the keyword argument ``inputs_dict``.
7575
If an inputs file is also passed into the function, the parameters in the dictionary
7676
will override any parameters in the file. For example, if we wished to turn off
7777
visualization for the previous example, we would do:
@@ -84,8 +84,8 @@ visualization for the previous example, we would do:
8484
inputs_dict=parameters)
8585
8686
It's possible to evolve the simulation forward timestep by timestep manually using
87-
the :func:`single_step <pyro.Pyro.single_step>` function (rather than allowing
88-
:func:`run_sim <pyro.Pyro.run_sim>` to do this for us). To evolve our example
87+
the :func:`single_step <pyro_sim.pyro.single_step>` function (rather than allowing
88+
:func:`run_sim <pyro_sim.pyro.run_sim>` to do this for us). To evolve our example
8989
simulation forward by a single step, we'd run
9090

9191
.. code-block:: python

0 commit comments

Comments
 (0)