Issue with OGGM multiprocessing fixed (#46)

* Multiprocessing fixed for OGGM

* Bug fixed

Author: JordiBolibar

src/parameters/OGGMparameters.jl

@@ -1,5 +1,7 @@
 
-  struct OGGMparameters <: AbstractParameters
+export oggm_config
+
+struct OGGMparameters <: AbstractParameters
     working_dir::String
     paths::Union{PyDict, Nothing}
     params::Union{PyDict, Nothing}
@@ -41,26 +43,6 @@ function OGGMparameters(;
             )
 
     @assert ((ice_thickness_source == "Millan22") || (ice_thickness_source == "Farinotti19")) "Wrong ice thickness source! Should be either `Millan22` or `Farinotti19`."
-    # initialize OGGM configuration
-    cfg.initialize()
-    
-    if isnothing(paths) && !test
-        paths = PyDict(cfg."PATHS")  # OGGM PATHS
-        paths["working_dir"] = working_dir # Choose own custom path for the OGGM data
-    end
-    if isnothing(params) && !test
-        params = PyDict(cfg."PARAMS")
-        params["hydro_month_nh"]=1
-        params["dl_verify"] = false
-        params["continue_on_error"] = true # avoid stopping when a task fails for a glacier (e.g. lack of data)
-        
-        # Multiprocessing 
-        params["use_multiprocessing"] = multiprocessing # Let's use multiprocessing for OGGM
-        if multiprocessing
-            params["mp_processes"] = workers
-        end
-
-    end
 
     # Build the OGGM parameters and configuration
     OGGM_parameters = OGGMparameters(working_dir, paths, params,
@@ -83,7 +65,7 @@ Configures the basic paths and parameters for OGGM.
 function oggm_config(working_dir=joinpath(homedir(), "OGGM/OGGM_data"); oggm_processes=1)
     @eval begin
     @everywhere begin
-    @eval ODINN begin
+    @eval Sleipnir begin
     cfg.initialize() # initialize OGGM configuration
 
     PATHS = PyDict(cfg."PATHS")  # OGGM PATHS
@@ -102,12 +84,8 @@ function oggm_config(working_dir=joinpath(homedir(), "OGGM/OGGM_data"); oggm_pro
 
 
 
-    end # @eval ODINN
+    end # @eval Sleipnir
     end # @everywhere
     end # @eval
 
-    @eval ODINN begin
-
-    end # @eval ODINN
-
 end

src/parameters/Parameters.jl

@@ -35,11 +35,17 @@ function Parameters(;
             OGGM::OGGMparameters = OGGMparameters()
             ) 
 
-    # Build the parameters based on all the subtypes of parameters
-    parameters = Parameters(physical, simulation, OGGM,
-                            nothing,nothing, nothing)
-
-    return parameters
+        # Build the parameters based on all the subtypes of parameters
+        parameters = Parameters(physical, simulation, OGGM,
+                                nothing,nothing, nothing)
+
+        if parameters.simulation.multiprocessing
+                enable_multiprocessing(parameters.simulation.workers)
+        end
+                
+        oggm_config(OGGM.working_dir; oggm_processes=OGGM.workers)
+        
+        return parameters
 end
 
 Base.:(==)(a::Parameters, b::Parameters) = a.physical == b.physical && a.simulation == b.simulation && a.OGGM == b.OGGM &&

src/parameters/SimulationParameters.jl

@@ -62,7 +62,7 @@ function SimulationParameters(;
 
     if !ispath(working_dir)
         mkpath(joinpath(working_dir, "data"))
-    end
+    end  
 
     return simulation_parameters
 end

src/setup/config.jl

@@ -43,30 +43,26 @@ function clean()
     exit()
  end
 
-# """
-#     Initialize_ODINN(processes, python_path)
+ function enable_multiprocessing(procs::Int)
+    if procs > 0 
+        if nprocs() < procs
+            @eval begin
+            addprocs($procs - nprocs(); exeflags="--project")
+            println("Number of cores: ", nprocs())
+            println("Number of workers: ", nworkers())
+            @everywhere using Sleipnir
+            end # @eval
+        elseif nprocs() != procs && procs == 1
+            @eval begin
+            rmprocs(workers(), waitfor=0)
+            println("Number of cores: ", nprocs())
+            println("Number of workers: ", nworkers())
+            end # @eval
+        end
+    end
+    return nworkers()
+end
+
 
-# Initializes ODINN by configuring PyCall based on a given Python path. It also configures multiprocessing
-# for a given number of processes. 
-# """
-# function enable_multiprocessing(procs::Int)
-#     if procs > 0
-#         if nprocs() < procs
-#             @eval begin
-#             addprocs($procs - nprocs(); exeflags="--project")
-#             println("Number of cores: ", nprocs())
-#             println("Number of workers: ", nworkers())
-#             @everywhere using ODINN
-#             end # @eval
-#         elseif nprocs() != procs && procs == 1
-#             @eval begin
-#             rmprocs(workers(), waitfor=0)
-#             println("Number of cores: ", nprocs())
-#             println("Number of workers: ", nworkers())
-#             end # @eval
-#         end
-#     end
-#     return nworkers()
-# end
 
 include("helper_utilities.jl")