Issue with OGGM multiprocessing fixed (#44)

* Integration tests for PDE solved added The test suite is starting to become a little bit more complete. * Fix merge conflicts * Muninn added as dependency Now we can run simulations with MB, run by Muninn. New tests have been added covering those usescases. This means that Huginn should be ready to run simulations for most cases. Now it needs to be extensively tested for different regions and finish polishing the remaining issues. * Changes for compatibility with ODINN.jl * Sleipnir and Munnin versions updated * Clean-up and test reference files changes * Bump version * Multiprocessing fixed * Multiprocessing fixed for OGGM
ODINN-SciML · Dec 15, 2023 · 7e3bfd4 · 7e3bfd4
1 parent f396314
commit 7e3bfd4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/parameters/SolverParameters.jl b/src/parameters/SolverParameters.jl
@@ -67,6 +67,12 @@ function Parameters(;
     parameters = Sleipnir.Parameters(physical, simulation, OGGM,
                                      nothing, solver, nothing)
 
+    if parameters.simulation.multiprocessing
+        enable_multiprocessing(parameters)
+    end
+
+    oggm_config(OGGM.working_dir; oggm_processes=OGGM.workers)
+
     return parameters
 end
 

diff --git a/src/setup/config.jl b/src/setup/config.jl
@@ -41,7 +41,7 @@ function clean()
  end
 
  function enable_multiprocessing(params::Sleipnir.Parameters)
-    procs::Int = params.simulation.workers
+    procs = params.simulation.workers
     if procs > 0 && params.simulation.multiprocessing
         if nprocs() < procs
             @eval begin

diff --git a/src/simulations/predictions/prediction_utils.jl b/src/simulations/predictions/prediction_utils.jl
@@ -8,8 +8,6 @@ In-place run of the model.
 """
 function run!(simulation::Prediction)
 
-    enable_multiprocessing(simulation.parameters)
-
     println("Running forward in-place PDE ice flow model...\n")
     results_list = @showprogress pmap((glacier_idx) -> batch_iceflow_PDE!(glacier_idx, simulation), 1:length(simulation.glaciers))
 

diff --git a/test/PDE_UDE_solve.jl b/test/PDE_UDE_solve.jl
@@ -12,8 +12,10 @@ function pde_solve_test(; rtol::F, atol::F, save_refs::Bool=false, MB::Bool=fals
                         simulation = SimulationParameters(use_MB=MB,
                                                           velocities=false,
                                                           tspan=(2010.0, 2015.0),
-                                                          working_dir = Huginn.root_dir),
-                        solver = SolverParameters(reltol=1e-12)
+                                                          working_dir = Huginn.root_dir,
+                                                          workers=4,
+                                                          multiprocessing=true),
+                        solver = SolverParameters(reltol=1e-8)
                         ) 
 
     ## Retrieving gdirs and climate for the following glaciers