create get_rgi_paths

ODINN-SciML · Jan 17, 2025 · 0f3df9f · 0f3df9f
1 parent 53f3636
commit 0f3df9f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/glaciers/climate/climate2D_utils.jl b/src/glaciers/climate/climate2D_utils.jl
@@ -105,20 +105,20 @@ function apply_t_cumul_grad!(climate_2D_step::Climate2Dstep, S::Matrix{F}) where
 end
 
 """
-    apply_t_grad!(climate, g_dem)
+    apply_t_grad!(climate::RasterStack, dem::Raster)
 
-Applies temperature gradients to the glacier 2D climate data based on a DEM.  
+Applies temperature gradients to the glacier 2D climate data based on a DEM.
 """
 function apply_t_grad!(climate::RasterStack, dem::Raster)
     # We apply the gradients to the temperature
     climate.temp.data .= climate.temp.data .+ climate.gradient.data .* (mean(dem.data[:]) .- climate.ref_hgt) 
 end
 
 """
-    downscale_2D_climate(climate, g_dem)
+    downscale_2D_climate(glacier::Glacier2D)
 
 Projects climate data to the glacier matrix by simply copying the closest gridpoint to all matrix gridpoints.
-Generates a new xarray Dataset which is returned.   
+Generates a new RasterStack which is returned.
 """
 function downscale_2D_climate!(glacier::Glacier2D)
     # Update 2D climate structure
@@ -132,7 +132,7 @@ function downscale_2D_climate!(glacier::Glacier2D)
     climate.climate_2D_step.avg_gradient .= climate.climate_step.avg_gradient.data
 
     # Apply temperature gradients and compute snow/rain fraction for the selected period
-    apply_t_cumul_grad!(climate.climate_2D_step, reshape(glacier.S, size(glacier.S))) # Reproject current S with xarray structure
+    apply_t_cumul_grad!(climate.climate_2D_step, reshape(glacier.S, size(glacier.S))) # Reproject current S with the RasterStack structure
 end
 
 function downscale_2D_climate(climate_step::Dict, glacier::Glacier2D)

diff --git a/src/setup/config.jl b/src/setup/config.jl
@@ -1,3 +1,4 @@
+export get_rgi_paths
 
 function __init__()
 
@@ -51,5 +52,11 @@ function filter_existing_paths(paths::Vector{String})
     return existing_paths
 end
 
+function get_rgi_paths()
+    rgi_paths = JSON.parsefile(joinpath(prepro_dir, "rgi_paths.json"))
+    rgi_paths = Dict(k => string(v) for (k,v) in pairs(rgi_paths)) # Convert Dict{String, Any} to Dict{String, String}
+    return rgi_paths
+end
+
 
 include("helper_utilities.jl")
diff --git a/test/glaciers_construction.jl b/test/glaciers_construction.jl
@@ -2,8 +2,7 @@
 
 function glaciers2D_constructor(; save_refs::Bool = false)
 
-    rgi_paths = JSON.parsefile(joinpath(Sleipnir.prepro_dir, "rgi_paths.json"))
-    rgi_paths = Dict(k => string(v) for (k,v) in pairs(rgi_paths)) # Convert Dict{String, Any} to Dict{String, String}
+    rgi_paths = get_rgi_paths()
     rgi_ids = ["RGI60-11.03638", "RGI60-11.01450"]
 
     params = Parameters(simulation=SimulationParameters(velocities=false,

diff --git a/test/params_construction.jl b/test/params_construction.jl
@@ -1,7 +1,7 @@
 
 function params_constructor_specified(; save_refs::Bool = false)
 
-    rgi_paths = JSON.parsefile(joinpath(Sleipnir.prepro_dir, "rgi_paths.json"))
+    rgi_paths = get_rgi_paths()
     rgi_paths = Dict(k => string(v) for (k,v) in pairs(rgi_paths)) # Convert Dict{String, Any} to Dict{String, String}
 
     physical_params = PhysicalParameters(ρ = 900.0,