export correct context

philchalmers · Feb 6, 2025 · 7b14349 · 7b14349
1 parent 5190306
commit 7b14349
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/R/SimSolve.R b/R/SimSolve.R
@@ -612,7 +612,8 @@ SimSolve <- function(design, interval, b, generate, analyse, summarise,
             on.exit(parallel::stopCluster(cl), add = TRUE)
         }
         if(!useFuture){
-            parallel::clusterExport(cl=cl, export_funs, envir = parent.frame(1L))
+            parallel::clusterExport(cl=cl, export_funs,
+                                    envir = parent.frame(control$global_fun_level-1))
             parallel::clusterExport(cl=cl, "ANALYSE_FUNCTIONS", envir = environment())
             if(verbose > 0 && verbose < 2)
                 message(sprintf("\nNumber of parallel clusters in use: %i", length(cl)))

diff --git a/R/runSimulation.R b/R/runSimulation.R
@@ -1295,7 +1295,8 @@ runSimulation <- function(design, replications, generate, analyse, summarise,
             on.exit(parallel::stopCluster(cl), add = TRUE)
         }
         if(!useFuture){
-            parallel::clusterExport(cl=cl, export_funs, envir = parent.frame(1L))
+            parallel::clusterExport(cl=cl, export_funs,
+                                    envir = parent.frame(control$global_fun_level-1))
             parallel::clusterExport(cl=cl, "ANALYSE_FUNCTIONS", envir = environment())
             parallel::clusterExport(cl=cl, "TRY_ALL_ANALYSE", envir = environment())
             if(verbose)