add overrides based on runName (#97)

PredictiveEcology · Nov 14, 2018 · f442601 · f442601
1 parent fdbcef0
commit f442601
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 19 deletions.
diff --git a/m/Boreal_LBMRDataPrep b/m/Boreal_LBMRDataPrep
diff --git a/m/LandMine b/m/LandMine
diff --git a/newStart.R b/newStart.R
@@ -32,21 +32,21 @@ runName <- "testing"
 #runName <- "tolko_AB_S_equalROS" ## DONE
 #runName <- "tolko_SK_equalROS" ## DONE
 
-## running on 388; results saved locally
+## running locally
 #runName <- "tolko_AB_N_logROS" ## DONE
 #runName <- "tolko_AB_S_logROS" ## DONE
 #runName <- "tolko_SK_logROS" ## DONE
 
-## running locally
-#runName <- "tolko_AB_N_logROS_new" ## running
-#runName <- "tolko_AB_S_logROS_new" ## running
-#runName <- "tolko_SK_logROS_new" ## running
-
 ## running locally
 #runName <- "tolko_AB_N_noDispersal" ## running
 #runName <- "tolko_AB_S_noDispersal" ## running
 #runName <- "tolko_SK_noDispersal" ## running
 
+## running locally
+#runName <- "tolko_AB_N_aspen80" ## running
+#runName <- "tolko_AB_S_aspen80" ## running
+#runName <- "tolko_SK_aspen80" ## running
+
 ## running locally
 #runName <- "LP_MB" ## DONE
 #runName <- "LP_MB_logROS" ## DONE
@@ -353,17 +353,20 @@ modules <- list("LandWeb_output",
                 "Boreal_LBMRDataPrep", "LBMR",
                 "timeSinceFire")
 
-objects <- list("shpStudyAreaLarge" = studyArea(ml, 1),
-                "shpStudyArea" = studyArea(ml, 2),
-                "rasterToMatch" = rasterToMatch(ml),
-                "fireReturnInterval" = ml$fireReturnInterval,
-                "rstFlammable" = rstFlammable,
-                "LCC2005" = ml$LCC2005,
-                "rstTimeSinceFire" = ml$`CC TSF`,
-                "specieslayers" = CCstack,
-                "summaryPeriod" = summaryPeriod,
-                "useParallel" = 2,
-                "vegLeadingProportion" = vegLeadingProportion)
+objects <- list(
+  "fireReturnInterval" = ml$fireReturnInterval,
+  "LCC2005" = ml$LCC2005,
+  "rasterToMatch" = rasterToMatch(ml),
+  "rstFlammable" = rstFlammable,
+  "rstTimeSinceFire" = ml$`CC TSF`,
+  "runName" = runName,
+  "specieslayers" = CCstack,
+  "shpStudyArea" = studyArea(ml, 2),
+  "shpStudyAreaLarge" = studyArea(ml, 1),
+  "summaryPeriod" = summaryPeriod,
+  "useParallel" = 2,
+  "vegLeadingProportion" = vegLeadingProportion
+)
 
 parameters <- list(
   Boreal_LBMRDataPrep = list(.useCache = eventCaching, .crsUsed = crs(studyArea(ml))),

diff --git a/params/Development_Parameters_tolko_AB_N_aspen80.R b/params/Development_Parameters_tolko_AB_N_aspen80.R
@@ -0,0 +1,4 @@
+endTime <- 10
+successionTimestep <- 10
+summaryPeriod <- c(5, 10)
+summaryInterval <- 5
diff --git a/params/Development_Parameters_tolko_AB_S_aspen80.R b/params/Development_Parameters_tolko_AB_S_aspen80.R
@@ -0,0 +1,4 @@
+endTime <- 10
+successionTimestep <- 10
+summaryPeriod <- c(5, 10)
+summaryInterval <- 5
diff --git a/params/Development_Parameters_tolko_SK_aspen80.R b/params/Development_Parameters_tolko_SK_aspen80.R
@@ -0,0 +1,4 @@
+endTime <- 10
+successionTimestep <- 10
+summaryPeriod <- c(5, 10)
+summaryInterval <- 5