From 086053242b666c77bdb1113be3c4671313b9147e Mon Sep 17 00:00:00 2001 From: "Navid C. Constantinou" Date: Sun, 11 Dec 2022 08:07:51 +1100 Subject: [PATCH 1/2] upgrade Makie --- Manifest.toml | 4 +- docs/Manifest.toml | 239 +++++++++++------- docs/Project.toml | 1 + examples/horizontal_convection.jl | 2 +- examples/internal_wave.jl | 2 +- examples/kelvin_helmholtz_instability.jl | 4 +- examples/ocean_wind_mixing_and_convection.jl | 2 +- examples/shallow_water_Bickley_jet.jl | 2 +- examples/tilted_bottom_boundary_layer.jl | 2 +- examples/two_dimensional_turbulence.jl | 2 +- .../visualize_barotropic_gyre.jl | 4 +- .../animate_face.jl | 4 +- .../animate_sphere.jl | 6 +- .../baroclinic_adjustment.jl | 2 +- .../mesoscale_turbulence/eddying_channel.jl | 2 +- .../zonally_averaged_channel.jl | 16 +- .../visualize_annual_cycle_solution.jl | 6 +- .../solid_body_rotation.jl | 2 +- .../solid_body_tracer_advection.jl | 2 +- 19 files changed, 179 insertions(+), 125 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 6750ac2634..1f6d2ea3b7 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.8.2" +julia_version = "1.8.3" manifest_format = "2.0" -project_hash = "f6464a834537dc16cda28b2f9dd3b7da0b24f89d" +project_hash = "be044408c2038dbf085bc45ca12c77f40fde80b0" [[deps.AMGX]] deps = ["AMGX_jll", "CEnum", "CUDA", "JSON", "Libdl", "SparseArrays"] diff --git a/docs/Manifest.toml b/docs/Manifest.toml index f504b02c35..9680b72fc0 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.8.2" +julia_version = "1.8.3" manifest_format = "2.0" project_hash = "fd075f93c522b6443a72519d2a725ec7e4e9ac0f" @@ -16,9 +16,9 @@ uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" version = "1.2.1" [[deps.AbstractTrees]] -git-tree-sha1 = "5c0b629df8a5566a06f5fef5100b53ea56e465a0" +git-tree-sha1 = "52b3b436f8f73133d7bc3a6c71ee7ed6ab2ab754" uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" -version = "0.4.2" +version = "0.4.3" [[deps.Adapt]] deps = ["LinearAlgebra"] @@ -51,6 +51,12 @@ git-tree-sha1 = "66771c8d21c8ff5e3a93379480a2307ac36863f7" uuid = "13072b0f-2c55-5437-9ae7-d433b7a33950" version = "1.0.1" +[[deps.AxisArrays]] +deps = ["Dates", "IntervalSets", "IterTools", "RangeArrays"] +git-tree-sha1 = "1dd4d9f5beebac0c03446918741b1a03dc5e5788" +uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" +version = "0.4.6" + [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -72,9 +78,9 @@ uuid = "f1be7e48-bf82-45af-a471-ae754a193061" version = "0.2.19" [[deps.BitFlags]] -git-tree-sha1 = "84259bb6172806304b9101094a7cc4bc6f56dbc6" +git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d" uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" -version = "0.1.5" +version = "0.1.7" [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -101,9 +107,9 @@ version = "1.0.5" [[deps.CairoMakie]] deps = ["Base64", "Cairo", "Colors", "FFTW", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "SHA", "SnoopPrecompile"] -git-tree-sha1 = "f53b586e9489163ece213144a5a6417742f0388e" +git-tree-sha1 = "a1889ac0cfd046d62404ac3e0a1cb718575ee017" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -version = "0.9.0" +version = "0.10.0" [[deps.Cairo_jll]] deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] @@ -142,10 +148,10 @@ uuid = "a2cac450-b92f-5266-8821-25eda20663c8" version = "0.4.0" [[deps.ColorSchemes]] -deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Random"] -git-tree-sha1 = "1fd869cc3875b57347f7027521f561cf46d1fcd8" +deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Random", "SnoopPrecompile"] +git-tree-sha1 = "aa3edc8f8dea6cbfa176ee12f7c2fc82f0608ed3" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.19.0" +version = "3.20.0" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] @@ -166,10 +172,10 @@ uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" version = "0.12.8" [[deps.Compat]] -deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "78bee250c6826e1cf805a88b7f1e86025275d208" +deps = ["Dates", "LinearAlgebra", "UUIDs"] +git-tree-sha1 = "00a2cccc7f098ff3b66806862d275ca3db9e6e5a" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.46.0" +version = "4.5.0" [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -182,15 +188,21 @@ git-tree-sha1 = "5879c1c39fea46fb9eb5b8c9323f08f9fb5c4de5" uuid = "a216cea6-0a8c-5945-ab87-5ade47210022" version = "0.5.1" +[[deps.ConstructionBase]] +deps = ["LinearAlgebra"] +git-tree-sha1 = "fb21ddd70a051d882a1686a5a550990bbe371a95" +uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" +version = "1.4.1" + [[deps.Contour]] git-tree-sha1 = "d05d9e7b7aedff4e5b51a029dced05cfb6125781" uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" version = "0.6.2" [[deps.DataAPI]] -git-tree-sha1 = "46d2680e618f8abd007bce0c3026cb0c4a8f2032" +git-tree-sha1 = "e08915633fcb3ea83bf9d6126292e5bc5c739922" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.12.0" +version = "1.13.0" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -207,10 +219,6 @@ version = "1.0.0" deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" -[[deps.DelimitedFiles]] -deps = ["Mmap"] -uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" - [[deps.DensityInterface]] deps = ["InverseFunctions", "Test"] git-tree-sha1 = "80c3e8639e3353e5d2912fb3a1916b8455e2494b" @@ -223,15 +231,15 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[deps.Distributions]] deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"] -git-tree-sha1 = "04db820ebcfc1e053bd8cbb8d8bccf0ff3ead3f7" +git-tree-sha1 = "a7756d098cbabec6b3ac44f369f74915e8cfd70a" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.76" +version = "0.25.79" [[deps.DocStringExtensions]] deps = ["LibGit2"] -git-tree-sha1 = "5158c2b41018c5f7eb1470d558127ac274eca0c9" +git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.9.1" +version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] @@ -313,9 +321,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[deps.FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] -git-tree-sha1 = "802bfc139833d2ba893dd9e62ba1767c88d708ae" +git-tree-sha1 = "9a0472ec2f5409db243160a8b030f94c380167a3" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.13.5" +version = "0.13.6" [[deps.FixedPointNumbers]] deps = ["Statistics"] @@ -359,6 +367,16 @@ git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91" uuid = "559328eb-81f9-559d-9380-de523a88c83c" version = "1.0.10+0" +[[deps.Future]] +deps = ["Random"] +uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" + +[[deps.GPUArraysCore]] +deps = ["Adapt"] +git-tree-sha1 = "6872f5ec8fd1a38880f027a26739d42dcda6691f" +uuid = "46192b85-c4d5-4398-a991-12ede77f4527" +version = "0.1.2" + [[deps.GeoInterface]] deps = ["Extents"] git-tree-sha1 = "fb28b5dc239d0174d7297310ef7b84a11804dfab" @@ -367,9 +385,9 @@ version = "1.0.1" [[deps.GeometryBasics]] deps = ["EarCut_jll", "GeoInterface", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] -git-tree-sha1 = "12a584db96f1d460421d5fb8860822971cdb8455" +git-tree-sha1 = "fe9aea4ed3ec6afdfbeb5a4f39a2208909b162a6" uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" -version = "0.4.4" +version = "0.4.5" [[deps.Gettext_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] @@ -419,9 +437,9 @@ version = "1.12.2+2" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "Dates", "IniFile", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "e8c58d5f03b9d9eb9ed7067a2f34c7c371ab130b" +git-tree-sha1 = "e1acc37ed078d99a714ed8376446f92a5535ca65" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.4.1" +version = "1.5.5" [[deps.HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -441,6 +459,18 @@ git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" version = "0.2.2" +[[deps.ImageAxes]] +deps = ["AxisArrays", "ImageBase", "ImageCore", "Reexport", "SimpleTraits"] +git-tree-sha1 = "c54b581a83008dc7f292e205f4c409ab5caa0f04" +uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac" +version = "0.6.10" + +[[deps.ImageBase]] +deps = ["ImageCore", "Reexport"] +git-tree-sha1 = "b51bb8cae22c66d0f6357e3bcb6363145ef20835" +uuid = "c817782e-172a-44cc-b673-b171935fbb9e" +version = "0.1.5" + [[deps.ImageCore]] deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] git-tree-sha1 = "acf614720ef026d38400b3817614c45882d75500" @@ -453,6 +483,12 @@ git-tree-sha1 = "342f789fd041a55166764c351da1710db97ce0e0" uuid = "82e4d734-157c-48bb-816b-45c225c6df19" version = "0.6.6" +[[deps.ImageMetadata]] +deps = ["AxisArrays", "ImageAxes", "ImageBase", "ImageCore"] +git-tree-sha1 = "36cbaebed194b292590cba2593da27b34763804a" +uuid = "bc367c6b-8a6b-528e-b4bd-a4b897500b49" +version = "0.9.8" + [[deps.Imath_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "87f7662e03a649cffa2e05bf19c303e168732d3e" @@ -476,9 +512,9 @@ version = "0.5.1" [[deps.InlineStrings]] deps = ["Parsers"] -git-tree-sha1 = "db619c421554e1e7e07491b85a8f4b96b3f04ca0" +git-tree-sha1 = "0cf92ec945125946352f3d46c96976ab972bde6f" uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" -version = "1.2.2" +version = "1.3.2" [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -492,15 +528,15 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[deps.Interpolations]] deps = ["Adapt", "AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "842dd89a6cb75e02e85fdd75c760cdc43f5d6863" +git-tree-sha1 = "721ec2cf720536ad005cb38f50dbba7b02419a15" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.14.6" +version = "0.14.7" [[deps.IntervalSets]] deps = ["Dates", "Random", "Statistics"] -git-tree-sha1 = "3f91cd3f56ea48d4d2a75c2a65455c5fc74fa347" +git-tree-sha1 = "16c0cc91853084cb5f58a78bd209513900206ce6" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.7.3" +version = "0.7.4" [[deps.InverseFunctions]] deps = ["Test"] @@ -667,18 +703,18 @@ version = "2.14.0" [[deps.LogExpFunctions]] deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"] -git-tree-sha1 = "94d9c52ca447e23eac0c0f074effbcd38830deb5" +git-tree-sha1 = "946607f84feb96220f480e0422d3484c49c00239" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.3.18" +version = "0.3.19" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[deps.LoggingExtras]] deps = ["Dates", "Logging"] -git-tree-sha1 = "5d4d2d9904227b8bd66386c1138cf4d5ffa826bf" +git-tree-sha1 = "cedb76b37bc5a6c702ade66be44f831fa23c681e" uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" -version = "0.4.9" +version = "1.0.0" [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] @@ -693,16 +729,16 @@ uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" version = "0.5.10" [[deps.Makie]] -deps = ["Animations", "Base64", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "InteractiveUtils", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MakieCore", "Markdown", "Match", "MathTeXEngine", "MiniQhull", "Observables", "OffsetArrays", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "RelocatableFolders", "Serialization", "Showoff", "SignedDistanceFields", "SnoopPrecompile", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun"] -git-tree-sha1 = "51e40869d076fbff25ab61d0aa3e198d80176c75" +deps = ["Animations", "Base64", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "InteractiveUtils", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MakieCore", "Markdown", "Match", "MathTeXEngine", "MiniQhull", "Observables", "OffsetArrays", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "RelocatableFolders", "Serialization", "Setfield", "Showoff", "SignedDistanceFields", "SnoopPrecompile", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun"] +git-tree-sha1 = "7154536d78dcde1c4321b50e0e8dda90995f1f6f" uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" -version = "0.18.0" +version = "0.19.0" [[deps.MakieCore]] deps = ["Observables"] -git-tree-sha1 = "b87650f61f85fc2d4fb5923a479dbf05ba65ae4d" +git-tree-sha1 = "5357b0696f7c245941389995e193c127190d45f8" uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b" -version = "0.5.0" +version = "0.6.0" [[deps.MappedArrays]] git-tree-sha1 = "e8b359ef06ec72e8c030463fe02efe5527ee5142" @@ -720,15 +756,15 @@ version = "1.2.0" [[deps.MathTeXEngine]] deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "Test", "UnicodeFun"] -git-tree-sha1 = "7f837e1884f1ef84984c919fc7a00638cff1e6d1" +git-tree-sha1 = "f04120d9adf4f49be242db0b905bea0be32198d1" uuid = "0a4f8689-d25c-4efe-a92b-7142dfc1aa53" -version = "0.5.3" +version = "0.5.4" [[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"] -git-tree-sha1 = "6872f9594ff273da6d13c7c1a1545d5a8c7d0c1c" +git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.1.6" +version = "1.1.7" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] @@ -757,15 +793,15 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[deps.Mocking]] deps = ["Compat", "ExprTools"] -git-tree-sha1 = "29714d0a7a8083bba8427a4fbfb00a540c681ce7" +git-tree-sha1 = "c272302b22479a24d1cf48c114ad702933414f80" uuid = "78c3b35d-d492-501b-9361-3d52fe80e533" -version = "0.7.3" +version = "0.7.5" [[deps.MosaicViews]] deps = ["MappedArrays", "OffsetArrays", "PaddedViews", "StackViews"] -git-tree-sha1 = "b34e3bc3ca7c94914418637cb10cc4d1d80d877d" +git-tree-sha1 = "7b86a5d4d70a9f5cdf2dacb3cbe6d251d1a61dbe" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" -version = "0.3.3" +version = "0.3.4" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" @@ -790,19 +826,19 @@ uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3" version = "400.902.5+1" [[deps.Netpbm]] -deps = ["FileIO", "ImageCore"] -git-tree-sha1 = "18efc06f6ec36a8b801b23f076e3c6ac7c3bf153" +deps = ["FileIO", "ImageCore", "ImageMetadata"] +git-tree-sha1 = "5ae7ca23e13855b3aba94550f26146c01d259267" uuid = "f09324ee-3d7c-5217-9330-fc30815ba969" -version = "1.0.2" +version = "1.1.0" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" [[deps.Observables]] -git-tree-sha1 = "5a9ea4b9430d511980c01e9f7173739595bbd335" +git-tree-sha1 = "6862738f9796b3edc1c09d0890afce4eca9e7e93" uuid = "510215fc-4207-5dde-b226-833fc4488ee2" -version = "0.5.2" +version = "0.5.4" [[deps.OffsetArrays]] deps = ["Adapt"] @@ -840,15 +876,15 @@ version = "0.8.1+0" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "ebe81469e9d7b471d7ddb611d9e147ea16de0add" +git-tree-sha1 = "df6830e37943c7aaa10023471ca47fb3065cc3c4" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.2.1" +version = "1.3.2" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "e60321e3f2616584ff98f0a4f18d98ae6f89bbb3" +git-tree-sha1 = "f6e9dba33f9f2c44e08a020b0caf6903be540004" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.17+0" +version = "1.1.19+0" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -903,10 +939,10 @@ uuid = "36c8627f-9965-5494-a995-c6b170f724f3" version = "1.50.9+0" [[deps.Parsers]] -deps = ["Dates"] -git-tree-sha1 = "6c01a9b494f6d2a9fc180a08b182fcb06f0958a0" +deps = ["Dates", "SnoopPrecompile"] +git-tree-sha1 = "b64719e8b4504983c7fca6cc9db3ebc8acc2a4d6" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.4.2" +version = "2.5.1" [[deps.Pixman_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -927,9 +963,9 @@ version = "0.3.2" [[deps.PlotUtils]] deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "SnoopPrecompile", "Statistics"] -git-tree-sha1 = "21303256d239f6b484977314674aef4bb1fe4420" +git-tree-sha1 = "5b7690dd212e026bbab1860016a6601cb077ab66" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" -version = "1.3.1" +version = "1.3.2" [[deps.PolygonOps]] git-tree-sha1 = "77b3d3605fc1cd0b42d95eba87dfcd2bf67d5ff6" @@ -972,15 +1008,15 @@ version = "1.0.0+1" [[deps.Qhull_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "695c3049ad94fa38b7f1e8243cdcee27ecad0867" +git-tree-sha1 = "238dd7e2cc577281976b9681702174850f8d4cbc" uuid = "784f63db-0788-585a-bace-daefebcd302b" -version = "8.0.1000+0" +version = "8.0.1001+0" [[deps.QuadGK]] deps = ["DataStructures", "LinearAlgebra"] -git-tree-sha1 = "3c009334f45dfd546a16a57960a821a1a023d241" +git-tree-sha1 = "97aa253e65b784fd13e83774cadc95b38011d734" uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" -version = "2.5.0" +version = "2.6.0" [[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] @@ -990,6 +1026,11 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" deps = ["SHA", "Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +[[deps.RangeArrays]] +git-tree-sha1 = "b9039e93773ddcfc828f12aadf7115b4b4d225f5" +uuid = "b3c3ace0-ae52-54e7-9d0b-2c1406fd6b9d" +version = "0.3.2" + [[deps.Ratios]] deps = ["Requires"] git-tree-sha1 = "dc84268fe0e3335a62e315a3a7cf2afa7178a734" @@ -998,9 +1039,9 @@ version = "0.4.3" [[deps.RecipesBase]] deps = ["SnoopPrecompile"] -git-tree-sha1 = "612a4d76ad98e9722c8ba387614539155a59e30c" +git-tree-sha1 = "18c35ed630d7229c5584b945641a73ca83fb5213" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.3.0" +version = "1.3.2" [[deps.Reexport]] git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" @@ -1036,9 +1077,9 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" version = "0.7.0" [[deps.SIMD]] -git-tree-sha1 = "7dbc15af7ed5f751a82bf3ed37757adf76c32402" +git-tree-sha1 = "bc12e315740f3a36a6db85fa2c0212a848bd239e" uuid = "fdea26ae-647d-5447-a871-4b548cad5224" -version = "3.4.1" +version = "3.4.2" [[deps.ScanByte]] deps = ["Libdl", "SIMD"] @@ -1055,6 +1096,12 @@ version = "1.1.1" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +[[deps.Setfield]] +deps = ["ConstructionBase", "Future", "MacroTools", "StaticArraysCore"] +git-tree-sha1 = "e2cc6d8c88613c05e1defb55170bf5ff211fbeac" +uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" +version = "1.1.1" + [[deps.SharedArrays]] deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" @@ -1076,6 +1123,12 @@ git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1" uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" version = "1.1.0" +[[deps.SimpleTraits]] +deps = ["InteractiveUtils", "MacroTools"] +git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231" +uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" +version = "0.9.4" + [[deps.Sixel]] deps = ["Dates", "FileIO", "ImageCore", "IndirectArrays", "OffsetArrays", "REPL", "libsixel_jll"] git-tree-sha1 = "8fb59825be681d451c246a795117f317ecbcaa28" @@ -1092,9 +1145,9 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[deps.SortingAlgorithms]] deps = ["DataStructures"] -git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508" +git-tree-sha1 = "a4ada03f999bd01b3a25dcaa30b2d929fe537e00" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "1.0.1" +version = "1.1.0" [[deps.SparseArrays]] deps = ["LinearAlgebra", "Random"] @@ -1114,9 +1167,9 @@ version = "0.1.1" [[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "StaticArraysCore", "Statistics"] -git-tree-sha1 = "f86b3a049e5d05227b10e15dbb315c5b90f14988" +git-tree-sha1 = "ffc098086f35909741f71ce21d03dadf0d2bfa76" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.5.9" +version = "1.5.11" [[deps.StaticArraysCore]] git-tree-sha1 = "6b7ba252635a5eff6a0b0664a41ee140a1c9e72a" @@ -1141,9 +1194,9 @@ version = "0.33.21" [[deps.StatsFuns]] deps = ["ChainRulesCore", "HypergeometricFunctions", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "5783b877201a82fc0014cbf381e7e6eb130473a4" +git-tree-sha1 = "ab6083f09b3e617e34a956b43e9d51b824206932" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "1.0.1" +version = "1.1.1" [[deps.StringEncodings]] deps = ["Libiconv_jll"] @@ -1152,10 +1205,10 @@ uuid = "69024149-9ee7-55f6-a4c4-859efe599b68" version = "0.3.5" [[deps.StructArrays]] -deps = ["Adapt", "DataAPI", "StaticArraysCore", "Tables"] -git-tree-sha1 = "8c6ac65ec9ab781af05b08ff305ddc727c25f680" +deps = ["Adapt", "DataAPI", "GPUArraysCore", "StaticArraysCore", "Tables"] +git-tree-sha1 = "b03a3b745aa49b566f128977a7dd1be8711c5e71" uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" -version = "0.6.12" +version = "0.6.14" [[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] @@ -1195,15 +1248,15 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[deps.TiffImages]] deps = ["ColorTypes", "DataStructures", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "Inflate", "Mmap", "OffsetArrays", "PkgVersion", "ProgressMeter", "UUIDs"] -git-tree-sha1 = "70e6d2da9210371c927176cb7a56d41ef1260db7" +git-tree-sha1 = "f8cd5b95aae14d3d88da725414bdde342457366f" uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" -version = "0.6.1" +version = "0.6.2" [[deps.TimeZones]] deps = ["Dates", "Downloads", "InlineStrings", "LazyArtifacts", "Mocking", "Printf", "RecipesBase", "Scratch", "Unicode"] -git-tree-sha1 = "d634a3641062c040fc8a7e2a3ea17661cc159688" +git-tree-sha1 = "a92ec4466fc6e3dd704e2668b5e7f24add36d242" uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53" -version = "1.9.0" +version = "1.9.1" [[deps.TimesDates]] deps = ["CompoundPeriods", "Dates", "TimeZones"] @@ -1213,9 +1266,9 @@ version = "0.3.1" [[deps.TranscodingStreams]] deps = ["Random", "Test"] -git-tree-sha1 = "8a75929dcd3c38611db2f8d08546decb514fcadf" +git-tree-sha1 = "e4bdc63f5c6d62e80eb1c0043fcc0360d5950ff7" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.9.9" +version = "0.9.10" [[deps.TriplotBase]] git-tree-sha1 = "4d4ed7f294cda19382ff7de4c137d24d16adc89b" @@ -1223,9 +1276,9 @@ uuid = "981d1d27-644d-49a2-9326-4793e63143c3" version = "0.1.0" [[deps.URIs]] -git-tree-sha1 = "e59ecc5a41b000fa94423a578d29290c7266fc10" +git-tree-sha1 = "ac00576f90d8a259f2c9d823e91d1de3fd44d348" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.4.0" +version = "1.4.1" [[deps.UUIDs]] deps = ["Random", "SHA"] @@ -1308,9 +1361,9 @@ version = "1.4.0+3" [[deps.YAML]] deps = ["Base64", "Dates", "Printf", "StringEncodings"] -git-tree-sha1 = "3c6e8b9f5cdaaa21340f841653942e1a6b6561e5" +git-tree-sha1 = "dbc7f1c0012a69486af79c8bcdb31be820670ba2" uuid = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" -version = "0.4.7" +version = "0.4.8" [[deps.Zlib_jll]] deps = ["Libdl"] diff --git a/docs/Project.toml b/docs/Project.toml index 1fb43caac5..dbf10dd9a2 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -13,4 +13,5 @@ Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" TimesDates = "bdfc003b-8df8-5c39-adcd-3a9087f5df4a" [compat] +CairoMakie = "0.10" Literate = "≥2.9.0" diff --git a/examples/horizontal_convection.jl b/examples/horizontal_convection.jl index e954c72c04..2d00a680c5 100644 --- a/examples/horizontal_convection.jl +++ b/examples/horizontal_convection.jl @@ -235,7 +235,7 @@ ax_ζ = Axis(fig[4, 1]; ax_χ = Axis(fig[5, 1]; title = L"buoyancy dissipation, $κ |\mathbf{\nabla}b|^2 \, (L_x / {b_*}^5)^{1/2}$", axis_kwargs...) -fig[1, :] = Label(fig, title, textsize=24, tellwidth=false) +fig[1, :] = Label(fig, title, fontsize=24, tellwidth=false) hm_s = heatmap!(ax_s, xc, zc, sₙ; colorrange = (0, slim), diff --git a/examples/internal_wave.jl b/examples/internal_wave.jl index 730420ccc3..cc9bfff0d7 100644 --- a/examples/internal_wave.jl +++ b/examples/internal_wave.jl @@ -166,7 +166,7 @@ contourf!(ax, x, z, w; extendhigh = :auto) title = @lift "ωt = " * string(round(w_timeseries.times[$n] * ω, digits=2)) -fig[1, 1] = Label(fig, title, textsize=24, tellwidth=false) +fig[1, 1] = Label(fig, title, fontsize=24, tellwidth=false) # And, finally, we record a movie. using Printf diff --git a/examples/kelvin_helmholtz_instability.jl b/examples/kelvin_helmholtz_instability.jl index cd8163c183..8a81c89094 100644 --- a/examples/kelvin_helmholtz_instability.jl +++ b/examples/kelvin_helmholtz_instability.jl @@ -428,7 +428,7 @@ ax_KE = Axis(fig[3, :]; limits = ((0, t_final), (initial_eigenmode_energy, 1e-1)), xlabel = "time") -fig[1, :] = Label(fig, title, textsize=24, tellwidth=false) +fig[1, :] = Label(fig, title, fontsize=24, tellwidth=false) ω_lims = @lift (-maximum(abs, interior(ω_timeseries, :, 1, :, $n)) - 1e-16, maximum(abs, interior(ω_timeseries, :, 1, :, $n)) + 1e-16) b_lims = @lift (-maximum(abs, interior(b_timeseries, :, 1, :, $n)) - 1e-16, maximum(abs, interior(b_timeseries, :, 1, :, $n)) + 1e-16) @@ -487,7 +487,7 @@ ax_KE = Axis(fig[3, :]; limits = ((0, t_final), (initial_eigenmode_energy, 1e-1)), xlabel = "time") -fig[1, :] = Label(fig, title, textsize=24, tellwidth=false) +fig[1, :] = Label(fig, title, fontsize=24, tellwidth=false) hm_Ω = heatmap!(ax_Ω, xω, zω, Ωₙ; colorrange = (-1, 1), colormap = :balance) Colorbar(fig[2, 2], hm_Ω) diff --git a/examples/ocean_wind_mixing_and_convection.jl b/examples/ocean_wind_mixing_and_convection.jl index 92e32d398c..7b87cf7864 100644 --- a/examples/ocean_wind_mixing_and_convection.jl +++ b/examples/ocean_wind_mixing_and_convection.jl @@ -288,7 +288,7 @@ Colorbar(fig[3, 2], hm_S; label = "g / kg") hm_νₑ = heatmap!(ax_νₑ, xT, zT, νₑₙ; colormap = :thermal, colorrange = νₑlims) Colorbar(fig[3, 4], hm_νₑ; label = "m s⁻²") -fig[1, 1:4] = Label(fig, title, textsize=24, tellwidth=false) +fig[1, 1:4] = Label(fig, title, fontsize=24, tellwidth=false) # And now record a movie. diff --git a/examples/shallow_water_Bickley_jet.jl b/examples/shallow_water_Bickley_jet.jl index ccfe27ee2e..cfcc286a69 100644 --- a/examples/shallow_water_Bickley_jet.jl +++ b/examples/shallow_water_Bickley_jet.jl @@ -193,7 +193,7 @@ hm_ω′ = heatmap!(ax_ω′, x, y, ω′, colormap = :balance) Colorbar(fig[2, 4], hm_ω′) title = @lift @sprintf("t = %.1f", times[$n]) -fig[1, 1:4] = Label(fig, title, textsize=24, tellwidth=false) +fig[1, 1:4] = Label(fig, title, fontsize=24, tellwidth=false) # Finally, we record a movie. diff --git a/examples/tilted_bottom_boundary_layer.jl b/examples/tilted_bottom_boundary_layer.jl index e333b62afe..956310dd9a 100644 --- a/examples/tilted_bottom_boundary_layer.jl +++ b/examples/tilted_bottom_boundary_layer.jl @@ -227,7 +227,7 @@ Colorbar(fig[3, 2], hm_v; label = "m s⁻¹") times = collect(ds["time"]) title = @lift "t = " * string(prettytime(times[$n])) -fig[1, :] = Label(fig, title, textsize=20, tellwidth=false) +fig[1, :] = Label(fig, title, fontsize=20, tellwidth=false) # Finally, we record a movie. diff --git a/examples/two_dimensional_turbulence.jl b/examples/two_dimensional_turbulence.jl index 69f44a7095..fa20199d87 100644 --- a/examples/two_dimensional_turbulence.jl +++ b/examples/two_dimensional_turbulence.jl @@ -145,7 +145,7 @@ heatmap!(ax_ω, xω, yω, ω; colormap = :balance, colorrange = (-2, 2)) heatmap!(ax_s, xs, ys, s; colormap = :speed, colorrange = (0, 0.2)) title = @lift "t = " * string(round(times[$n], digits=2)) -Label(fig[1, 1:2], title, textsize=24, tellwidth=false) +Label(fig[1, 1:2], title, fontsize=24, tellwidth=false) # Finally, we record a movie. diff --git a/validation/barotropic_gyre/visualize_barotropic_gyre.jl b/validation/barotropic_gyre/visualize_barotropic_gyre.jl index 80ff5d69e4..70f2875f08 100644 --- a/validation/barotropic_gyre/visualize_barotropic_gyre.jl +++ b/validation/barotropic_gyre/visualize_barotropic_gyre.jl @@ -64,10 +64,10 @@ function visualize_barotropic_gyre(filepath) wireframe!(ax, Sphere(Point3f(0), 0.99f0), show_axis=false) surface!(ax, x[n], y[n], z[n], color=var, colormap=:balance) #, colorrange=clims[n]) rotate_cam!(ax.scene, (0, 3π/4, 0)) - fig[2, 2 + 3*(n-1)] = Label(fig, statenames[n], textsize = 50) # put names in center + fig[2, 2 + 3*(n-1)] = Label(fig, statenames[n], fontsize = 50) # put names in center end - supertitle = fig[0, :] = Label(fig, plot_title, textsize=50) + supertitle = fig[0, :] = Label(fig, plot_title, fontsize=50) record(fig, output_prefix * ".mp4", iterations, framerate=30) do i @info "Animating iteration $i/$(iterations[end])..." diff --git a/validation/cubed_sphere_surface_gravity_waves/animate_face.jl b/validation/cubed_sphere_surface_gravity_waves/animate_face.jl index a28dcdca2b..84882ee2b8 100644 --- a/validation/cubed_sphere_surface_gravity_waves/animate_face.jl +++ b/validation/cubed_sphere_surface_gravity_waves/animate_face.jl @@ -39,11 +39,11 @@ wireframe!(ax, Sphere(Point3f(0), 0.99f0), show_axis=false) sf = surface!(ax, xc, yc, zc, color=η, colormap=:balance, colorrange=(-0.01, 0.01)) rotate_cam!(ax.scene, (3π/4, π/6, 0)) # zoom!(ax.scene, (0, 0, 0), 5, false) -# fig[2, 2 + 3*(n-1)] = Label(fig, statenames[n], textsize = 50) # put names in center +# fig[2, 2 + 3*(n-1)] = Label(fig, statenames[n], fontsize = 50) # put names in center cb1 = fig[1, 2] = Colorbar(fig, sf, label="η′", width=30) -supertitle = fig[0, :] = Label(fig, plot_title, textsize=50) +supertitle = fig[0, :] = Label(fig, plot_title, fontsize=50) record(fig, "cubed_sphere_waves.mp4", iterations, framerate=60) do i @info "Animating iteration $i/$(iterations[end])..." diff --git a/validation/cubed_sphere_surface_gravity_waves/animate_sphere.jl b/validation/cubed_sphere_surface_gravity_waves/animate_sphere.jl index c0eabd173f..7b5e432ced 100644 --- a/validation/cubed_sphere_surface_gravity_waves/animate_sphere.jl +++ b/validation/cubed_sphere_surface_gravity_waves/animate_sphere.jl @@ -52,7 +52,7 @@ zoom!(ax.scene, (0, 0, 0), 8, false) cb1 = fig[1, 2] = Colorbar(fig, sf, label="sea surface height η′ (m)", width=30) -supertitle = fig[0, :] = Label(fig, plot_title, textsize=50) +supertitle = fig[0, :] = Label(fig, plot_title, fontsize=50) record(fig, "surface_gravity_waves_on_a_cubed_sphere.mp4", iterations, framerate=15) do i @info "Animating iteration $i/$(iterations[end])..." @@ -88,7 +88,7 @@ end # cb1 = fig[1, 2] = Colorbar(fig, sf, label="u-velocity (m/s)", width=30) -# supertitle = fig[0, :] = Label(fig, plot_title, textsize=50) +# supertitle = fig[0, :] = Label(fig, plot_title, fontsize=50) # record(fig, "surface_gravity_waves_on_a_cubed_sphere_u.mp4", iterations[1:20], framerate=15) do i # @info "Animating iteration $i/$(iterations[end])..." @@ -124,7 +124,7 @@ end # cb1 = fig[1, 2] = Colorbar(fig, sf, label="v-velocity (m/s)", width=30) -# supertitle = fig[0, :] = Label(fig, plot_title, textsize=50) +# supertitle = fig[0, :] = Label(fig, plot_title, fontsize=50) # record(fig, "surface_gravity_waves_on_a_cubed_sphere_v.mp4", iterations[1:20], framerate=15) do i # @info "Animating iteration $i/$(iterations[end])..." diff --git a/validation/mesoscale_turbulence/baroclinic_adjustment.jl b/validation/mesoscale_turbulence/baroclinic_adjustment.jl index e36fded327..b6b5126cf2 100644 --- a/validation/mesoscale_turbulence/baroclinic_adjustment.jl +++ b/validation/mesoscale_turbulence/baroclinic_adjustment.jl @@ -283,7 +283,7 @@ rotate_cam!(ax_c.scene, (π/24, -π/6, 0)) title = @lift(string("Buoyancy and tracer concentration at t = ", prettytime(slice_files[1]["timeseries/t/" * string($iter)]))) -fig[0, :] = Label(fig, title, textsize=30) +fig[0, :] = Label(fig, title, fontsize=30) iterations = parse.(Int, keys(slice_files[1]["timeseries/t"])) diff --git a/validation/mesoscale_turbulence/eddying_channel.jl b/validation/mesoscale_turbulence/eddying_channel.jl index c9c706a2b1..c3c468cad0 100644 --- a/validation/mesoscale_turbulence/eddying_channel.jl +++ b/validation/mesoscale_turbulence/eddying_channel.jl @@ -426,7 +426,7 @@ rotate_cam!(ax_ζ.scene, (π/24, -π/6, 0)) title = @lift(string("Buoyancy, vertical vorticity, and zonally-averaged u at t = ", prettytime(zonal_file["timeseries/t/" * string($iter)]))) -fig[0, :] = Label(fig, title, textsize=30) +fig[0, :] = Label(fig, title, fontsize=30) display(fig) diff --git a/validation/mesoscale_turbulence/zonally_averaged_channel.jl b/validation/mesoscale_turbulence/zonally_averaged_channel.jl index 1bb3c56d10..6d8e1265ea 100644 --- a/validation/mesoscale_turbulence/zonally_averaged_channel.jl +++ b/validation/mesoscale_turbulence/zonally_averaged_channel.jl @@ -334,7 +334,7 @@ fig, ax, hm = heatmap(yc * 1e-3, zc, interior(∇_q_timeseries)[1, :, :, which_i colormap=:balance, colorrange=(-1e-7, 1e-7), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "∇⋅q", textsize=30) +fig[0, :] = Label(fig, "∇⋅q", fontsize=30) xlims!(y_limits[1], y_limits[2]) ylims!(z_limits[1], z_limits[2]) display(fig) @@ -343,7 +343,7 @@ fig, ax, hm = heatmap(yv * 1e-3, zv, interior(vb_timeseries)[1, :, :, which_iter colormap=:balance, colorrange=(-2e-5, 2e-5), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "v'b'", textsize=30) +fig[0, :] = Label(fig, "v'b'", fontsize=30) xlims!(y_limits[1], y_limits[2]) ylims!(z_limits[1], z_limits[2]) display(fig) @@ -352,7 +352,7 @@ fig, ax, hm = heatmap(yw * 1e-3, zw, interior(wb_timeseries)[1, :, :, which_iter colormap=:balance, colorrange=(-1e-6, 1e-6), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "w'b'", textsize=30) +fig[0, :] = Label(fig, "w'b'", fontsize=30) xlims!(y_limits[1], y_limits[2]) ylims!(z_limits[1], z_limits[2]) display(fig) @@ -363,7 +363,7 @@ fig, ax, hm = heatmap(yc * 1e-3, zc, interior(b)[1, :, :], # colormap=:balance, colorrange=(-1e-7, 1e-7), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "b", textsize=30) +fig[0, :] = Label(fig, "b", fontsize=30) xlims!(y_limits[1], y_limits[2]) ylims!(z_limits[1], z_limits[2]) display(fig) @@ -373,7 +373,7 @@ fig, ax, hm = heatmap(yu * 1e-3, zu, interior(u_timeseries)[1, :, :, which_itera colormap=:balance, colorrange=(-0.5, 0.5), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "u", textsize=30) +fig[0, :] = Label(fig, "u", fontsize=30) # xlims!(y_limits[1], y_limits[2]) # ylims!(z_limits[1], z_limits[2]) display(fig) @@ -384,7 +384,7 @@ fig, ax, hm = heatmap(yv * 1e-3, zv, interior(v_timeseries)[1, :, :, which_itera colormap=:balance, colorrange=(-0.1, 0.1), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "v", textsize=30) +fig[0, :] = Label(fig, "v", fontsize=30) # xlims!(y_limits[1], y_limits[2]) # ylims!(z_limits[1], z_limits[2]) display(fig) @@ -395,7 +395,7 @@ fig, ax, hm = heatmap(yw * 1e-3, zw, interior(w_timeseries)[1, :, :, which_itera colormap=:balance, colorrange=(-1e-4, 1e-4), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "w", textsize=30) +fig[0, :] = Label(fig, "w", fontsize=30) # xlims!(y_limits[1], y_limits[2]) # ylims!(z_limits[1], z_limits[2]) display(fig) @@ -411,7 +411,7 @@ fig, ax, hm = heatmap(yw * 1e-3, zw, interior(b_z)[1, :, :], colormap=:curl, colorrange=(-5e-4, 5e-4), axis=(xlabel="y", ylabel="z", xticklabelsize=20, yticklabelsize=20, xlabelsize=25, ylabelsize=25)) Colorbar(fig[1, 2], hm, ticklabelsize=20) -fig[0, :] = Label(fig, "∂b/∂z", textsize=30) +fig[0, :] = Label(fig, "∂b/∂z", fontsize=30) xlims!(y_limits[1], y_limits[2]) ylims!(z_limits[1], z_limits[2]) display(fig) diff --git a/validation/near_global_lat_lon/visualize_annual_cycle_solution.jl b/validation/near_global_lat_lon/visualize_annual_cycle_solution.jl index e0fba3b4b6..065adfc782 100644 --- a/validation/near_global_lat_lon/visualize_annual_cycle_solution.jl +++ b/validation/near_global_lat_lon/visualize_annual_cycle_solution.jl @@ -211,10 +211,10 @@ sphere_continents!(ax_v) rotate_cam!(ax_v.scene, (π/8, π/6, 0)) plot_title = @lift "t = " * ti($iter) -supertitle = sphere_fig[0, 3:4] = Label(sphere_fig, plot_title, textsize=40) +supertitle = sphere_fig[0, 3:4] = Label(sphere_fig, plot_title, fontsize=40) -#v_title = sphere_fig[0, 5] = Label(sphere_fig, "Ocean meridional velocity", textsize=20) -#T_title = sphere_fig[0, 2] = Label(sphere_fig, "Ocean temperature", textsize=20) +#v_title = sphere_fig[0, 5] = Label(sphere_fig, "Ocean meridional velocity", fontsize=20) +#T_title = sphere_fig[0, 2] = Label(sphere_fig, "Ocean temperature", fontsize=20) display(sphere_fig) diff --git a/validation/solid_body_rotation/solid_body_rotation.jl b/validation/solid_body_rotation/solid_body_rotation.jl index 9a4cf56e44..48b791979a 100644 --- a/validation/solid_body_rotation/solid_body_rotation.jl +++ b/validation/solid_body_rotation/solid_body_rotation.jl @@ -169,7 +169,7 @@ function plot_zonal_average_solid_body_rotation(filepath) theory = lines!(ax, solid_body_rotation.(φ), φ, color=:black) simulation = lines!(ax, zonal_average_u, φ, color=:blue) - supertitle = fig[0, :] = Label(fig, plot_title, textsize=30) + supertitle = fig[0, :] = Label(fig, plot_title, fontsize=30) leg = Legend(fig, [theory, simulation], ["U cos(φ)", "Simulation"], markersize = 7, halign = :right, valign = :top, bgcolor = :transparent) diff --git a/validation/solid_body_rotation/solid_body_tracer_advection.jl b/validation/solid_body_rotation/solid_body_tracer_advection.jl index 5dc8a34231..c1c938078e 100644 --- a/validation/solid_body_rotation/solid_body_tracer_advection.jl +++ b/validation/solid_body_rotation/solid_body_tracer_advection.jl @@ -174,7 +174,7 @@ function visualize_solid_body_tracer_advection(filepath) heatmap!(ax, var) end - supertitle = fig[0, :] = Label(fig, plot_title, textsize=30) + supertitle = fig[0, :] = Label(fig, plot_title, fontsize=30) record(fig, output_prefix * ".mp4", iterations, framerate=30) do i @info "Animating iteration $i/$(iterations[end])..." From 445186b414810b19d428c89639d64d6962d1b196 Mon Sep 17 00:00:00 2001 From: "Navid C. Constantinou" Date: Sun, 11 Dec 2022 12:11:13 +1100 Subject: [PATCH 2/2] change textsize -> fontsize --- examples/baroclinic_adjustment.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/baroclinic_adjustment.jl b/examples/baroclinic_adjustment.jl index 292b82808d..80fca1abcb 100644 --- a/examples/baroclinic_adjustment.jl +++ b/examples/baroclinic_adjustment.jl @@ -277,7 +277,7 @@ times = avg_b_timeseries.times title = @lift "Buoyancy at t = " * string(round(times[$n] / day, digits=1)) * " days" -fig[1, 1:2] = Label(fig, title; textsize = 24, tellwidth = false, padding = (0, 0, -120, 0)) +fig[1, 1:2] = Label(fig, title; fontsize = 24, tellwidth = false, padding = (0, 0, -120, 0)) frames = 1:length(times)