Skip to content

Commit

Permalink
Merge 24c1675 into d617fd2
Browse files Browse the repository at this point in the history
  • Loading branch information
navidcy committed Jul 10, 2019
2 parents d617fd2 + 24c1675 commit 82f405a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
14 changes: 7 additions & 7 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
version = "0.8.10"

[[BinaryProvider]]
deps = ["Libdl", "SHA"]
deps = ["Libdl", "Logging", "SHA"]
git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648"
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
version = "0.5.4"
version = "0.5.6"

[[CSTParser]]
deps = ["Tokenize"]
Expand Down Expand Up @@ -70,10 +70,10 @@ uuid = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
version = "0.9.2"

[[DataStructures]]
deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"]
git-tree-sha1 = "ca971f03e146cf144a9e2f2ce59674f5bf0e8038"
deps = ["InteractiveUtils", "OrderedCollections"]
git-tree-sha1 = "0809951a1774dc724da22d26e4289bbaab77809a"
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
version = "0.15.0"
version = "0.17.0"

[[Dates]]
deps = ["Printf"]
Expand Down Expand Up @@ -112,9 +112,9 @@ version = "0.3.0"

[[HTTP]]
deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
git-tree-sha1 = "854fad2a2b9cc6678f70ed15a65fc7e572056d39"
git-tree-sha1 = "03ddc88af7f2d963fac5aa9f3ac8e11914d68a78"
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
version = "0.8.2"
version = "0.8.4"

[[IniFile]]
deps = ["Test"]
Expand Down
5 changes: 3 additions & 2 deletions examples/twodturb_mcwilliams1984.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using FourierFlows, PyPlot, JLD2, Printf, Random
using FourierFlows, PyPlot, JLD2, Printf, Random, FFTW

using Random: seed!

Expand Down Expand Up @@ -80,7 +80,8 @@ plot_output(prob, fig, axs; drawcolorbar=true)
startwalltime = time()
while cl.step < nsteps
stepforward!(prob, diags, nsubs)

saveoutput(out)

# Message
log = @sprintf("step: %04d, t: %d, ΔE: %.4f, ΔZ: %.4f, τ: %.2f min",
cl.step, cl.t, E.data[E.i]/E.data[1], Z.data[Z.i]/Z.data[1], (time()-startwalltime)/60)
Expand Down

0 comments on commit 82f405a

Please sign in to comment.