AndisonDriver needs fixing. No more global

PredictiveEcology · Dec 18, 2018 · 155ef1a · 155ef1a
1 parent 2a538e3
commit 155ef1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 107 deletions.
diff --git a/modules/andisonDriver_dataPrep/andisonDriver_dataPrep.R b/modules/andisonDriver_dataPrep/andisonDriver_dataPrep.R
@@ -63,7 +63,7 @@ Init <- function(sim) {
   dPath <- dataPath(sim)
   cacheTags = c(currentModule(sim), "function:.inputObjects")
 
-  if (!suppliedElsewhere("studyArea0", sim)) {
+  if (!suppliedElsewhere("studyArea", sim)) {
     message("study area not supplied. Using Ecodistrict 348")
 
     #source shapefile from ecodistict in input folder. Use ecodistrict 348
@@ -76,7 +76,7 @@ Init <- function(sim) {
                 destinationPath = file.path(dPath, "ecodistricts_shp", "Ecodistricts"))
 
     SA <- SA[SA$ECODISTRIC == 348, ]
-    sim$studyArea0 <- SA
+    sim$studyArea <- SA
   }
 
   if (!suppliedElsewhere("AndisonFRI", sim)) {
@@ -96,9 +96,6 @@ Init <- function(sim) {
                           dissolve = TRUE)
     }
   }
-  ##workaround. This forces studyArea to be Andison shapefile
-  sim$AndisonFRI <- spTransform(sim$AndisonFRI, CRSobj = crs(sim$studyArea0))
-  sim$studyArea <- crop(sim$AndisonFRI, y = sim$studyArea0)
 
   if (!suppliedElsewhere("rasterToMatch", sim)) {
     rasterToMatch <- pemisc::prepInputsLCC(year = 2005,

diff --git a/scfm_IansGlobal.R b/scfm_IansGlobal.R