diff --git a/Manifest.toml b/Manifest.toml index 58f0b38..62ab50e 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -5,9 +5,9 @@ manifest_format = "2.0" project_hash = "43432f73c09fd28b1b2130294e9dac264fc00377" [[deps.ADTypes]] -git-tree-sha1 = "be7ae030256b8ef14a441726c4c37766b90b93a3" +git-tree-sha1 = "60665b326b75db6517939d0e1875850bc4a54368" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "1.15.0" +version = "1.17.0" [deps.ADTypes.extensions] ADTypesChainRulesCoreExt = "ChainRulesCore" @@ -75,15 +75,15 @@ version = "1.1.1" [[deps.ArnoldiMethod]] deps = ["LinearAlgebra", "Random", "StaticArrays"] -git-tree-sha1 = "f87e559f87a45bece9c9ed97458d3afe98b1ebb9" +git-tree-sha1 = "d57bd3762d308bded22c3b82d033bff85f6195c6" uuid = "ec485272-7323-5ecc-a04f-4719b315124d" -version = "0.1.0" +version = "0.4.0" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra"] -git-tree-sha1 = "9606d7832795cbef89e06a550475be300364a8aa" +git-tree-sha1 = "dbd8c3bbbdbb5c2778f85f4422c39960eac65a42" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.19.0" +version = "7.20.0" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" @@ -93,6 +93,7 @@ version = "7.19.0" ArrayInterfaceChainRulesCoreExt = "ChainRulesCore" ArrayInterfaceChainRulesExt = "ChainRules" ArrayInterfaceGPUArraysCoreExt = "GPUArraysCore" + ArrayInterfaceMetalExt = "Metal" ArrayInterfaceReverseDiffExt = "ReverseDiff" ArrayInterfaceSparseArraysExt = "SparseArrays" ArrayInterfaceStaticArraysCoreExt = "StaticArraysCore" @@ -106,6 +107,7 @@ version = "7.19.0" ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2" ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527" + Metal = "dde4c033-4e86-420c-a63e-0dd931031962" ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" @@ -116,9 +118,9 @@ uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" [[deps.Atomix]] deps = ["UnsafeAtomics"] -git-tree-sha1 = "b5bb4dc6248fde467be2a863eb8452993e74d402" +git-tree-sha1 = "29bb0eb6f578a587a49da16564705968667f5fa8" uuid = "a9b6321e-bd34-4604-b9c9-b65b8de01458" -version = "1.1.1" +version = "1.1.2" [deps.Atomix.extensions] AtomixCUDAExt = "CUDA" @@ -183,9 +185,9 @@ version = "0.5.0" [[deps.CFTime]] deps = ["Dates", "Printf"] -git-tree-sha1 = "9b37e9e51aeea9763eea65b9b3aa1728fca94ffc" +git-tree-sha1 = "e85b90dfcf01b9de2f4bbda8d989e1344728c0a6" uuid = "179af706-886a-5703-950a-314cd64e0468" -version = "0.2.1" +version = "0.2.2" [[deps.CRC32c]] uuid = "8bf52ea8-c179-5cab-976a-9e18b702a9bc" @@ -203,10 +205,10 @@ uuid = "4e9b3aee-d8a1-5a3d-ad8b-7d824db253f0" version = "1.0.1+0" [[deps.CUDA]] -deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "GPUToolbox", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"] -git-tree-sha1 = "b8ae59258f3d96ce75a00f9229e719356eb929d6" +deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Compiler_jll", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "GPUToolbox", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"] +git-tree-sha1 = "27f69b3923e58730f0a71396070e9114fc0bba40" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "5.8.2" +version = "5.8.3" [deps.CUDA.extensions] ChainRulesCoreExt = "ChainRulesCore" @@ -220,23 +222,29 @@ version = "5.8.2" SparseMatricesCSR = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" +[[deps.CUDA_Compiler_jll]] +deps = ["Artifacts", "CUDA_Driver_jll", "CUDA_Runtime_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] +git-tree-sha1 = "364b9e74288455271aca84ba46fe4cec01f06b1e" +uuid = "d1e2174e-dfdc-576e-b43e-73b79eb1aca8" +version = "0.2.0+2" + [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "18afa851ed10552e6df25dfaa7ef450104ae73d4" +git-tree-sha1 = "12621de83838b5ce6a185050db5a184f4540679b" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "0.13.1+0" +version = "13.0.0+0" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] -git-tree-sha1 = "33576c7c1b2500f8e7e6baa082e04563203b3a45" +git-tree-sha1 = "f9a521f52d236fe49f1028d69e549e7f2644bb72" uuid = "1af6417a-86b4-443c-805f-a4643ffb695f" -version = "0.3.5" +version = "1.0.0" [[deps.CUDA_Runtime_jll]] deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "b5c173a64f9f4224a82fdc26fda8614cb2ecfa27" +git-tree-sha1 = "cc727d90c9769db27945219f9ba149dbddc74f06" uuid = "76a88914-d11a-5bdc-97e0-2f5a05c973a2" -version = "0.17.1+0" +version = "0.19.0+0" [[deps.Cairo]] deps = ["Cairo_jll", "Colors", "Glib_jll", "Graphics", "Libdl", "Pango_jll"] @@ -264,9 +272,9 @@ version = "0.2.2" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] -git-tree-sha1 = "06ee8d1aa558d2833aa799f6f0b31b30cada405f" +git-tree-sha1 = "e4c6a16e77171a5f5e25e9646617ab1c276c5607" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.25.2" +version = "1.26.0" weakdeps = ["SparseArrays"] [deps.ChainRulesCore.extensions] @@ -314,9 +322,9 @@ version = "0.13.1" [[deps.CommonDataModel]] deps = ["CFTime", "DataStructures", "Dates", "Preferences", "Printf", "Statistics"] -git-tree-sha1 = "a4f9a314202585fcdce4f1a3c4b86ce988ce76b1" +git-tree-sha1 = "1985a3201d376bf13a866527e19c2272c252870f" uuid = "1fbeeb36-5f17-413c-809b-666fb144f157" -version = "0.3.9" +version = "0.3.10" [[deps.CommonSubexpressions]] deps = ["MacroTools"] @@ -331,9 +339,9 @@ version = "1.0.0" [[deps.Compat]] deps = ["TOML", "UUIDs"] -git-tree-sha1 = "3a3dfb30697e96a440e4149c8c51bf32f818c0f3" +git-tree-sha1 = "0037835448781bb46feb39866934e243886d756a" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "4.17.0" +version = "4.18.0" weakdeps = ["Dates", "LinearAlgebra"] [deps.Compat.extensions] @@ -388,9 +396,9 @@ version = "1.16.0" [[deps.DataFrames]] deps = ["Compat", "DataAPI", "DataStructures", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrecompileTools", "PrettyTables", "Printf", "Random", "Reexport", "SentinelArrays", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "fb61b4812c49343d7ef0b533ba982c46021938a6" +git-tree-sha1 = "a37ac0840a1196cd00317b57e39d6586bf0fd6f6" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "1.7.0" +version = "1.7.1" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -433,9 +441,9 @@ version = "1.15.1" [[deps.DifferentiationInterface]] deps = ["ADTypes", "LinearAlgebra"] -git-tree-sha1 = "f620da805b82bec64ab4d5f881c7592c82dbc08a" +git-tree-sha1 = "16946a4d305607c3a4af54ff35d56f0e9444ed0e" uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63" -version = "0.7.3" +version = "0.7.7" [deps.DifferentiationInterface.extensions] DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore" @@ -482,34 +490,38 @@ version = "0.7.3" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [[deps.DimensionalData]] -deps = ["Adapt", "ArrayInterface", "ConstructionBase", "DataAPI", "Dates", "Extents", "Interfaces", "IntervalSets", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "PrecompileTools", "Random", "RecipesBase", "SparseArrays", "Statistics", "TableTraits", "Tables"] -git-tree-sha1 = "ba1825eeb826b147c23402038609ade6ec5ebff8" +deps = ["Adapt", "ArrayInterface", "ConstructionBase", "DataAPI", "Dates", "Extents", "Interfaces", "IntervalSets", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "PrecompileTools", "Random", "RecipesBase", "Statistics", "TableTraits", "Tables"] +git-tree-sha1 = "611a26d31e6739dd7b6cf71f2a086d11f820ffdb" uuid = "0703355e-b756-11e9-17c0-8b28908087d0" -version = "0.29.19" +version = "0.29.23" [deps.DimensionalData.extensions] + DimensionalDataAbstractFFTsExt = "AbstractFFTs" DimensionalDataAlgebraOfGraphicsExt = "AlgebraOfGraphics" DimensionalDataCategoricalArraysExt = "CategoricalArrays" DimensionalDataDiskArraysExt = "DiskArrays" DimensionalDataMakie = "Makie" DimensionalDataNearestNeighborsExt = "NearestNeighbors" DimensionalDataPythonCall = "PythonCall" + DimensionalDataSparseArraysExt = "SparseArrays" DimensionalDataStatsBase = "StatsBase" [deps.DimensionalData.weakdeps] + AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c" AlgebraOfGraphics = "cbdf2221-f076-402e-a563-3d30da359d67" CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597" DiskArrays = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce" PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" + SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" [[deps.DiskArrays]] deps = ["ConstructionBase", "LRUCache", "Mmap", "OffsetArrays"] -git-tree-sha1 = "16d93ff95ecc421463eaefd694e6746bb1c0919e" +git-tree-sha1 = "bfde0790720fcac006a3d62149309a685fc3aa13" uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" -version = "0.4.14" +version = "0.4.15" [[deps.Distances]] deps = ["LinearAlgebra", "Statistics", "StatsAPI"] @@ -577,9 +589,9 @@ version = "2.2.8" [[deps.Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "d55dffd9ae73ff72f1c0482454dcf2ec6c6c4a63" +git-tree-sha1 = "7bb1361afdb33c7f2b085aa49ea8fe1b0fb14e58" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" -version = "2.6.5+0" +version = "2.7.1+0" [[deps.ExprTools]] git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec" @@ -671,9 +683,9 @@ weakdeps = ["PDMats", "SparseArrays", "Statistics"] [[deps.FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Setfield"] -git-tree-sha1 = "f089ab1f834470c525562030c8cfde4025d5e915" +git-tree-sha1 = "31fd32af86234b6b71add76229d53129aa1b87a9" uuid = "6a86dc24-6348-571c-b903-95158fe2bd41" -version = "2.27.0" +version = "2.28.1" [deps.FiniteDiff.extensions] FiniteDiffBandedMatricesExt = "BandedMatrices" @@ -701,9 +713,9 @@ version = "0.4.3" [[deps.Fontconfig_jll]] deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Zlib_jll"] -git-tree-sha1 = "301b5d5d731a0654825f1f2e906990f7141a106b" +git-tree-sha1 = "f85dac9a96a01087df6e3a749840015a0ca3817d" uuid = "a3f928ae-7b40-5064-980b-68af3947d34b" -version = "2.16.0+0" +version = "2.17.1+0" [[deps.Format]] git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc" @@ -712,9 +724,9 @@ version = "1.3.7" [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] -git-tree-sha1 = "910febccb28d493032495b7009dce7d7f7aee554" +git-tree-sha1 = "ce15956960057e9ff7f1f535400ffa14c92429a4" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "1.0.1" +version = "1.1.0" weakdeps = ["StaticArrays"] [deps.ForwardDiff.extensions] @@ -750,9 +762,9 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[deps.GLFW]] deps = ["GLFW_jll"] -git-tree-sha1 = "13c52cdd876a31240da16dfb51363aed42740325" +git-tree-sha1 = "40412e58ec374029de3d4ad7c13e1a52aa1e149f" uuid = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98" -version = "3.4.4" +version = "3.4.5" [[deps.GLFW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll", "libdecor_jll", "xkbcommon_jll"] @@ -785,9 +797,10 @@ uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" version = "1.6.1" [[deps.GPUToolbox]] -git-tree-sha1 = "15d8b0f5a6dca9bf8c02eeaf6687660dafa638d0" +deps = ["LLVM"] +git-tree-sha1 = "5bfe837129bf49e2e049b4f1517546055cc16a93" uuid = "096a3bc2-3ced-46d0-87f4-dd12716f4bfc" -version = "0.2.0" +version = "0.3.0" [[deps.GeoFormatTypes]] git-tree-sha1 = "8e233d5167e63d708d41f87597433f59a0f213fe" @@ -856,11 +869,17 @@ git-tree-sha1 = "8a6dbda1fd736d60cc477d99f2e7a042acfa46e8" uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472" version = "1.3.15+0" +[[deps.Graphs]] +deps = ["ArnoldiMethod", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] +git-tree-sha1 = "7a98c6502f4632dbe9fb1973a4244eaa3324e84d" +uuid = "86223c79-3864-5bf0-83f7-82e725a168b6" +version = "1.13.1" + [[deps.GridLayoutBase]] deps = ["GeometryBasics", "InteractiveUtils", "Observables"] -git-tree-sha1 = "dc6bed05c15523624909b3953686c5f5ffa10adc" +git-tree-sha1 = "93d5c27c8de51687a2c70ec0716e6e76f298416f" uuid = "3955a311-db13-416c-9275-1d80ed98e5e9" -version = "0.11.1" +version = "0.11.2" [[deps.Grisu]] git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" @@ -885,10 +904,10 @@ uuid = "076d061b-32b6-4027-95e0-9a2c6f6d7e74" version = "0.2.0" [[deps.Hwloc_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "92f65c4d78ce8cdbb6b68daf88889950b0a99d11" +deps = ["Artifacts", "JLLWrappers", "Libdl", "XML2_jll", "Xorg_libpciaccess_jll"] +git-tree-sha1 = "3d468106a05408f9f7b6f161d9e7715159af247b" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.12.1+0" +version = "2.12.2+0" [[deps.HypergeometricFunctions]] deps = ["LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] @@ -921,9 +940,9 @@ version = "0.10.5" [[deps.ImageFiltering]] deps = ["CatIndices", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageBase", "ImageCore", "LinearAlgebra", "OffsetArrays", "PrecompileTools", "Reexport", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] -git-tree-sha1 = "eea3a5095c0c5f143e62773164ab11f67e43c4bb" +git-tree-sha1 = "52116260a234af5f69969c5286e6a5f8dc3feab8" uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5" -version = "0.7.10" +version = "0.7.12" [[deps.ImageIO]] deps = ["FileIO", "IndirectArrays", "JpegTurbo", "LazyModules", "Netpbm", "OpenEXR", "PNGFiles", "QOI", "Sixel", "TiffImages", "UUIDs", "WebP"] @@ -954,9 +973,9 @@ uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" version = "0.1.5" [[deps.InlineStrings]] -git-tree-sha1 = "8594fac023c5ce1ef78260f24d1ad18b4327b420" +git-tree-sha1 = "8f3d257792a522b4601c24a577954b0a8cd7334d" uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" -version = "1.4.4" +version = "1.4.5" [deps.InlineStrings.extensions] ArrowTypesExt = "ArrowTypes" @@ -1098,9 +1117,9 @@ version = "0.1.6" [[deps.JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "eac1206917768cb54957c65a615460d87b455fc1" +git-tree-sha1 = "e95866623950267c1e4878846f848d94810de475" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" -version = "3.1.1+0" +version = "3.1.2+0" [[deps.JuliaNVTXCallbacks_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -1137,10 +1156,10 @@ uuid = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7" version = "0.10.1" [[deps.KrylovPreconditioners]] -deps = ["Adapt", "KernelAbstractions", "LightGraphs", "LinearAlgebra", "Metis", "SparseArrays"] -git-tree-sha1 = "52d302d5e950e242f037316b6dd6e1e080afea09" +deps = ["Adapt", "Graphs", "KernelAbstractions", "LinearAlgebra", "Metis", "SparseArrays"] +git-tree-sha1 = "77e0d2f1a250af347261c9aa89f74b0cfc530a71" uuid = "45d422c2-293f-44ce-8315-2cb988662dec" -version = "0.3.4" +version = "0.3.6" [deps.KrylovPreconditioners.extensions] KrylovPreconditionersAMDGPUExt = "AMDGPU" @@ -1279,9 +1298,9 @@ version = "1.18.0+0" [[deps.Libmount_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "a31572773ac1b745e0343fe5e2c8ddda7a37e997" +git-tree-sha1 = "706dfd3c0dd56ca090e86884db6eda70fa7dd4af" uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" -version = "2.41.0+0" +version = "2.41.1+0" [[deps.Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] @@ -1291,15 +1310,9 @@ version = "4.7.1+0" [[deps.Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "321ccef73a96ba828cd51f2ab5b9f917fa73945a" +git-tree-sha1 = "d3c8af829abaeba27181db4acb485b18d15d89c6" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" -version = "2.41.0+0" - -[[deps.LightGraphs]] -deps = ["ArnoldiMethod", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] -git-tree-sha1 = "432428df5f360964040ed60418dd5601ecd240b6" -uuid = "093fc24a-ae57-5d10-9952-331d41423f4d" -version = "1.3.5" +version = "2.41.1+0" [[deps.LineSearches]] deps = ["LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "Printf"] @@ -1350,9 +1363,9 @@ version = "2025.2.0+0" [[deps.MPI]] deps = ["Distributed", "DocStringExtensions", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "PkgVersion", "PrecompileTools", "Requires", "Serialization", "Sockets"] -git-tree-sha1 = "892676019c58f34e38743bc989b0eca5bce5edc5" +git-tree-sha1 = "a61ecf714d71064b766d481ef43c094d4c6e3c52" uuid = "da04e1cc-30fd-572f-bb4f-1f8673147195" -version = "0.20.22" +version = "0.20.23" [deps.MPI.extensions] AMDGPUExt = "AMDGPU" @@ -1408,9 +1421,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MathTeXEngine]] deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "UnicodeFun"] -git-tree-sha1 = "6e64d2321257cc52f47e193407d0659ea1b2b431" +git-tree-sha1 = "a370fef694c109e1950836176ed0d5eabbb65479" uuid = "0a4f8689-d25c-4efe-a92b-7142dfc1aa53" -version = "0.6.5" +version = "0.6.6" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] @@ -1489,15 +1502,15 @@ version = "7.10.0" [[deps.NVTX]] deps = ["Colors", "JuliaNVTXCallbacks_jll", "Libdl", "NVTX_jll"] -git-tree-sha1 = "1a24c3430fa2ef3317c4c97fa7e431ef45793bd2" +git-tree-sha1 = "6b573a3e66decc7fc747afd1edbf083ff78c813a" uuid = "5da4648a-3479-48b8-97b9-01cb529c0a1f" -version = "1.0.0" +version = "1.0.1" [[deps.NVTX_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "cd475b587ff77910789a18e68da789fc446a2a05" +git-tree-sha1 = "af2232f69447494514c25742ba1503ec7e9877fe" uuid = "e98f9f5b-d649-5603-91fd-7774390e6439" -version = "3.2.1+0" +version = "3.2.2+0" [[deps.NaNMath]] deps = ["OpenLibm_jll"] @@ -1528,9 +1541,11 @@ version = "0.5.5" [[deps.Oceananigans]] deps = ["Adapt", "Crayons", "CubedSphere", "Dates", "Distances", "DocStringExtensions", "FFTW", "GPUArrays", "GPUArraysCore", "Glob", "InteractiveUtils", "IterativeSolvers", "JLD2", "KernelAbstractions", "Krylov", "KrylovPreconditioners", "LinearAlgebra", "Logging", "MPI", "MuladdMacro", "OffsetArrays", "OrderedCollections", "Pkg", "Printf", "Random", "ReactantCore", "Rotations", "SeawaterPolynomials", "SparseArrays", "StaticArrays", "Statistics", "StructArrays"] -git-tree-sha1 = "2dbb3a3965bea0b47f7cf11a5600f6c667798682" +git-tree-sha1 = "955edb7de8328bd1a08219ee4b89bdc2c4770b8b" +repo-rev = "0f4daed7e4107c202ec39d9a0e33d7cd1e22688e" +repo-url = "https://github.com/CliMA/Oceananigans.jl.git" uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09" -version = "0.97.8" +version = "0.98.0" [deps.Oceananigans.extensions] OceananigansAMDGPUExt = "AMDGPU" @@ -1556,7 +1571,9 @@ version = "0.97.8" [[deps.Oceanostics]] deps = ["DocStringExtensions", "Oceananigans", "Printf", "SeawaterPolynomials"] -git-tree-sha1 = "c62798781a831df1ba97ecbb14a4e7f68f8fe9e1" +git-tree-sha1 = "d60b392dd8f6d363209c9026ee0919c5e002491f" +repo-rev = "tc/update-compat" +repo-url = "https://github.com/tomchor/Oceanostics.jl.git" uuid = "d0ccf422-c8fb-49b5-a76d-74acdde946ac" version = "0.16.0" @@ -1611,9 +1628,9 @@ version = "5.0.8+0" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "87510f7292a2b21aeff97912b0898f9553cc5c2c" +git-tree-sha1 = "2ae7d4ddec2e13ad3bddf5c0796f7547cf682391" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.5.1+0" +version = "3.5.2+0" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] @@ -1739,9 +1756,9 @@ version = "1.2.1" [[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6" +git-tree-sha1 = "0f27480397253da18fe2c12a4ba4eb9eb208bf3d" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.4.3" +version = "1.5.0" [[deps.PrettyPrinting]] git-tree-sha1 = "142ee93724a9c5d04d78df7006670a93ed1b244e" @@ -1760,9 +1777,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[deps.ProgressMeter]] deps = ["Distributed", "Printf"] -git-tree-sha1 = "13c5103482a8ed1536a54c08d0e742ae3dca2d42" +git-tree-sha1 = "fbb92c6c56b34e1a2c4c36058f68f332bec840e7" uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "1.10.4" +version = "1.11.0" [[deps.PtrArrays]] git-tree-sha1 = "1d36ef11a9aaf1e8b74dacc6a731dd1de8fd493d" @@ -1930,9 +1947,9 @@ version = "3.7.1" [[deps.ScopedValues]] deps = ["HashArrayMappedTries", "Logging"] -git-tree-sha1 = "7f44eef6b1d284465fafc66baf4d9bdcc239a15b" +git-tree-sha1 = "c3b2323466378a2ba15bea4b2f73b081e022f473" uuid = "7e506255-f358-4e82-b7e4-beb19740aa63" -version = "1.4.0" +version = "1.5.0" [[deps.Scratch]] deps = ["Dates"] @@ -1984,9 +2001,9 @@ version = "0.4.0" [[deps.SimpleTraits]] deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231" +git-tree-sha1 = "be8eeac05ec97d379347584fa9fe2f5f76795bcb" uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.4" +version = "0.9.5" [[deps.Sixel]] deps = ["Dates", "FileIO", "ImageCore", "IndirectArrays", "OffsetArrays", "REPL", "libsixel_jll"] @@ -1999,9 +2016,9 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[deps.SortingAlgorithms]] deps = ["DataStructures"] -git-tree-sha1 = "66e0a8e672a0bdfca2c3f5937efb8538b9ddc085" +git-tree-sha1 = "64d974c2e6fdf07f8155b5b2ca2ffa9069b608d9" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "1.2.1" +version = "1.2.2" [[deps.SparseArrays]] deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] @@ -2054,9 +2071,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "cbea8a6bd7bed51b1619658dec70035e07b8502f" +git-tree-sha1 = "b8693004b385c842357406e3af647701fe783f98" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.14" +version = "1.9.15" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2081,9 +2098,9 @@ version = "1.7.1" [[deps.StatsBase]] deps = ["AliasTables", "DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "b81c5035922cc89c2d9523afc6c54be512411466" +git-tree-sha1 = "2c962245732371acd51700dbb268af311bddd719" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.34.5" +version = "0.34.6" [[deps.StatsFuns]] deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] @@ -2188,9 +2205,9 @@ version = "1.3.0" [[deps.TiffImages]] deps = ["ColorTypes", "DataStructures", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "Inflate", "Mmap", "OffsetArrays", "PkgVersion", "PrecompileTools", "ProgressMeter", "SIMD", "UUIDs"] -git-tree-sha1 = "02aca429c9885d1109e58f400c333521c13d48a0" +git-tree-sha1 = "98b9352a24cb6a2066f9ababcc6802de9aed8ad8" uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" -version = "0.11.4" +version = "0.11.6" [[deps.TiledIteration]] deps = ["OffsetArrays", "StaticArrayInterface"] @@ -2240,9 +2257,9 @@ version = "0.4.1" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "d2282232f8a4d71f79e85dc4dd45e5b12a6297fb" +git-tree-sha1 = "6258d453843c466d84c17a58732dda5deeb8d3af" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.23.1" +version = "1.24.0" weakdeps = ["ConstructionBase", "ForwardDiff", "InverseFunctions", "Printf"] [deps.Unitful.extensions] @@ -2350,6 +2367,12 @@ git-tree-sha1 = "7ed9347888fac59a618302ee38216dd0379c480d" uuid = "ea2f1a96-1ddc-540d-b46f-429655e07cfa" version = "0.9.12+0" +[[deps.Xorg_libpciaccess_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] +git-tree-sha1 = "4909eb8f1cbf6bd4b1c30dd18b2ead9019ef2fad" +uuid = "a65dc6b1-eb27-53a1-bb3e-dea574b5389e" +version = "0.18.1+0" + [[deps.Xorg_libxcb_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libXau_jll", "Xorg_libXdmcp_jll"] git-tree-sha1 = "bfcaf7ec088eaba362093393fe11aa141fa15422" @@ -2405,9 +2428,9 @@ version = "0.2.3+0" [[deps.libaec_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "f5733a5a9047722470b95a81e1b172383971105c" +git-tree-sha1 = "1aa23f01927b2dac46db77a56b31088feee0a491" uuid = "477f73a3-ac25-53e9-8cc3-50b2fa2566f0" -version = "1.1.3+0" +version = "1.1.4+0" [[deps.libaom_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] diff --git a/simulations/AMD.jl b/simulations/AMD.jl deleted file mode 100644 index 08929d4..0000000 --- a/simulations/AMD.jl +++ /dev/null @@ -1,22 +0,0 @@ -using Oceananigans.TurbulenceClosures: _compute_AMD_viscosity! -using Oceananigans.Utils: launch! -import Oceananigans.TurbulenceClosures: compute_diffusivities! - - -function compute_diffusivities!(diffusivity_fields, closure::AnisotropicMinimumDissipation, model; parameters = :xyz) - grid = model.grid - arch = model.architecture - velocities = model.velocities - tracers = model.tracers - buoyancy = model.buoyancy - - launch!(arch, grid, parameters, _compute_AMD_viscosity!, diffusivity_fields.νₑ, grid, closure, buoyancy, velocities, tracers) - - for (tracer_index, κₑ) in enumerate(diffusivity_fields.κₑ) - @inbounds tracer = tracers[tracer_index] - launch!(arch, grid, parameters, _compute_AMD_viscosity!, κₑ, grid, closure, buoyancy, velocities, tracers) - end - - return nothing -end - diff --git a/simulations/run_all_simulations.py b/simulations/run_all_simulations.py index 5a35a24..300150f 100644 --- a/simulations/run_all_simulations.py +++ b/simulations/run_all_simulations.py @@ -42,7 +42,7 @@ def very_small_submission_options(scheduler): if scheduler == "pbs": options = ["select=1:ncpus=1:ngpus=1", - "gpu_type=v100"] + "gpu_type=a100"] options_string = "\n".join([ "#PBS -l " + option for option in options ]) elif scheduler == "slurm": diff --git a/simulations/seamount.jl b/simulations/seamount.jl index 176e4df..72a5af7 100644 --- a/simulations/seamount.jl +++ b/simulations/seamount.jl @@ -98,11 +98,11 @@ function parse_command_line_arguments() arg_type = Float64 "--T_advective_spinup" - default = 10 # Should be a multiple of interval_time_avg + default = 8 # Should be a multiple of interval_time_avg arg_type = Float64 "--T_advective_statistics" - default = 10 # Should be a multiple of interval_time_avg + default = 8 # Should be a multiple of interval_time_avg arg_type = Float64 end @@ -255,10 +255,8 @@ params = (; params..., c_dz = (κᵛᵏ / log(z₁/z₀))^2) # quadratic drag co #--- #+++ Open boundary conditions for velocitities -using Oceananigans.BoundaryConditions: PerturbationAdvectionOpenBoundaryCondition - u_west = OpenBoundaryCondition(params.U∞) -u_east = PerturbationAdvectionOpenBoundaryCondition(params.U∞; inflow_timescale = 2minutes, outflow_timescale = 30minutes) +u_east = OpenBoundaryCondition(params.U∞; scheme = PerturbationAdvection(inflow_timescale = 2minutes, outflow_timescale = 30minutes)) v_west = w_west = ValueBoundaryCondition(0) v_east = w_east = FluxBoundaryCondition(0) @@ -299,9 +297,6 @@ elseif params.closure == "DSM" closure = Smagorinsky(coefficient=DynamicCoefficient(averaging=LagrangianAveraging(), schedule=IterationInterval(5)), Pr=1) elseif params.closure == "AMD" closure = AnisotropicMinimumDissipation(C=1/12) -elseif params.closure == "AMC" - include("AMD.jl") - closure = AnisotropicMinimumDissipation(C=1/12) elseif params.closure == "NON" closure = nothing else