update dependencies to support Julia 1.12 in Huginn (#148)

Author: albangossard

Project.toml

@@ -1,7 +1,7 @@
 name = "Sleipnir"
 uuid = "f5e6c550-199f-11ee-3608-394420200519"
 authors = ["Jordi Bolibar <jordi.bolibar@gmail.com>", "Facundo Sapienza <fsapienza@berkeley.edu>", "Alban Gossard <alban.paul.gossard@gmail.com>", "Mathieu Le Séac'h"]
-version = "0.11.0"
+version = "0.11.1"
 
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
@@ -38,12 +38,13 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
 BenchmarkTools = "1"
 CFTime = "0.2.1"
 CSV = "0.10.15"
-CairoMakie = "0.12.18, 0.13"
+CairoMakie = "0.15"
 CodecZlib = "0.7.6"
 ComponentArrays = "0.15"
 Contour = "0.6"
@@ -58,17 +59,18 @@ HDF5 = "0.17"
 ImageCore = "0.10"
 ImageInTerminal = "0.5"
 Infiltrator = "1.8"
-JET = "0.9.18"
+JET = "0.9, 0.10"
 JLD2 = "0.4, 0.5, 0.6"
-JSON = "0.21.4"
+JSON = "0.21.4, 1"
 MLStyle = "0.4"
-NCDatasets = "0.14.6"
+NCDatasets = "0.14"
 Observables = "0.5"
 Rasters = "0.13.0, 0.14"
 Revise = "3"
 Statistics = "1"
-Tar = "1.10.0, 1"
+Tar = "1"
 Unitful = "1"
+Zygote = "0.7"
 julia = "1.10"
 
 [extras]

src/Sleipnir.jl

@@ -34,6 +34,7 @@ using Printf
 using CFTime
 using MLStyle
 using FFTW
+using Zygote # To skip some lines in Sleipnir/src/simulations/results/results_utils.jl that causes an error with SciMLSensitivity
 
 ##############################################
 ############    PARAMETERS     ###############

src/models/Model.jl

@@ -11,9 +11,19 @@ abstract type AbstractModel end
 const AbstractEmptyModel = Union{AbstractModel,Nothing}
 
 """
+    Model{IFM <: AbstractEmptyModel, MBM <: AbstractEmptyModel, MLM <: AbstractEmptyModel}
+
 A mutable struct that represents a model with three components: iceflow, mass balance, and machine learning.
 
-    Model{IFM <: AbstractEmptyModel, MBM <: AbstractEmptyModel, MLM <: AbstractEmptyModel}
+    Model(
+        iceflow::IFM,
+        mass_balance::MBM,
+        machine_learning::MLM,
+    ) where {IFM <: AbstractEmptyModel, MBM <: AbstractEmptyModel, MLM <: AbstractEmptyModel}
+
+    Model(;iceflow, mass_balance) = Model(iceflow, mass_balance, nothing)
+
+Initialize Model (no machine learning model).
 
 # Keyword arguments
 - `iceflow::IFM}`: Represents the iceflow component, which is an instance of `IFM`.
@@ -29,8 +39,16 @@ mutable struct Model{IFM <: AbstractEmptyModel, MBM <: AbstractEmptyModel, MLM <
     iceflow::IFM
     mass_balance::MBM
     machine_learning::MLM
-end
 
+    function Model(
+        iceflow::IFM,
+        mass_balance::MBM,
+        machine_learning::MLM,
+    ) where {IFM <: AbstractEmptyModel, MBM <: AbstractEmptyModel, MLM <: AbstractEmptyModel}
+        new{typeof(iceflow), typeof(mass_balance), typeof(machine_learning)}(
+            iceflow, mass_balance, machine_learning)
+    end
+end
 Model(;iceflow, mass_balance) = Model(iceflow, mass_balance, nothing)
 
 """

src/simulations/results/results_plotting_utils.jl

@@ -221,7 +221,7 @@ end
         timeIdx::Union{Nothing,Int64} = nothing,
         figsize::Union{Nothing, Tuple{Int64, Int64}} = nothing,
         lengthscale::Float64 = 0.00001,
-        arrowsize::Float64 = 0.5,
+        tiplength::Float64 = 0.5,
     ) -> Figure
 
 Plot quivers for glacier variables.
@@ -235,7 +235,7 @@ Plot quivers for glacier variables.
     which selects the last element available.
 - `figsize::Union{Nothing, Tuple{Int64, Int64}}`: Size of the figure.
 - `lengthscale::Float64`: Lengthscale of the arrows in the quiver plot.
-- `arrowsize::Float64`: Arrow size in the quiver plot.
+- `tiplength::Float64`: Length of the arrow in the quiver plot.
 
 # Returns
 - A plot of the glacier quivers.
@@ -247,7 +247,7 @@ function plot_glacier_quivers(
     timeIdx::Union{Nothing,Int64} = nothing,
     figsize::Union{Nothing, Tuple{Int64, Int64}} = nothing,
     lengthscale::Float64 = 0.00001,
-    arrowsize::Float64 = 0.5,
+    tiplength::Float64 = 0.5,
 )
     figKwargs = isnothing(figsize) ? Dict{Symbol,Any}() : Dict{Symbol,Any}(:size => figsize)
 
@@ -304,7 +304,7 @@ function plot_glacier_quivers(
 
         positions = Point2f.(reshape(X,:), reshape(Y,:))
         directions = Vec2f.(dataVx, -dataVy)
-        arrows!(ax, positions, directions; arrowsize=arrowsize, lengthscale=lengthscale)
+        arrows2d!(ax, positions, directions; tiplength=tiplength, lengthscale=lengthscale)
 
         ax.title = "$title"
         ax.xlabel = "Longitude"

src/simulations/results/results_utils.jl

@@ -59,8 +59,8 @@ function create_results(
         end
         ϵ = 1e-6 # Need this because of numerical rounding
         compfct(t,val) = (t<=val+ϵ) & (t>=val-ϵ)
-        solStepIndices = [findlast(t->compfct(t,val), solution.t) for val in timeSteps]
-        ts = solution.t[solStepIndices]
+        solStepIndices = Zygote.@ignore_derivatives [findlast(t->compfct(t,val), solution.t) for val in timeSteps] # selectTimeIdx(solution, timeSteps)
+        ts = Zygote.@ignore_derivatives solution.t[solStepIndices]
         us = solution.u[solStepIndices]
     else
         ts = tstops

test/plot_utils.jl

@@ -20,7 +20,11 @@ function glaciers2D_plots()
     results = Results(
         glaciers[1],
         ifm;
-        H = [abs.(randn(size(glaciers[1].H₀)...)),abs.(randn(size(glaciers[1].H₀)...))]
+        H = [abs.(randn(size(glaciers[1].H₀)...)),abs.(randn(size(glaciers[1].H₀)...))],
+        Vx = [abs.(randn(size(glaciers[1].H₀)...)),abs.(randn(size(glaciers[1].H₀)...))],
+        Vy = [abs.(randn(size(glaciers[1].H₀)...)),abs.(randn(size(glaciers[1].H₀)...))],
+        Vx_ref = [abs.(randn(size(glaciers[1].H₀)...)),abs.(randn(size(glaciers[1].H₀)...))],
+        Vy_ref = [abs.(randn(size(glaciers[1].H₀)...)),abs.(randn(size(glaciers[1].H₀)...))],
     )
 
     # Test execution