Allow to run with Julia 1.10 to fix ODINN test env (#163)

* allow to run with Julia 1.10 to fix ODINN test env

* fix formatting

Author: albangossard

.github/workflows/CI.yml

@@ -69,7 +69,7 @@ jobs:
           cache-name: cache-artifacts
         with:
           path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          key: ${{ runner.os }}-${{ runner.version }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
           restore-keys: |
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-

Project.toml

@@ -53,9 +53,9 @@ Contour = "0.6"
 CoordRefSystems = "0.16, 0.17, 0.18, 0.19"
 DataStructures = "0.18, 0.19"
 DateFormats = "0.1"
-Dates = "1.11"
+Dates = "1.10, 1.11"
 DimensionalData = "0.29"
-Distributed = "1.11"
+Distributed = "1.10, 1.11"
 Downloads = "1"
 FFTW = "1"
 GR = "0.73"
@@ -70,16 +70,16 @@ MLStyle = "0.4"
 NCDatasets = "0.14"
 NaNStatistics = "0.6"
 Observables = "0.5"
-Pkg = "1.11"
-Printf = "1.11"
+Pkg = "1.10, 1.11"
+Printf = "1.10, 1.11"
 Rasters = "0.13, 0.14"
 Revise = "3"
 Statistics = "1"
 Tar = "1"
-Test = "1.11"
+Test = "1.10, 1.11"
 Unitful = "1"
 Zygote = "0.7"
-julia = "1.11"
+julia = "1.10, 1.11"
 
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"

src/glaciers/climate/Climate2D.jl

@@ -76,11 +76,17 @@ A mutable struct representing a 2D climate for a glacier with various buffers an
   - `raw_climate::CLIMRAW`: Raw climate dataset for the whole simulation.
 
   - `climate_raw_step::CLIMRAWSTEP`: Raw climate trimmed for the current step to avoid memory allocations.
+
   - `climate_step::ClimateStep`: Climate data for the current step.
+
   - `climate_2D_step::Climate2Dstep`: 2D climate data for the current step to feed to the mass balance (MB) model.
+
   - `longterm_temps::Vector{F}`: Long-term temperatures for the ice rheology.
+
   - `avg_temps::F`: Intermediate buffer for computing average temperatures.
+
   - `avg_gradients::F`: Intermediate buffer for computing average gradients.
+
   - `ref_hgt::F`: Reference elevation of the raw climate data.
 
     Climate2D(
@@ -106,9 +112,13 @@ This function initializes the climate data for a glacier by:
  1. Creating a dummy period based on the simulation time span and step.
 
  2. Loading the raw climate data from a NetCDF file.
+
  3. Calculating the cumulative climate data for the dummy period.
+
  4. Downscaling the cumulative climate data to a 2D grid.
+
  5. Retrieving long-term temperature data for the glacier.
+
  6. Returning the climate data, including raw climate data, cumulative climate data, downscaled 2D climate data, long-term temperatures, average temperatures, and average gradients.
 
     Climate2D(

src/glaciers/climate/climate2D_utils.jl

@@ -26,6 +26,7 @@ This function generates raw climate files for a specified RGI ID if they do not
  1. Constructs the path to the RGI directory using the provided `rgi_id` and `simparams`.
 
  2. Checks if the raw climate file for the specified time span already exists.
+
  3. If the file does not exist:
 
       + Retrieves the raw climate data.
@@ -315,6 +316,7 @@ Downscales climate data to a 2D grid based on the provided matrix of surface ele
       + `"ref_hgt"`: Reference height.
 
   - `S::Matrix{<: AbstractFloat}`: Surface elevation data.
+
   - `Coords::Dict`: A dictionary with keys `"lon"` and `"lat"` for longitude and latitude coordinates.
 
 # Returns

src/glaciers/glacier/glacier2D_utils.jl

@@ -213,14 +213,17 @@ Build glacier object for a given RGI ID and parameters.
   - `rgi_id::String`: The RGI ID of the glacier.
 
   - `params::Parameters`: A `Parameters` object containing simulation parameters.
+
   - `masking::Union{Int, Nothing, BitMatrix}`: Type of mask applied to the glacier to determine regions with no ice.
 
       + When `masking` is an `Int`, the mask is based on the initial ice thickness `H₀` and it is set to true for
         pixels outside at a distance of the glacier borders greater than the value of `masking`.
       + When `masking` is set to `nothing`, the mask is set to a `BitMatrix` full of falses.
       + When `masking` is a `BitMatrix`, this matrix is used for the mask.
         Defaults to `2`.
+
   - `smoothing::Bool=false`: Optional; whether to apply smoothing to the initial ice thickness. Default is `false`.
+
   - `test::Bool=false`: Optional; test flag. Default is `false`.
 
 # Returns
@@ -752,7 +755,7 @@ end
 Return a matrix with booleans indicating if a given pixel is at distance at least
 `distance` in the set of non zero values of the matrix. This usually allows
 discarding the border pixels of a glacier.
-A positive value of `distance`` indicates a measurement from inside the glacier, while a negative `distance`` indicates one from outside.
+A positive value of `distance` indicates a measurement from inside the glacier, while a negative `distance` indicates one from outside.
 
 Arguments:
 

src/simulations/results/results_plotting_utils.jl

@@ -774,6 +774,7 @@ Generate various types of plots for glacier data.
       + "evolution statistics": Temporal statistical metrics for a variable, with optional metrics like "average", "median", "min", "max", and "std".
       + "integrated volume": Temporal evolution of the integrated ice volume for a variable.
       + "bias": Scatter plot to visualize the bias between two variables.
+
   - `variables::Vector{Symbol}`: Variables to be plotted, e.g., `:H`.
 
 # Optional Keyword Arguments

src/simulations/results/results_plotting_video_utils.jl

@@ -91,9 +91,13 @@ Generate various types of videos for glacier data. For now only the evolution of
 
   - `results`: A result object containing the simulation results including ice
     thickness over time.
+
   - `glacier`: A glacier instance.
+
   - `tspan`: The simulation time span.
+
   - `step`: Time step to use to retrieve the results and generate the video.
+
   - `pathVideo`: Path of the mp4 file to generate.
 
 # Optional Keyword Arguments

test/runtests.jl

@@ -8,10 +8,12 @@ function is_included_in_repl()
     return false
 end
 
+Pkg.activate(dirname(Base.current_project()))
+Pkg.instantiate() # Need this to setup the ODINN env for multiprocessing
 if is_included_in_repl()
     # The Project.toml of the test environment to be used when running with include is in a subfolder to avoid that Julia uses this file in test mode
-    Pkg.instantiate()
     Pkg.activate(dirname(Base.current_project())*"/test/test_env/")
+    Pkg.resolve()
 end
 
 if !parse(Bool, get(ENV, "CI", "false"))