From 0f73329993fc0c9f1de479756fe54b7a8018fe01 Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Fri, 15 May 2026 12:40:00 -0700 Subject: [PATCH] remove SciMLBase dep --- Project.toml | 4 +- docs/src/interfacer.md | 2 +- experiments/AMIP/Manifest-v1.11.toml | 164 ++----------------------- experiments/AMIP/Manifest.toml | 174 +++------------------------ experiments/AMIP/Project.toml | 3 +- experiments/CMIP/Manifest-v1.11.toml | 128 ++------------------ experiments/CMIP/Manifest.toml | 138 +++------------------ experiments/CMIP/Project.toml | 4 +- ext/ClimaCouplerClimaLandExt.jl | 1 - src/Interfacer.jl | 13 +- src/Models/prescr_seaice.jl | 6 +- src/Models/slab_ocean.jl | 6 +- src/surface_stub.jl | 3 +- 13 files changed, 78 insertions(+), 568 deletions(-) diff --git a/Project.toml b/Project.toml index fb69190b58..f082a31336 100644 --- a/Project.toml +++ b/Project.toml @@ -22,7 +22,6 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" @@ -62,7 +61,7 @@ ClimaLand = "1.8" ClimaOcean = "0.9.5" ClimaParams = "1.0" ClimaSeaIce = "0.4" -ClimaTimeSteppers = "0.7, 0.8, 0.9" +ClimaTimeSteppers = "0.8.11, 0.9" ClimaUtilities = "0.1.22" Dates = "1" GeoMakie = "0.7" @@ -79,7 +78,6 @@ Oceananigans = "0.107" Poppler_jll = "24" Printf = "1" Random = "1" -SciMLBase = "~2.110, ~2.111, ~2.112" StaticArrays = "1.9.8" Statistics = "1" SurfaceFluxes = "0.15.0, 1" diff --git a/docs/src/interfacer.md b/docs/src/interfacer.md index 8d88530a1a..86fa5657e9 100644 --- a/docs/src/interfacer.md +++ b/docs/src/interfacer.md @@ -38,7 +38,7 @@ function varies across component models. - `step!(::AbstractComponentSimulation, t)`: A function to update the simulation in-place with values calculate for time `t`. For the models we currently have implemented, this is a simple wrapper around -the `step!` function implemented in SciMLBase.jl. +the `step!` function implemented in ClimaTimeSteppers.jl. ### AbstractComponentSimulation - optional functions - `Checkpointer.get_model_prog_state(::AbstractComponentSimulation)`: diff --git a/experiments/AMIP/Manifest-v1.11.toml b/experiments/AMIP/Manifest-v1.11.toml index 1b16c786a4..f630a16faf 100644 --- a/experiments/AMIP/Manifest-v1.11.toml +++ b/experiments/AMIP/Manifest-v1.11.toml @@ -2,7 +2,7 @@ julia_version = "1.11.9" manifest_format = "2.0" -project_hash = "a11afd3d4e44404bb9c9da311912244791114883" +project_hash = "ba433f70522e20f16a6ac0ab2a21fa8a20341885" [[deps.ADTypes]] git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd" @@ -352,9 +352,9 @@ version = "0.4.3+0" [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "TOML"] -git-tree-sha1 = "69bb8fdf66c687e35149ac9b2bd1d582fd58a792" +git-tree-sha1 = "23c51e2c9bb36be09c3f10f92d0b9cc294e1bc5e" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "13.2.1+2" +version = "13.2.1+3" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] @@ -475,7 +475,7 @@ uuid = "908f55d8-4145-4867-9c14-5dad1a479e4d" version = "0.4.7" [[deps.ClimaCoupler]] -deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] +deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] path = "../.." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.1.2" @@ -664,22 +664,12 @@ git-tree-sha1 = "bf07704e843daabd2cb2bb1404571656f80bce16" uuid = "1fbeeb36-5f17-413c-809b-666fb144f157" version = "0.4.3" -[[deps.CommonSolve]] -git-tree-sha1 = "78ea4ddbcf9c241827e7035c3a03e2e456711470" -uuid = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2" -version = "0.2.6" - [[deps.CommonSubexpressions]] deps = ["MacroTools"] git-tree-sha1 = "cda2cfaebb4be89c9084adaca7dd7333369715c5" uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" version = "0.3.1" -[[deps.CommonWorldInvalidations]] -git-tree-sha1 = "ae52d1c52048455e85a387fbee9be553ec2b68d0" -uuid = "f70d9fcc-98c5-4d4a-abd7-e4cdeebd8ca8" -version = "1.0.0" - [[deps.Compat]] deps = ["TOML", "UUIDs"] git-tree-sha1 = "9d8a54ce4b17aa5bdce0ea5c34bc5e7c340d16ad" @@ -966,11 +956,6 @@ git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" version = "0.1.10" -[[deps.ExproniconLite]] -git-tree-sha1 = "c13f0b150373771b0fdc1713c97860f8df12e6c2" -uuid = "55351af7-c7e9-48d6-89ff-24e801d99491" -version = "0.10.14" - [[deps.Extents]] git-tree-sha1 = "b309b36a9e02fe7be71270dd8c0fd873625332b4" uuid = "411431e0-e8b7-467b-b5e0-f676ba4f2910" @@ -1180,17 +1165,6 @@ git-tree-sha1 = "7a214fdac5ed5f59a22c2d9a885a16da1c74bbc7" uuid = "559328eb-81f9-559d-9380-de523a88c83c" version = "1.0.17+0" -[[deps.FunctionWrappers]] -git-tree-sha1 = "d62485945ce5ae9c0c48f124a84998d755bae00e" -uuid = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e" -version = "1.1.3" - -[[deps.FunctionWrappersWrappers]] -deps = ["FunctionWrappers"] -git-tree-sha1 = "b104d487b34566608f8b4e1c39fb0b10aa279ff8" -uuid = "77dc65aa-8811-40c2-897b-53d922fa7daf" -version = "0.1.3" - [[deps.Functors]] deps = ["Compat", "ConstructionBase", "LinearAlgebra", "Random"] git-tree-sha1 = "60a0339f28a233601cb74468032b5c302d5067de" @@ -1204,9 +1178,9 @@ version = "1.11.0" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "KernelAbstractions", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "ScopedValues", "Serialization", "SparseArrays", "Statistics"] -git-tree-sha1 = "34fd745547978beb471f029f447290ef4dbc7bbd" +git-tree-sha1 = "cf230532c7871ce9bfa5812dd699cb68da888364" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "11.5.3" +version = "11.5.4" weakdeps = ["JLD2"] [deps.GPUArrays.extensions] @@ -1410,11 +1384,6 @@ git-tree-sha1 = "57e9ce6cf68d0abf5cb6b3b4abf9bedf05c939c0" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" version = "0.4.15" -[[deps.IfElse]] -git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" -uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" -version = "0.1.1" - [[deps.ImageAxes]] deps = ["AxisArrays", "ImageBase", "ImageCore", "Reexport", "SimpleTraits"] git-tree-sha1 = "e12629406c6c4442539436581041d372d69c55ba" @@ -1611,12 +1580,6 @@ version = "1.14.3" [deps.JSON3.weakdeps] ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd" -[[deps.Jieko]] -deps = ["ExproniconLite"] -git-tree-sha1 = "2f05ed29618da60c06a87e9c033982d4f71d0b6c" -uuid = "ae98c720-c025-4a4a-838c-29b094483192" -version = "0.2.1" - [[deps.JpegTurbo]] deps = ["CEnum", "FileIO", "ImageCore", "JpegTurbo_jll", "TOML"] git-tree-sha1 = "9496de8fb52c224a2e3f9ff403947674517317d9" @@ -2092,12 +2055,6 @@ git-tree-sha1 = "7b86a5d4d70a9f5cdf2dacb3cbe6d251d1a61dbe" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" version = "0.3.4" -[[deps.Moshi]] -deps = ["ExproniconLite", "Jieko"] -git-tree-sha1 = "53f817d3e84537d84545e0ad749e483412dd6b2a" -uuid = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d" -version = "0.3.7" - [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" version = "2023.12.12" @@ -2118,9 +2075,9 @@ weakdeps = ["Adapt", "CUDA"] [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "7c25249fc13a070f5ba433c50e21e22bb33c6fb0" +git-tree-sha1 = "dc5b2c4c111c46bc79ac4405eeb563523b39c004" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.7.1" +version = "1.8.0" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] @@ -2187,10 +2144,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "1.1.3" [[deps.NaNStatistics]] -deps = ["PrecompileTools", "Static", "StaticArrayInterface"] -git-tree-sha1 = "d40d2359680061c5c61d5e324805ebf2ef0d8816" +deps = ["PrecompileTools"] +git-tree-sha1 = "a9ec1b5e6a3285f0f92d0a9ce825f115a6265cf2" uuid = "b946abbf-3ea7-4610-9019-9858bfdeaf2d" -version = "0.6.56" +version = "0.6.57" [deps.NaNStatistics.extensions] NaNStatisticsDimensionalDataExt = "DimensionalData" @@ -2457,22 +2414,6 @@ git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" version = "0.2.4" -[[deps.PreallocationTools]] -deps = ["Adapt", "ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "c05b4c6325262152483a1ecb6c69846d2e01727b" -uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.34" - - [deps.PreallocationTools.extensions] - PreallocationToolsForwardDiffExt = "ForwardDiff" - PreallocationToolsReverseDiffExt = "ReverseDiff" - PreallocationToolsSparseConnectivityTracerExt = "SparseConnectivityTracer" - - [deps.PreallocationTools.weakdeps] - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5" - [[deps.PrecompileTools]] deps = ["Preferences"] git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" @@ -2742,73 +2683,11 @@ git-tree-sha1 = "81ec49d645af090901120a1542e67ecbbe044db3" uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" version = "0.1.0" -[[deps.SciMLBase]] -deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PreallocationTools", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "a06d451a6d0fa6e6da34d047d61af8beb187b0f1" -uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.112.0" - - [deps.SciMLBase.extensions] - SciMLBaseChainRulesCoreExt = "ChainRulesCore" - SciMLBaseDistributionsExt = "Distributions" - SciMLBaseForwardDiffExt = "ForwardDiff" - SciMLBaseMLStyleExt = "MLStyle" - SciMLBaseMakieExt = "Makie" - SciMLBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements" - SciMLBaseMooncakeExt = "Mooncake" - SciMLBasePartialFunctionsExt = "PartialFunctions" - SciMLBasePyCallExt = "PyCall" - SciMLBasePythonCallExt = "PythonCall" - SciMLBaseRCallExt = "RCall" - SciMLBaseReverseDiffExt = "ReverseDiff" - SciMLBaseTrackerExt = "Tracker" - SciMLBaseZygoteExt = ["Zygote", "ChainRulesCore"] - - [deps.SciMLBase.weakdeps] - ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2" - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078" - Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" - Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" - MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" - Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6" - PartialFunctions = "570af359-4316-4cb7-8c74-252c00c2016b" - PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" - PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" - RCall = "6f49c342-dc21-5d91-9882-a32aef131414" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" - Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" - -[[deps.SciMLOperators]] -deps = ["Accessors", "Adapt", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "SafeTestsets"] -git-tree-sha1 = "50e6ec6879eab12b039924d5a10b91c95bf9bf7f" -uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "1.21.0" - - [deps.SciMLOperators.extensions] - SciMLOperatorsLoopVectorizationExt = "LoopVectorization" - SciMLOperatorsSparseArraysExt = "SparseArrays" - SciMLOperatorsStaticArraysCoreExt = "StaticArraysCore" - - [deps.SciMLOperators.weakdeps] - LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890" - SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" - [[deps.SciMLPublic]] git-tree-sha1 = "0ba076dbdce87ba230fff48ca9bca62e1f345c9b" uuid = "431bcebd-1456-4ced-9d72-93c2757fff0b" version = "1.0.1" -[[deps.SciMLStructures]] -deps = ["ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "607f6867d0b0553e98fc7f725c9f9f13b4d01a32" -uuid = "53ae85a6-f571-4167-b2af-e1d143709226" -version = "1.10.0" - [[deps.ScopedValues]] deps = ["HashArrayMappedTries", "Logging"] git-tree-sha1 = "67a144433c4ce877ee6d1ada69a124d6b1ecf7be" @@ -2950,23 +2829,6 @@ git-tree-sha1 = "be1cf4eb0ac528d96f5115b4ed80c26a8d8ae621" uuid = "cae243ae-269e-4f55-b966-ac2d0dc13c15" version = "0.1.2" -[[deps.Static]] -deps = ["CommonWorldInvalidations", "IfElse", "PrecompileTools", "SciMLPublic"] -git-tree-sha1 = "bb072715f158b59ad8819ff80da5ffa90cce6ceb" -uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "1.4.0" - -[[deps.StaticArrayInterface]] -deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools", "SciMLPublic", "Static"] -git-tree-sha1 = "2a635e15d5035c53b345077c947f31ff91744078" -uuid = "0d7ed370-da01-4f52-bd93-41d350b8b718" -version = "1.10.0" -weakdeps = ["OffsetArrays", "StaticArrays"] - - [deps.StaticArrayInterface.extensions] - StaticArrayInterfaceOffsetArraysExt = "OffsetArrays" - StaticArrayInterfaceStaticArraysExt = "StaticArrays" - [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] git-tree-sha1 = "246a8bb2e6667f832eea063c3a56aef96429a3db" @@ -3050,9 +2912,9 @@ version = "1.11.0" [[deps.StructUtils]] deps = ["Dates", "UUIDs"] -git-tree-sha1 = "dd974aefe288ef2898733aecf40858dc86742d74" +git-tree-sha1 = "82bee338d650aa515f31866c460cb7e3bcef90b8" uuid = "ec057cc2-7a8d-4b58-b3b3-92acb9f63b42" -version = "2.8.1" +version = "2.8.2" [deps.StructUtils.extensions] StructUtilsMeasurementsExt = ["Measurements"] diff --git a/experiments/AMIP/Manifest.toml b/experiments/AMIP/Manifest.toml index dc7780be9d..81240c845b 100644 --- a/experiments/AMIP/Manifest.toml +++ b/experiments/AMIP/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.11" +julia_version = "1.10.10" manifest_format = "2.0" -project_hash = "c71f46af9c5e555f1560f963acfb5322b8a975b5" +project_hash = "57c7ff52380431fbdbd559fb4b205a4efc0270ff" [[deps.ADTypes]] git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd" @@ -349,9 +349,9 @@ version = "0.4.3+0" [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "TOML"] -git-tree-sha1 = "69bb8fdf66c687e35149ac9b2bd1d582fd58a792" +git-tree-sha1 = "23c51e2c9bb36be09c3f10f92d0b9cc294e1bc5e" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "13.2.1+2" +version = "13.2.1+3" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] @@ -472,7 +472,7 @@ uuid = "908f55d8-4145-4867-9c14-5dad1a479e4d" version = "0.4.7" [[deps.ClimaCoupler]] -deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] +deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] path = "../.." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.1.2" @@ -663,22 +663,12 @@ git-tree-sha1 = "bf07704e843daabd2cb2bb1404571656f80bce16" uuid = "1fbeeb36-5f17-413c-809b-666fb144f157" version = "0.4.3" -[[deps.CommonSolve]] -git-tree-sha1 = "78ea4ddbcf9c241827e7035c3a03e2e456711470" -uuid = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2" -version = "0.2.6" - [[deps.CommonSubexpressions]] deps = ["MacroTools"] git-tree-sha1 = "cda2cfaebb4be89c9084adaca7dd7333369715c5" uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" version = "0.3.1" -[[deps.CommonWorldInvalidations]] -git-tree-sha1 = "ae52d1c52048455e85a387fbee9be553ec2b68d0" -uuid = "f70d9fcc-98c5-4d4a-abd7-e4cdeebd8ca8" -version = "1.0.0" - [[deps.Compat]] deps = ["TOML", "UUIDs"] git-tree-sha1 = "9d8a54ce4b17aa5bdce0ea5c34bc5e7c340d16ad" @@ -963,11 +953,6 @@ git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" version = "0.1.10" -[[deps.ExproniconLite]] -git-tree-sha1 = "c13f0b150373771b0fdc1713c97860f8df12e6c2" -uuid = "55351af7-c7e9-48d6-89ff-24e801d99491" -version = "0.10.14" - [[deps.Extents]] git-tree-sha1 = "b309b36a9e02fe7be71270dd8c0fd873625332b4" uuid = "411431e0-e8b7-467b-b5e0-f676ba4f2910" @@ -1176,17 +1161,6 @@ git-tree-sha1 = "7a214fdac5ed5f59a22c2d9a885a16da1c74bbc7" uuid = "559328eb-81f9-559d-9380-de523a88c83c" version = "1.0.17+0" -[[deps.FunctionWrappers]] -git-tree-sha1 = "d62485945ce5ae9c0c48f124a84998d755bae00e" -uuid = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e" -version = "1.1.3" - -[[deps.FunctionWrappersWrappers]] -deps = ["FunctionWrappers"] -git-tree-sha1 = "b104d487b34566608f8b4e1c39fb0b10aa279ff8" -uuid = "77dc65aa-8811-40c2-897b-53d922fa7daf" -version = "0.1.3" - [[deps.Functors]] deps = ["Compat", "ConstructionBase", "LinearAlgebra", "Random"] git-tree-sha1 = "60a0339f28a233601cb74468032b5c302d5067de" @@ -1199,9 +1173,9 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "KernelAbstractions", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "ScopedValues", "Serialization", "SparseArrays", "Statistics"] -git-tree-sha1 = "34fd745547978beb471f029f447290ef4dbc7bbd" +git-tree-sha1 = "cf230532c7871ce9bfa5812dd699cb68da888364" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "11.5.3" +version = "11.5.4" weakdeps = ["JLD2"] [deps.GPUArrays.extensions] @@ -1405,11 +1379,6 @@ git-tree-sha1 = "57e9ce6cf68d0abf5cb6b3b4abf9bedf05c939c0" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" version = "0.4.15" -[[deps.IfElse]] -git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" -uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" -version = "0.1.1" - [[deps.ImageAxes]] deps = ["AxisArrays", "ImageBase", "ImageCore", "Reexport", "SimpleTraits"] git-tree-sha1 = "e12629406c6c4442539436581041d372d69c55ba" @@ -1605,12 +1574,6 @@ version = "1.14.3" [deps.JSON3.weakdeps] ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd" -[[deps.Jieko]] -deps = ["ExproniconLite"] -git-tree-sha1 = "2f05ed29618da60c06a87e9c033982d4f71d0b6c" -uuid = "ae98c720-c025-4a4a-838c-29b094483192" -version = "0.2.1" - [[deps.JpegTurbo]] deps = ["CEnum", "FileIO", "ImageCore", "JpegTurbo_jll", "TOML"] git-tree-sha1 = "9496de8fb52c224a2e3f9ff403947674517317d9" @@ -2050,7 +2013,7 @@ version = "0.6.7" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.1010+0" +version = "2.28.2+1" [[deps.MicroCollections]] deps = ["Accessors", "BangBang", "InitialValues"] @@ -2079,15 +2042,9 @@ git-tree-sha1 = "7b86a5d4d70a9f5cdf2dacb3cbe6d251d1a61dbe" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" version = "0.3.4" -[[deps.Moshi]] -deps = ["ExproniconLite", "Jieko"] -git-tree-sha1 = "53f817d3e84537d84545e0ad749e483412dd6b2a" -uuid = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d" -version = "0.3.7" - [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2025.12.2" +version = "2023.1.10" [[deps.MuladdMacro]] git-tree-sha1 = "cac9cc5499c25554cba55cd3c30543cff5ca4fab" @@ -2105,9 +2062,9 @@ weakdeps = ["Adapt", "CUDA"] [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "7c25249fc13a070f5ba433c50e21e22bb33c6fb0" +git-tree-sha1 = "dc5b2c4c111c46bc79ac4405eeb563523b39c004" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.7.1" +version = "1.8.0" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] @@ -2174,10 +2131,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "1.1.3" [[deps.NaNStatistics]] -deps = ["PrecompileTools", "Static", "StaticArrayInterface"] -git-tree-sha1 = "d40d2359680061c5c61d5e324805ebf2ef0d8816" +deps = ["PrecompileTools"] +git-tree-sha1 = "a9ec1b5e6a3285f0f92d0a9ce825f115a6265cf2" uuid = "b946abbf-3ea7-4610-9019-9858bfdeaf2d" -version = "0.6.56" +version = "0.6.57" [deps.NaNStatistics.extensions] NaNStatisticsDimensionalDataExt = "DimensionalData" @@ -2263,7 +2220,7 @@ version = "0.3.29+0" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.23+5" +version = "0.3.23+4" [[deps.OpenEXR]] deps = ["Colors", "FileIO", "OpenEXR_jll"] @@ -2440,22 +2397,6 @@ git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" version = "0.2.4" -[[deps.PreallocationTools]] -deps = ["Adapt", "ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "c05b4c6325262152483a1ecb6c69846d2e01727b" -uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.34" - - [deps.PreallocationTools.extensions] - PreallocationToolsForwardDiffExt = "ForwardDiff" - PreallocationToolsReverseDiffExt = "ReverseDiff" - PreallocationToolsSparseConnectivityTracerExt = "SparseConnectivityTracer" - - [deps.PreallocationTools.weakdeps] - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5" - [[deps.PrecompileTools]] deps = ["Preferences"] git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" @@ -2722,73 +2663,11 @@ git-tree-sha1 = "81ec49d645af090901120a1542e67ecbbe044db3" uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" version = "0.1.0" -[[deps.SciMLBase]] -deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PreallocationTools", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "a06d451a6d0fa6e6da34d047d61af8beb187b0f1" -uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.112.0" - - [deps.SciMLBase.extensions] - SciMLBaseChainRulesCoreExt = "ChainRulesCore" - SciMLBaseDistributionsExt = "Distributions" - SciMLBaseForwardDiffExt = "ForwardDiff" - SciMLBaseMLStyleExt = "MLStyle" - SciMLBaseMakieExt = "Makie" - SciMLBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements" - SciMLBaseMooncakeExt = "Mooncake" - SciMLBasePartialFunctionsExt = "PartialFunctions" - SciMLBasePyCallExt = "PyCall" - SciMLBasePythonCallExt = "PythonCall" - SciMLBaseRCallExt = "RCall" - SciMLBaseReverseDiffExt = "ReverseDiff" - SciMLBaseTrackerExt = "Tracker" - SciMLBaseZygoteExt = ["Zygote", "ChainRulesCore"] - - [deps.SciMLBase.weakdeps] - ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2" - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078" - Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" - Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" - MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" - Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6" - PartialFunctions = "570af359-4316-4cb7-8c74-252c00c2016b" - PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" - PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" - RCall = "6f49c342-dc21-5d91-9882-a32aef131414" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" - Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" - -[[deps.SciMLOperators]] -deps = ["Accessors", "Adapt", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "SafeTestsets"] -git-tree-sha1 = "50e6ec6879eab12b039924d5a10b91c95bf9bf7f" -uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "1.21.0" - - [deps.SciMLOperators.extensions] - SciMLOperatorsLoopVectorizationExt = "LoopVectorization" - SciMLOperatorsSparseArraysExt = "SparseArrays" - SciMLOperatorsStaticArraysCoreExt = "StaticArraysCore" - - [deps.SciMLOperators.weakdeps] - LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890" - SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" - [[deps.SciMLPublic]] git-tree-sha1 = "0ba076dbdce87ba230fff48ca9bca62e1f345c9b" uuid = "431bcebd-1456-4ced-9d72-93c2757fff0b" version = "1.0.1" -[[deps.SciMLStructures]] -deps = ["ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "607f6867d0b0553e98fc7f725c9f9f13b4d01a32" -uuid = "53ae85a6-f571-4167-b2af-e1d143709226" -version = "1.10.0" - [[deps.ScopedValues]] deps = ["HashArrayMappedTries", "Logging"] git-tree-sha1 = "67a144433c4ce877ee6d1ada69a124d6b1ecf7be" @@ -2927,23 +2806,6 @@ git-tree-sha1 = "be1cf4eb0ac528d96f5115b4ed80c26a8d8ae621" uuid = "cae243ae-269e-4f55-b966-ac2d0dc13c15" version = "0.1.2" -[[deps.Static]] -deps = ["CommonWorldInvalidations", "IfElse", "PrecompileTools", "SciMLPublic"] -git-tree-sha1 = "bb072715f158b59ad8819ff80da5ffa90cce6ceb" -uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "1.4.0" - -[[deps.StaticArrayInterface]] -deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools", "SciMLPublic", "Static"] -git-tree-sha1 = "2a635e15d5035c53b345077c947f31ff91744078" -uuid = "0d7ed370-da01-4f52-bd93-41d350b8b718" -version = "1.10.0" -weakdeps = ["OffsetArrays", "StaticArrays"] - - [deps.StaticArrayInterface.extensions] - StaticArrayInterfaceOffsetArraysExt = "OffsetArrays" - StaticArrayInterfaceStaticArraysExt = "StaticArrays" - [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] git-tree-sha1 = "246a8bb2e6667f832eea063c3a56aef96429a3db" @@ -3022,9 +2884,9 @@ version = "1.11.0" [[deps.StructUtils]] deps = ["Dates", "UUIDs"] -git-tree-sha1 = "dd974aefe288ef2898733aecf40858dc86742d74" +git-tree-sha1 = "82bee338d650aa515f31866c460cb7e3bcef90b8" uuid = "ec057cc2-7a8d-4b58-b3b3-92acb9f63b42" -version = "2.8.1" +version = "2.8.2" [deps.StructUtils.extensions] StructUtilsMeasurementsExt = ["Measurements"] @@ -3529,7 +3391,7 @@ version = "2022.3.0+0" [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" -version = "17.6.1+0" +version = "17.4.0+2" [[deps.s2n_tls_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] diff --git a/experiments/AMIP/Project.toml b/experiments/AMIP/Project.toml index 41630bef94..52abf6d597 100644 --- a/experiments/AMIP/Project.toml +++ b/experiments/AMIP/Project.toml @@ -29,7 +29,6 @@ Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b" PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" -SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" @@ -40,7 +39,7 @@ CUDA = "5" ClimaCalibrate = "0.3" ClimaLand = "1.7" ClimaParams = "1.0" -ClimaTimeSteppers = "0.7, 0.8, 0.9" +ClimaTimeSteppers = "0.8.11, 0.9" ClimaUtilities = "0.1" Insolation = "1.1" Interpolations = "0.14, 0.15" diff --git a/experiments/CMIP/Manifest-v1.11.toml b/experiments/CMIP/Manifest-v1.11.toml index 1026721f98..988b0dc69d 100644 --- a/experiments/CMIP/Manifest-v1.11.toml +++ b/experiments/CMIP/Manifest-v1.11.toml @@ -2,7 +2,7 @@ julia_version = "1.11.9" manifest_format = "2.0" -project_hash = "153f9afc626de3120f11c4ecc15dcde58784cb28" +project_hash = "fc8bb63389ffe417e790658ea570c4671c9d7e7d" [[deps.ADTypes]] git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd" @@ -363,9 +363,9 @@ version = "0.4.3+0" [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "TOML"] -git-tree-sha1 = "69bb8fdf66c687e35149ac9b2bd1d582fd58a792" +git-tree-sha1 = "23c51e2c9bb36be09c3f10f92d0b9cc294e1bc5e" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "13.2.1+2" +version = "13.2.1+3" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] @@ -499,7 +499,7 @@ uuid = "908f55d8-4145-4867-9c14-5dad1a479e4d" version = "0.4.7" [[deps.ClimaCoupler]] -deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] +deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] path = "../.." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.1.2" @@ -1052,11 +1052,6 @@ git-tree-sha1 = "5f1c005ed214356bbe41d442cc1ccd416e510b7e" uuid = "21656369-7473-754a-2065-74616d696c43" version = "1.1.4" -[[deps.ExproniconLite]] -git-tree-sha1 = "c13f0b150373771b0fdc1713c97860f8df12e6c2" -uuid = "55351af7-c7e9-48d6-89ff-24e801d99491" -version = "0.10.14" - [[deps.Extents]] git-tree-sha1 = "b309b36a9e02fe7be71270dd8c0fd873625332b4" uuid = "411431e0-e8b7-467b-b5e0-f676ba4f2910" @@ -1264,17 +1259,6 @@ git-tree-sha1 = "7a214fdac5ed5f59a22c2d9a885a16da1c74bbc7" uuid = "559328eb-81f9-559d-9380-de523a88c83c" version = "1.0.17+0" -[[deps.FunctionWrappers]] -git-tree-sha1 = "d62485945ce5ae9c0c48f124a84998d755bae00e" -uuid = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e" -version = "1.1.3" - -[[deps.FunctionWrappersWrappers]] -deps = ["FunctionWrappers"] -git-tree-sha1 = "b104d487b34566608f8b4e1c39fb0b10aa279ff8" -uuid = "77dc65aa-8811-40c2-897b-53d922fa7daf" -version = "0.1.3" - [[deps.Functors]] deps = ["Compat", "ConstructionBase", "LinearAlgebra", "Random"] git-tree-sha1 = "60a0339f28a233601cb74468032b5c302d5067de" @@ -1288,9 +1272,9 @@ version = "1.11.0" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "KernelAbstractions", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "ScopedValues", "Serialization", "SparseArrays", "Statistics"] -git-tree-sha1 = "34fd745547978beb471f029f447290ef4dbc7bbd" +git-tree-sha1 = "cf230532c7871ce9bfa5812dd699cb68da888364" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "11.5.3" +version = "11.5.4" weakdeps = ["JLD2"] [deps.GPUArrays.extensions] @@ -1716,12 +1700,6 @@ version = "1.14.3" [deps.JSON3.weakdeps] ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd" -[[deps.Jieko]] -deps = ["ExproniconLite"] -git-tree-sha1 = "2f05ed29618da60c06a87e9c033982d4f71d0b6c" -uuid = "ae98c720-c025-4a4a-838c-29b094483192" -version = "0.2.1" - [[deps.JpegTurbo]] deps = ["CEnum", "FileIO", "ImageCore", "JpegTurbo_jll", "TOML"] git-tree-sha1 = "9496de8fb52c224a2e3f9ff403947674517317d9" @@ -2244,12 +2222,6 @@ git-tree-sha1 = "7b86a5d4d70a9f5cdf2dacb3cbe6d251d1a61dbe" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" version = "0.3.4" -[[deps.Moshi]] -deps = ["ExproniconLite", "Jieko"] -git-tree-sha1 = "53f817d3e84537d84545e0ad749e483412dd6b2a" -uuid = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d" -version = "0.3.7" - [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" version = "2023.12.12" @@ -2270,9 +2242,9 @@ weakdeps = ["Adapt", "CUDA"] [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "7c25249fc13a070f5ba433c50e21e22bb33c6fb0" +git-tree-sha1 = "dc5b2c4c111c46bc79ac4405eeb563523b39c004" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.7.1" +version = "1.8.0" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] @@ -2339,10 +2311,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "1.1.3" [[deps.NaNStatistics]] -deps = ["PrecompileTools", "Static", "StaticArrayInterface"] -git-tree-sha1 = "d40d2359680061c5c61d5e324805ebf2ef0d8816" +deps = ["PrecompileTools"] +git-tree-sha1 = "a9ec1b5e6a3285f0f92d0a9ce825f115a6265cf2" uuid = "b946abbf-3ea7-4610-9019-9858bfdeaf2d" -version = "0.6.56" +version = "0.6.57" [deps.NaNStatistics.extensions] NaNStatisticsDimensionalDataExt = "DimensionalData" @@ -2664,22 +2636,6 @@ git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" version = "0.2.4" -[[deps.PreallocationTools]] -deps = ["Adapt", "ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "c05b4c6325262152483a1ecb6c69846d2e01727b" -uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.34" - - [deps.PreallocationTools.extensions] - PreallocationToolsForwardDiffExt = "ForwardDiff" - PreallocationToolsReverseDiffExt = "ReverseDiff" - PreallocationToolsSparseConnectivityTracerExt = "SparseConnectivityTracer" - - [deps.PreallocationTools.weakdeps] - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5" - [[deps.PrecompileTools]] deps = ["Preferences"] git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" @@ -3004,69 +2960,11 @@ git-tree-sha1 = "81ec49d645af090901120a1542e67ecbbe044db3" uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" version = "0.1.0" -[[deps.SciMLBase]] -deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PreallocationTools", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "a06d451a6d0fa6e6da34d047d61af8beb187b0f1" -uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.112.0" - - [deps.SciMLBase.extensions] - SciMLBaseChainRulesCoreExt = "ChainRulesCore" - SciMLBaseDistributionsExt = "Distributions" - SciMLBaseForwardDiffExt = "ForwardDiff" - SciMLBaseMLStyleExt = "MLStyle" - SciMLBaseMakieExt = "Makie" - SciMLBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements" - SciMLBaseMooncakeExt = "Mooncake" - SciMLBasePartialFunctionsExt = "PartialFunctions" - SciMLBasePyCallExt = "PyCall" - SciMLBasePythonCallExt = "PythonCall" - SciMLBaseRCallExt = "RCall" - SciMLBaseReverseDiffExt = "ReverseDiff" - SciMLBaseTrackerExt = "Tracker" - SciMLBaseZygoteExt = ["Zygote", "ChainRulesCore"] - - [deps.SciMLBase.weakdeps] - ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2" - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078" - Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" - Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" - MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" - Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6" - PartialFunctions = "570af359-4316-4cb7-8c74-252c00c2016b" - PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" - PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" - RCall = "6f49c342-dc21-5d91-9882-a32aef131414" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" - Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" - -[[deps.SciMLOperators]] -deps = ["Accessors", "Adapt", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "SafeTestsets"] -git-tree-sha1 = "50e6ec6879eab12b039924d5a10b91c95bf9bf7f" -uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "1.21.0" -weakdeps = ["LoopVectorization", "SparseArrays", "StaticArraysCore"] - - [deps.SciMLOperators.extensions] - SciMLOperatorsLoopVectorizationExt = "LoopVectorization" - SciMLOperatorsSparseArraysExt = "SparseArrays" - SciMLOperatorsStaticArraysCoreExt = "StaticArraysCore" - [[deps.SciMLPublic]] git-tree-sha1 = "0ba076dbdce87ba230fff48ca9bca62e1f345c9b" uuid = "431bcebd-1456-4ced-9d72-93c2757fff0b" version = "1.0.1" -[[deps.SciMLStructures]] -deps = ["ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "607f6867d0b0553e98fc7f725c9f9f13b4d01a32" -uuid = "53ae85a6-f571-4167-b2af-e1d143709226" -version = "1.10.0" - [[deps.ScopedValues]] deps = ["HashArrayMappedTries", "Logging"] git-tree-sha1 = "67a144433c4ce877ee6d1ada69a124d6b1ecf7be" @@ -3318,9 +3216,9 @@ version = "1.11.0" [[deps.StructUtils]] deps = ["Dates", "UUIDs"] -git-tree-sha1 = "dd974aefe288ef2898733aecf40858dc86742d74" +git-tree-sha1 = "82bee338d650aa515f31866c460cb7e3bcef90b8" uuid = "ec057cc2-7a8d-4b58-b3b3-92acb9f63b42" -version = "2.8.1" +version = "2.8.2" [deps.StructUtils.extensions] StructUtilsMeasurementsExt = ["Measurements"] diff --git a/experiments/CMIP/Manifest.toml b/experiments/CMIP/Manifest.toml index 46e01db775..b790ce0469 100644 --- a/experiments/CMIP/Manifest.toml +++ b/experiments/CMIP/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.11" +julia_version = "1.10.10" manifest_format = "2.0" -project_hash = "c1fdfc47c6204bc91092dde63b0419aed1b4ac9e" +project_hash = "0e1f1db649c2356f28c5789c89e3d281b0da81e0" [[deps.ADTypes]] git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd" @@ -360,9 +360,9 @@ version = "0.4.3+0" [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "TOML"] -git-tree-sha1 = "69bb8fdf66c687e35149ac9b2bd1d582fd58a792" +git-tree-sha1 = "23c51e2c9bb36be09c3f10f92d0b9cc294e1bc5e" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "13.2.1+2" +version = "13.2.1+3" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] @@ -496,7 +496,7 @@ uuid = "908f55d8-4145-4867-9c14-5dad1a479e4d" version = "0.4.7" [[deps.ClimaCoupler]] -deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] +deps = ["ArgParse", "ClimaAnalysis", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "Insolation", "Interpolations", "JLD2", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Random", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] path = "../.." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.1.2" @@ -1049,11 +1049,6 @@ git-tree-sha1 = "5f1c005ed214356bbe41d442cc1ccd416e510b7e" uuid = "21656369-7473-754a-2065-74616d696c43" version = "1.1.4" -[[deps.ExproniconLite]] -git-tree-sha1 = "c13f0b150373771b0fdc1713c97860f8df12e6c2" -uuid = "55351af7-c7e9-48d6-89ff-24e801d99491" -version = "0.10.14" - [[deps.Extents]] git-tree-sha1 = "b309b36a9e02fe7be71270dd8c0fd873625332b4" uuid = "411431e0-e8b7-467b-b5e0-f676ba4f2910" @@ -1260,17 +1255,6 @@ git-tree-sha1 = "7a214fdac5ed5f59a22c2d9a885a16da1c74bbc7" uuid = "559328eb-81f9-559d-9380-de523a88c83c" version = "1.0.17+0" -[[deps.FunctionWrappers]] -git-tree-sha1 = "d62485945ce5ae9c0c48f124a84998d755bae00e" -uuid = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e" -version = "1.1.3" - -[[deps.FunctionWrappersWrappers]] -deps = ["FunctionWrappers"] -git-tree-sha1 = "b104d487b34566608f8b4e1c39fb0b10aa279ff8" -uuid = "77dc65aa-8811-40c2-897b-53d922fa7daf" -version = "0.1.3" - [[deps.Functors]] deps = ["Compat", "ConstructionBase", "LinearAlgebra", "Random"] git-tree-sha1 = "60a0339f28a233601cb74468032b5c302d5067de" @@ -1283,9 +1267,9 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "KernelAbstractions", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "ScopedValues", "Serialization", "SparseArrays", "Statistics"] -git-tree-sha1 = "34fd745547978beb471f029f447290ef4dbc7bbd" +git-tree-sha1 = "cf230532c7871ce9bfa5812dd699cb68da888364" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "11.5.3" +version = "11.5.4" weakdeps = ["JLD2"] [deps.GPUArrays.extensions] @@ -1710,12 +1694,6 @@ version = "1.14.3" [deps.JSON3.weakdeps] ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd" -[[deps.Jieko]] -deps = ["ExproniconLite"] -git-tree-sha1 = "2f05ed29618da60c06a87e9c033982d4f71d0b6c" -uuid = "ae98c720-c025-4a4a-838c-29b094483192" -version = "0.2.1" - [[deps.JpegTurbo]] deps = ["CEnum", "FileIO", "ImageCore", "JpegTurbo_jll", "TOML"] git-tree-sha1 = "9496de8fb52c224a2e3f9ff403947674517317d9" @@ -2172,7 +2150,7 @@ version = "1.1.10" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.1010+0" +version = "2.28.2+1" [[deps.MeshArrays]] deps = ["CatViews", "Dates", "Distributed", "GeoInterface", "Glob", "LazyArtifacts", "NearestNeighbors", "Pkg", "Printf", "SharedArrays", "SparseArrays", "Statistics", "Unitful"] @@ -2231,15 +2209,9 @@ git-tree-sha1 = "7b86a5d4d70a9f5cdf2dacb3cbe6d251d1a61dbe" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" version = "0.3.4" -[[deps.Moshi]] -deps = ["ExproniconLite", "Jieko"] -git-tree-sha1 = "53f817d3e84537d84545e0ad749e483412dd6b2a" -uuid = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d" -version = "0.3.7" - [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2025.12.2" +version = "2023.1.10" [[deps.MuladdMacro]] git-tree-sha1 = "cac9cc5499c25554cba55cd3c30543cff5ca4fab" @@ -2257,9 +2229,9 @@ weakdeps = ["Adapt", "CUDA"] [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "7c25249fc13a070f5ba433c50e21e22bb33c6fb0" +git-tree-sha1 = "dc5b2c4c111c46bc79ac4405eeb563523b39c004" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.7.1" +version = "1.8.0" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] @@ -2326,10 +2298,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "1.1.3" [[deps.NaNStatistics]] -deps = ["PrecompileTools", "Static", "StaticArrayInterface"] -git-tree-sha1 = "d40d2359680061c5c61d5e324805ebf2ef0d8816" +deps = ["PrecompileTools"] +git-tree-sha1 = "a9ec1b5e6a3285f0f92d0a9ce825f115a6265cf2" uuid = "b946abbf-3ea7-4610-9019-9858bfdeaf2d" -version = "0.6.56" +version = "0.6.57" [deps.NaNStatistics.extensions] NaNStatisticsDimensionalDataExt = "DimensionalData" @@ -2452,7 +2424,7 @@ version = "0.3.29+0" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.23+5" +version = "0.3.23+4" [[deps.OpenEXR]] deps = ["Colors", "FileIO", "OpenEXR_jll"] @@ -2647,22 +2619,6 @@ git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" version = "0.2.4" -[[deps.PreallocationTools]] -deps = ["Adapt", "ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "c05b4c6325262152483a1ecb6c69846d2e01727b" -uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.34" - - [deps.PreallocationTools.extensions] - PreallocationToolsForwardDiffExt = "ForwardDiff" - PreallocationToolsReverseDiffExt = "ReverseDiff" - PreallocationToolsSparseConnectivityTracerExt = "SparseConnectivityTracer" - - [deps.PreallocationTools.weakdeps] - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5" - [[deps.PrecompileTools]] deps = ["Preferences"] git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" @@ -2984,69 +2940,11 @@ git-tree-sha1 = "81ec49d645af090901120a1542e67ecbbe044db3" uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" version = "0.1.0" -[[deps.SciMLBase]] -deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PreallocationTools", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "a06d451a6d0fa6e6da34d047d61af8beb187b0f1" -uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.112.0" - - [deps.SciMLBase.extensions] - SciMLBaseChainRulesCoreExt = "ChainRulesCore" - SciMLBaseDistributionsExt = "Distributions" - SciMLBaseForwardDiffExt = "ForwardDiff" - SciMLBaseMLStyleExt = "MLStyle" - SciMLBaseMakieExt = "Makie" - SciMLBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements" - SciMLBaseMooncakeExt = "Mooncake" - SciMLBasePartialFunctionsExt = "PartialFunctions" - SciMLBasePyCallExt = "PyCall" - SciMLBasePythonCallExt = "PythonCall" - SciMLBaseRCallExt = "RCall" - SciMLBaseReverseDiffExt = "ReverseDiff" - SciMLBaseTrackerExt = "Tracker" - SciMLBaseZygoteExt = ["Zygote", "ChainRulesCore"] - - [deps.SciMLBase.weakdeps] - ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2" - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078" - Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" - Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" - MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" - Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6" - PartialFunctions = "570af359-4316-4cb7-8c74-252c00c2016b" - PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" - PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" - RCall = "6f49c342-dc21-5d91-9882-a32aef131414" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" - Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" - -[[deps.SciMLOperators]] -deps = ["Accessors", "Adapt", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "SafeTestsets"] -git-tree-sha1 = "50e6ec6879eab12b039924d5a10b91c95bf9bf7f" -uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "1.21.0" -weakdeps = ["LoopVectorization", "SparseArrays", "StaticArraysCore"] - - [deps.SciMLOperators.extensions] - SciMLOperatorsLoopVectorizationExt = "LoopVectorization" - SciMLOperatorsSparseArraysExt = "SparseArrays" - SciMLOperatorsStaticArraysCoreExt = "StaticArraysCore" - [[deps.SciMLPublic]] git-tree-sha1 = "0ba076dbdce87ba230fff48ca9bca62e1f345c9b" uuid = "431bcebd-1456-4ced-9d72-93c2757fff0b" version = "1.0.1" -[[deps.SciMLStructures]] -deps = ["ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "607f6867d0b0553e98fc7f725c9f9f13b4d01a32" -uuid = "53ae85a6-f571-4167-b2af-e1d143709226" -version = "1.10.0" - [[deps.ScopedValues]] deps = ["HashArrayMappedTries", "Logging"] git-tree-sha1 = "67a144433c4ce877ee6d1ada69a124d6b1ecf7be" @@ -3290,9 +3188,9 @@ version = "1.11.0" [[deps.StructUtils]] deps = ["Dates", "UUIDs"] -git-tree-sha1 = "dd974aefe288ef2898733aecf40858dc86742d74" +git-tree-sha1 = "82bee338d650aa515f31866c460cb7e3bcef90b8" uuid = "ec057cc2-7a8d-4b58-b3b3-92acb9f63b42" -version = "2.8.1" +version = "2.8.2" [deps.StructUtils.extensions] StructUtilsMeasurementsExt = ["Measurements"] @@ -3837,7 +3735,7 @@ version = "2022.3.0+0" [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" -version = "17.6.1+0" +version = "17.4.0+2" [[deps.pixi_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"] diff --git a/experiments/CMIP/Project.toml b/experiments/CMIP/Project.toml index 2804a24621..27bd4d1d66 100644 --- a/experiments/CMIP/Project.toml +++ b/experiments/CMIP/Project.toml @@ -33,7 +33,6 @@ Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b" PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" -SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" @@ -54,7 +53,7 @@ ClimaLand = "1.8" ClimaOcean = "0.9" ClimaParams = "1.0" ClimaSeaIce = "0.4" -ClimaTimeSteppers = "0.7, 0.8, 0.9" +ClimaTimeSteppers = "0.8.11, 0.9" ClimaUtilities = "0.1.22" GeoMakie = "0.7" Insolation = "1.1" @@ -67,7 +66,6 @@ NCDatasets = "0.14" NVTX = "1" Oceananigans = "0.107" Poppler_jll = "24" -SciMLBase = "~2.110, ~2.111, ~2.112" StaticArrays = "1.9.8" SurfaceFluxes = "0.15.0, 1" Thermodynamics = "0.15.3, ~1.0, ~1.1, ~1.2" diff --git a/ext/ClimaCouplerClimaLandExt.jl b/ext/ClimaCouplerClimaLandExt.jl index 08095ffa33..dad05d7986 100644 --- a/ext/ClimaCouplerClimaLandExt.jl +++ b/ext/ClimaCouplerClimaLandExt.jl @@ -21,7 +21,6 @@ import ClimaUtilities.SpaceVaryingInputs: SpaceVaryingInput import ClimaUtilities.ClimaArtifacts: @clima_artifact import ClimaCoupler: Checkpointer, FieldExchanger, FluxCalculator, Interfacer, Utilities, Plotting -import SciMLBase import ClimaTimeSteppers as CTS import ClimaDiagnostics as CD import ClimaUtilities.TimeManager: ITime diff --git a/src/Interfacer.jl b/src/Interfacer.jl index f4bbdacae8..42ded144c9 100644 --- a/src/Interfacer.jl +++ b/src/Interfacer.jl @@ -5,13 +5,12 @@ This modules contains abstract types, interface templates and model stubs for co """ module Interfacer -import SciMLBase import ClimaComms import ClimaCore as CC import Dates import Thermodynamics as TD import NVTX -import SciMLBase: step! +import ClimaTimeSteppers: step! import ClimaUtilities.TimeManager: ITime, date import Statistics @@ -388,7 +387,7 @@ Base.nameof(sim::AbstractComponentSimulation) = string(nameof(typeof(sim))) A function to update the simulation in-place with values calculate for time `t`. For the models we currently have implemented, this is a simple wrapper around -the `step!` function implemented in SciMLBase.jl. +the `step!` function implemented in ClimaTimeSteppers.jl. This must be extended for all component models - otherwise this default function will be called and an error will be raised. @@ -399,8 +398,8 @@ step!(sim::AbstractComponentSimulation, t) = error("undefined step! for $(nameof step!(sim::AbstractComponentSimulation, t::Float64) Default step method for simulations using `Float64` as the time type. -This method is suitable for simulations that use a SciMLBase-style integrator, -but should be extended for other models. +This method is suitable for simulations that use a ClimaTimeSteppers-style +integrator, but should be extended for other models. This method computes the number of steps to take based on the difference between the simulation time (stored in the integrator) and the coupler time @@ -420,8 +419,8 @@ end step!(sim::AbstractComponentSimulation, t::ITime) Default step method for simulations using `ITime` as the time type. -This method is suitable for simulations that use a SciMLBase-style integrator, -but should be extended for other models. +This method is suitable for simulations that use a ClimaTimeSteppers-style +integrator, but should be extended for other models. This method computes the number of steps to take based on the difference between the simulation time (stored in the integrator) and the coupler time diff --git a/src/Models/prescr_seaice.jl b/src/Models/prescr_seaice.jl index 14fbb72e11..1e3c5479ef 100644 --- a/src/Models/prescr_seaice.jl +++ b/src/Models/prescr_seaice.jl @@ -1,4 +1,3 @@ -import SciMLBase import ClimaCore as CC import ClimaTimeSteppers as CTS import ClimaUtilities.TimeManager: ITime @@ -310,9 +309,8 @@ function PrescribedIceSimulation( tspan = Float64.(tspan) saveat = Float64.(saveat) end - problem = SciMLBase.ODEProblem(ode_function, Y, tspan, (; cache..., params = params)) - integrator = - SciMLBase.init(problem, ode_algo, dt = dt, saveat = saveat, adaptive = false) + problem = CTS.ODEProblem(ode_function, Y, tspan, (; cache..., params = params)) + integrator = CTS.init(problem, ode_algo, dt = dt, saveat = saveat, adaptive = false) sim = PrescribedIceSimulation(params, integrator) diff --git a/src/Models/slab_ocean.jl b/src/Models/slab_ocean.jl index 82ec41c812..23c1186686 100644 --- a/src/Models/slab_ocean.jl +++ b/src/Models/slab_ocean.jl @@ -1,4 +1,3 @@ -import SciMLBase import ClimaCore as CC import ClimaTimeSteppers as CTS import ClimaUtilities @@ -176,9 +175,8 @@ function SlabOceanSimulation( tspan = Float64.(tspan) saveat = Float64.(saveat) end - problem = SciMLBase.ODEProblem(ode_function, Y, tspan, cache) - integrator = - SciMLBase.init(problem, ode_algo, dt = dt, saveat = saveat, adaptive = false) + problem = CTS.ODEProblem(ode_function, Y, tspan, cache) + integrator = CTS.init(problem, ode_algo, dt = dt, saveat = saveat, adaptive = false) sim = SlabOceanSimulation(params, integrator) diff --git a/src/surface_stub.jl b/src/surface_stub.jl index a98d8682c6..e9acab3a22 100644 --- a/src/surface_stub.jl +++ b/src/surface_stub.jl @@ -98,7 +98,8 @@ update_field!(::AbstractSurfaceStub, ::Val{:turbulent_moisture_flux}, field) = n """ step!(::AbstractSurfaceStub, t) -The stub surface simulation is not updated by this function. Extends `SciMLBase.step!`. +The stub surface simulation is not updated by this function. +Extends `ClimaTimeSteppers.step!`. """ step!(::AbstractSurfaceStub, ::Float64) = nothing step!(::AbstractSurfaceStub, ::ITime) = nothing