Small changes for script and scenario 3

Author: kvcalvin

R/ag_production_technology.R

@@ -71,7 +71,7 @@ AgProductionTechnology_initCalc <- function(aLandLeaf, aPeriod, aScenarioInfo, a
   # Set constraint cost for this period
   if( aLandConstraintString != "" & grepl(aLandConstraintString, aLandLeaf$mName[1]) ) {
     aLandLeaf$mConstraintCost[aPeriod] <- aLandConstraintCost
-  } else {
+  } else if (length(aLandLeaf$mConstraintCost) < aPeriod) {
     aLandLeaf$mConstraintCost[aPeriod] <- 0.0
   }
 

R/generate_price_data.R

@@ -27,18 +27,19 @@ get_prices <- function(aScenType) {
         prices
     }
   } else {
-    file <- paste("./scenario-data/AgPrices_", aScenType, ".csv", sep="")
-    prices <- suppressMessages(read_csv(system.file("extdata", file, package = "gcamland"), skip = 1))
 
     # Tidy data
     if(aScenType == "PCHES") {
+      prices <- read_csv("./inst/extdata/scenario-data/AgPrices_PCHES.csv", skip=1)
       # PCHES scenarios have subregional price information
       prices %>%
         select(-scenario, -Units) %>%
         gather(year, price, -region, -sector, -subregion) %>%
-        mutate(year = as.integer(year)) ->
+        mutate(year = as.integer(substr(year, 2, 5))) ->
         prices
     } else {
+      file <- paste("./scenario-data/AgPrices_", aScenType, ".csv", sep="")
+      prices <- suppressMessages(read_csv(system.file("extdata", file, package = "gcamland"), skip = 1))
       prices %>%
         select(-scenario, -Units) %>%
         gather(year, price, -region, -sector) %>%

R/main.R

@@ -576,17 +576,26 @@ run_model <- function(aScenarioInfo, aPeriods=NULL, aVerbose=FALSE, agData=NULL)
           while( LandAllocator_getLandAreaByCriteria(mLandAllocator, constraints$string[i], per) > constraints$value[i] ) {
             currValue <- LandAllocator_getLandAreaByCriteria(mLandAllocator, constraints$string[i], per)
             message("Current value: ", currValue, ", Target value:", constraints$value[i])
-            landConstraintCost <- landConstraintCost + 1e7
+            if ( currValue < 2*constraints$value[i] ) {
+              # Use smaller increments when we get close to solution
+              landConstraintCost <- landConstraintCost + 1e8
+            } else if ( currValue > 20*constraints$value[i] ) {
+              # Use smaller increments when we get close to solution
+              landConstraintCost <- landConstraintCost + 1e10
+            } else {
+              landConstraintCost <- landConstraintCost + 1e9
+            }
+
             # Constraint not met. Adjust cost and recalculate
             Sector_initCalc(mLandAllocator, per, aScenarioInfo, landConstraintCost, constraints$string[i])
             LandAllocator_initCalc(mLandAllocator, per, aScenarioInfo)
             LandAllocator_calcFinalLandAllocation(mLandAllocator, per, aScenarioInfo)
 
             # Check that we are making progress toward meeting constraint
-            if( LandAllocator_getLandAreaByCriteria(mLandAllocator, constraints$string[i], per) > 0.999*currValue) {
+            if( LandAllocator_getLandAreaByCriteria(mLandAllocator, constraints$string[i], per) > 0.999999*currValue) {
               message("Progress is not being made. New value (",
                       LandAllocator_getLandAreaByCriteria(mLandAllocator, constraints$string[i], per),
-                      ") is less than 0.1% smaller than old value (", currValue, ")")
+                      ") is less than 0.0001% smaller than old value (", currValue, ")")
               break
             }
           } # End while loop to meet constraint