Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removes LaTeXStrings #74

Merged
merged 4 commits into from
May 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
FourierFlows = "2aec4490-903f-5c70-9b11-9bed06a700e1"
GeophysicalFlows = "44ee3b1c-bc02-53fa-8355-8e347616e15e"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Expand Down
1 change: 0 additions & 1 deletion examples/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
FourierFlows = "2aec4490-903f-5c70-9b11-9bed06a700e1"
GeophysicalFlows = "44ee3b1c-bc02-53fa-8355-8e347616e15e"
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
Expand Down
4 changes: 2 additions & 2 deletions examples/twodnavierstokes_decaying.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# A simulations of decaying two-dimensional turbulence.

using FourierFlows, Printf, Random, Plots, LaTeXStrings
using FourierFlows, Printf, Random, Plots

using Random: seed!
using FFTW: rfft, irfft
Expand Down Expand Up @@ -179,7 +179,7 @@ nothing # hide
plot(kr, abs.(Ehr),
linewidth = 2,
alpha = 0.7,
xlabel = L"k_r", ylabel = L"\int \| \hat E \| k_r \mathrm{d} k_{\theta}",
xlabel = "kᵣ", ylabel = "∫ |Ê| kᵣ dk_θ",
xlims = (5e-1, gr.nx),
xscale = :log10, yscale = :log10,
title = "Radial energy spectrum",
Expand Down
35 changes: 13 additions & 22 deletions examples/twodnavierstokes_stochasticforcing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
# A simulation of forced-dissipative two-dimensional turbulence. We solve the
# two-dimensional vorticity equation with linear drag and stochastic excitation.

using
FourierFlows,
Printf,
Plots,
LaTeXStrings
using FourierFlows, Printf, Plots

using Random: seed!
using FFTW: irfft
Expand Down Expand Up @@ -97,10 +93,9 @@ heatmap(x, y, irfft(v.Fh, g.nx),
ylims = (-L/2, L/2),
xticks = -3:3,
yticks = -3:3,
xlabel = L"x",
ylabel = L"y",
xlabel = "x",
ylabel = "y",
title = "a forcing realization",
guidefontsize = 15,
framestyle = :box)


Expand Down Expand Up @@ -154,36 +149,32 @@ function computetendencies_and_makeplot(prob, diags)
ylims = (-L/2, L/2),
xticks = -3:3,
yticks = -3:3,
xlabel = L"x",
ylabel = L"y",
# title = L"\nabla^\psi(x, y, t="*@sprintf("%.2f", cl.t)*")",
guidefontsize = 15,
xlabel = "μt",
ylabel = "y",
title = "∇²ψ(x, y, t="*@sprintf("%.2f", cl.t)*")",
framestyle = :box)

p2 = plot(μ*t, [W[ii2] ε.+0*t -D[ii] -R[ii]],
label = ["work, W" "ensemble mean work, <W>" "dissipation, D" "drag, D=-2μE"],
linestyle = [:solid :dash :solid :solid],
linewidth = 2,
alpha = 0.8,
xlabel = L"\mu t",
ylabel = "energy sources and sinks",
guidefontsize = 15)
xlabel = "μt",
ylabel = "energy sources and sinks")

p3 = plot(μ*t, [dEdt_computed[ii], dEdt_numerical],
label = ["computed W-D" "numerical dE/dt"],
linestyle = [:solid :dash],
linewidth = [2 3],
linestyle = [:solid :dashdotdot],
linewidth = 2,
alpha = 0.8,
xlabel = L"\mu t",
ylabel = L"\mathrm{d}E/\mathrm{d}t",
guidefontsize = 15)
xlabel = "μt",
ylabel = "dE/dt")

p4 = plot(μ*t, residual,
label = "residual dE/dt = computed - numerical",
linewidth = 2,
alpha = 0.7,
xlabel = L"\mu t",
guidefontsize = 15)
xlabel = "μt")

p = plot(p1, p2, p3, p4, layout=l, size = (900, 800))
return p
Expand Down