Skip to content

Commit b70e1ee

Browse files
authored
Merge pull request #58 from FourierFlows/UpdatesDocs
Updates docs
2 parents 1ab6b09 + c8c47dd commit b70e1ee

File tree

5 files changed

+36
-18
lines changed

5 files changed

+36
-18
lines changed

docs/make.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ makedocs(modules=[FourierFlows],
77
"Home" => "index.md",
88
"Modules" => Any[
99
"modules/twodturb.md",
10-
"modules/barotropicqg.md"
10+
"modules/barotropicqg.md",
11+
"modules/kuramotosivashinsky.md",
12+
"modules/traceradvdiff.md"
1113
],
1214
"DocStrings" => Any[
1315
"man/docstrings.md"

docs/src/index.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,17 @@ Here's an overview of the code structure:
6666
- `barotropicqg.jl`: Defines a `BarotropicQG` module that provides
6767
several solvers for the barotropic QG model that permit beta,
6868
topography, beta + topography, and forcing.
69-
- `twomodeboussinesq.jl`: Defines a `TwoModeBoussinesq` module
70-
that provides solvers for a two-mode truncation of the
71-
rotating, stratified Boussinesq equation.
69+
- `kuramotosivashinsky.jl`: Defines a `KuramotoSivashinsky` module that
70+
solves the Kuramoto-Sivashinsky.
7271
- `traceradvdiff.jl`: Defines a `TracerAdvDiff` module that
7372
provides a solver for a two-dimensional and periodic tracer
7473
field in a given 2D flow (u, w), which can be an arbitrary
7574
function of x, z, and t.
76-
- `tracerpatcheqn.jl`: ...
77-
7875

7976
## Writing fast solvers
8077

8178
The performance-intensive part of the code involves just two functions: the
82-
timestepping scheme `stepforward!`, and the function `calcN!` that
79+
time-stepping scheme `stepforward!`, and the function `calcN!` that
8380
calculates the nonlinear part of the given equation's right-hand side.
8481
Optimization of these two functions for a given problem will produce the
8582
fastest possible code.
@@ -91,11 +88,11 @@ fastest possible code.
9188

9289
> McWilliams, J. C. (1984). The emergence of isolated coherent vortices in turbulent flow. *J. Fluid Mech.*, **146**, 21-43
9390
94-
- `examples/barotropicqg/decayingbetaturb.jl`: An example script that simulates decaying quasi-geostrophic flow on a beta-plane.
91+
- `examples/barotropicqg/decayingbetaturb.jl`: An example script that simulates decaying quasi-geostrophic flow on a beta-plane demonstrating zonation.
9592

9693
- `examples/barotropicqg/ACConelayer.jl`: A script that simulates barotropic quasi-geostrophic flow above topography reproducing the results of the paper by
9794

98-
> Constantinou, N. C. (2018). A barotropic model of eddy saturation. *J. Phys. Oceanogr.*, in press, doi:10.1175/JPO-D-17-0182.1
95+
> Constantinou, N. C. (2018). A barotropic model of eddy saturation. *J. Phys. Oceanogr.*, **48 (2)**, 397-411
9996
10097

10198

@@ -105,6 +102,8 @@ fastest possible code.
105102
Pages = [
106103
"modules/twodturb.md",
107104
"modules/barotropicqg.md"
105+
"modules/kuramotosivashinsky.md"
106+
"modules/traceradvdiff.md"
108107
]
109108
Depth = 1
110109
```
@@ -141,7 +140,9 @@ Depth = 2
141140
```@index
142141
Pages = [
143142
"modules/twodturb.md",
144-
"modules/barotropicqg.md",
143+
"modules/barotropicqg.md"
144+
"modules/kuramotosivashinsky.md"
145+
"modules/traceradvdiff.md"
145146
"man/docstrings.md",
146147
]
147148
```

docs/src/modules/barotropicqg.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# BarotropicQG Modules
1+
# BarotropicQG Module
22

33
This module solves the quasi-geostrophic barotropic vorticity equation on a
44
beta-plane of variable fluid depth $H-h(x,y)$. The flow is obtained through a
5-
streamfunction $\psi$ as $(u,\upsilon) = (-\partial_y\psi, \partial_x\psi)$. All flow
5+
streamfunction $\psi$ as $(u, \upsilon) = (-\partial_y\psi, \partial_x\psi)$. All flow
66
fields can be obtained from the quasi-geostrophic potential vorticity (QGPV).
77
Here the QGPV is
88

@@ -11,7 +11,7 @@ $$\underbrace{f_0 + \beta y}_{\text{planetary PV}} + \underbrace{(\partial_x \up
1111
\underbrace{\frac{f_0 h}{H}}_{\text{topographic PV}}.$$
1212

1313
The dynamical variable is the component of the vorticity of the flow normal to
14-
the plane of motion, $\zeta\equiv \partial_x v- \partial_y u = \nabla^2\psi$.
14+
the plane of motion, $\zeta\equiv \partial_x \upsilon- \partial_y u = \nabla^2\psi$.
1515
Also, we denote the topographic PV with $\eta\equiv f_0 h/H$. Thus, the
1616
equation solved by the module is:
1717

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Kuramoto-Sivashinsky Module
2+
3+
This module solves the Kuramoto-Sivashinsky equation for $u(x,t)$:
4+
5+
$$\partial_t u + \partial_x^4 u + \partial_x^2 u + u\partial_x u = 0\ .$$
6+
7+
The equation is time-stepped forward in Fourier space:
8+
9+
$$\partial_t \widehat{u} + k_x^4 \widehat{u} - k_x^2 \widehat{u} + \widehat{ u\partial_x u } = 0\ .$$
10+
11+
Thus:
12+
13+
$$\mathcal{L} = k_x^2 - k_x^4\ ,$$
14+
$$\mathcal{N}(\widehat{u}) = - \mathrm{FFT}(u \partial_x u)\ .$$
15+
16+
The function `calcN!` implements dealiasing to avoid energy piling up at the grid-scale.

docs/src/modules/traceradvdiff.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# TracerAdvDiff
1+
# TracerAdvDiff Module
22

33
This module solves the advection diffusion equation for a passive tracer
4-
concentration `c` in two-dimensions:
4+
concentration $c(x,y,t)$ in two-dimensions:
55

6-
$$c_t + \mathbf{u} \cdot \nabla c = \kappa \nabla^2 c$$ ,
6+
$$\partial_t c + \boldsymbol{u} \boldsymbol{\cdot} \boldsymbol{\nabla} c = \kappa \nabla^2 c\ ,$$
77

8-
where $\mathbf{u} = (u,v)$ is the two-dimensional advecting velocity and $\kappa$
9-
is the diffusivity.
8+
where $\boldsymbol{u} = (u,\upsilon)$ is the two-dimensional advecting velocity and $\kappa$ is the diffusivity.

0 commit comments

Comments
 (0)