Merge pull request #39 from EvolEcolGroup/speed

speed up region_* when cropping
EvolEcolGroup · Sep 8, 2023 · a56c6fa · a56c6fa
2 parents d523192 + bfb8933
commit a56c6fa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/R/region_series.R b/R/region_series.R
@@ -97,6 +97,12 @@ region_series <-
                                      time_steps = times)
       }
       var_brick <- terra::rast(this_file, subds = this_var_nc)
+
+      # subset to time steps
+      if (!is.null(time_bp)){
+        var_brick <- terra::subset(var_brick, subset = time_index)
+      }
+
       # subset extent
       if (!is.null(ext)){
         var_brick <- terra::crop(var_brick, ext)
@@ -108,12 +114,8 @@ region_series <-
         var_brick <- terra::crop(var_brick, crop)
       }
 
-      if (!is.null(time_bp)){
-        climate_spatrasters[[this_var]] <- terra::subset(var_brick,
-                                       subset = time_index)
-      } else {
-        climate_spatrasters[[this_var]] <- var_brick
-      }
+      climate_spatrasters[[this_var]] <- var_brick
+
       varnames(climate_spatrasters[[this_var]]) <- this_var
       names(climate_spatrasters[[this_var]]) <- paste(this_var,
         time_bp(climate_spatrasters[[this_var]]),

diff --git a/data-raw/benchmark/benchmark.R b/data-raw/benchmark/benchmark.R
@@ -0,0 +1,18 @@
+library("pastclim")
+library("tidysdm")
+date <- seq(-600000,-620000,-4000)
+tic("start")
+climate <- region_series(time_bp=date,
+                        bio_variables=c("bio05","bio06"),
+                        dataset="Krapp2021",
+                        crop=region_outline$Europe)
+toc()
+
+
+tic("start")
+date <- -600000
+climate <- region_slice(time_bp=date,
+                         bio_variables=c("bio05","bio06"),
+                         dataset="Krapp2021",
+                         crop=region_outline$Europe)
+toc()