Skip to content

Commit c2ceb40

Browse files
committed
cleaned up and added some missing information
1 parent 4b6153b commit c2ceb40

140 files changed

Lines changed: 4928 additions & 4339 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2)
1+
[![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2) [![Documentation Status](https://readthedocs.org/projects/pyro2/badge/?version=latest)](https://pyro2.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/python-hydro/pyro2/master?filepath=examples%2Fexamples.ipynb)
2+
23

34
![pyro logo](www/logo.gif)
45

@@ -19,7 +20,7 @@ https://github.com/python-hydro/pyro2
1920
The project webpage, where you'll find documentation, plots, notes,
2021
etc. is here:
2122

22-
http://python-hydro.github.io/pyro2/
23+
https://pyro2.readthedocs.io/
2324

2425

2526
## Table of Contents
@@ -42,18 +43,13 @@ http://python-hydro.github.io/pyro2/
4243
switch to python 3.x
4344

4445
- There are a few steps to take to get things running. You need to
45-
make sure you have `numpy`, `f2py`, `matplotlib`, and `h5py`
46+
make sure you have `numpy`, `numba`, `matplotlib`, and `h5py`
4647
installed. On a Fedora system, this can be accomplished by doing:
4748

48-
`dnf install python3-numpy python3-numpy-f2py python3-matplotlib python3-matplotlib-tk python3-h5py`
49+
`dnf install python3-numpy python3-numba python3-matplotlib python3-matplotlib-tk python3-h5py`
4950

5051
(note, for older Fedora releases, replace `dnf` with `yum`. For
51-
python 2.x, leave off the `2` in the package names.)
52-
53-
- You also need to make sure gfortran is present on you system. On a
54-
Fedora system, it can be installed as:
55-
56-
`dnf install gcc-gfortran`
52+
python 2.x, leave off the `3` in the package names.)
5753

5854
- Not all matplotlib backends allow for the interactive plotting as
5955
pyro is run. One that does is the TkAgg backend. This can be made
@@ -79,10 +75,6 @@ http://python-hydro.github.io/pyro2/
7975
* Define the environment variable `PYRO_HOME` to point to the
8076
`pyro2/` directory (only needed for regression testing)
8177

82-
* Build the Fortran source. In `pyro2/` type
83-
84-
`./mk.sh`
85-
8678
* Run a quick test of the advection solver:
8779

8880
`./pyro.py advection smooth inputs.smooth`
@@ -116,6 +108,8 @@ pyro provides the following solvers (all in 2-d):
116108
- `advection_fv4`: a fourth-order accurate finite-volume advection
117109
solver that uses RK4 time integration.
118110

111+
- `advection_nonuniform`: a solver for advection with a non-uniform velocity field.
112+
119113
- `advection_rk`: a second-order unsplit solver for linear advection
120114
that uses Runge-Kutta integration instead of characteristic
121115
tracing.
@@ -136,13 +130,16 @@ pyro provides the following solvers (all in 2-d):
136130
equations that uses Runge-Kutta integration instead of
137131
characteristic tracing.
138132

139-
- `incompressible`: a second-order cell-centered approximate
140-
projection method for the incompressible equations of
141-
hydrodynamics.
133+
- `compressible_sdc`: a fourth-order compressible solver,
134+
using spectral-deferred correction (SDC) for the time integration.
142135

143136
- `diffusion`: a Crank-Nicolson time-discretized solver for the
144137
constant-coefficient diffusion equation.
145138

139+
- `incompressible`: a second-order cell-centered approximate
140+
projection method for the incompressible equations of
141+
hydrodynamics.
142+
146143
- `lm_atm`: a solver for the equations of low Mach number
147144
hydrodynamics for atmospheric flows.
148145

@@ -154,6 +151,8 @@ pyro provides the following solvers (all in 2-d):
154151
variable-coefficient Poisson equation (which inherits from the
155152
constant-coefficient solver).
156153

154+
- `particles`: a solver for Lagrangian tracer particles.
155+
157156
- `swe`: a solver for the shallow water equations.
158157

159158

advection/advective_fluxes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
def unsplit_fluxes(my_data, rp, dt, scalar_name):
5-
"""
5+
r"""
66
Construct the fluxes through the interfaces for the linear advection
77
equation:
88
@@ -63,9 +63,9 @@ def unsplit_fluxes(my_data, rp, dt, scalar_name):
6363
cx = u*dt/myg.dx
6464
cy = v*dt/myg.dy
6565

66-
#--------------------------------------------------------------------------
66+
# --------------------------------------------------------------------------
6767
# monotonized central differences
68-
#--------------------------------------------------------------------------
68+
# --------------------------------------------------------------------------
6969

7070
limiter = rp.get_param("advection.limiter")
7171

advection/tests/smooth_0040.h5

5.86 KB
Binary file not shown.

advection_fv4/_defaults

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ v = 1.0 ; advective velocity in y-direction
88

99
limiter = 1 ; limiter (0 = none, 1 = ppm)
1010

11-
temporal_method = RK4 ; integration method (see mesh/integrators/.py)
11+
temporal_method = RK4 ; integration method (see mesh/integrators.py)
1212

1313

advection_fv4/fluxes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import advection_fv4.interface_f as interface_f
1+
import advection_fv4.interface as interface
22
import mesh.array_indexer as ai
33

44

55
def fluxes(my_data, rp, dt):
6-
"""Construct the fluxes through the interfaces for the linear advection
6+
r"""Construct the fluxes through the interfaces for the linear advection
77
equation:
88
99
.. math::
@@ -77,13 +77,13 @@ def fluxes(my_data, rp, dt):
7777
1./12.*(a.jp(-2, buf=1) + a.jp(1, buf=1))
7878

7979
else:
80-
a_l, a_r = interface_f.states(a, myg.qx, myg.qy, myg.ng, 1)
80+
a_l, a_r = interface.states(a, myg.ng, 1)
8181
if u > 0:
8282
a_x = ai.ArrayIndexer(d=a_l, grid=myg)
8383
else:
8484
a_x = ai.ArrayIndexer(d=a_r, grid=myg)
8585

86-
a_l, a_r = interface_f.states(a, myg.qx, myg.qy, myg.ng, 2)
86+
a_l, a_r = interface.states(a, myg.ng, 2)
8787
if v > 0:
8888
a_y = ai.ArrayIndexer(d=a_l, grid=myg)
8989
else:

0 commit comments

Comments
 (0)