Allow base year to not be multiple of 5 in bioenergy demand calc

src/ac/ed/lurg/demand/BioenergyDemandManager.java

@@ -169,7 +169,8 @@ public class BioenergyDemandManager {
 			double bioenergyDemandAdj = 0;
 			
 			if (ModelConfig.USE_BIOENERGY_TRAJECTORY) {
-				bioenergyDemandAdj = interpolateDemand(firstGenGlobalMass, year, 5) / firstGenGlobalMass.get(ModelConfig.BASE_YEAR);
+				int baseYear = (ModelConfig.BASE_YEAR/5) * 5; // truncation in division as int
+				bioenergyDemandAdj = interpolateDemand(firstGenGlobalMass, year, 5) / firstGenGlobalMass.get(baseYear);
 			}
 			else {
 				int yearsOfChange = Math.min(ModelConfig.BIOENERGY_CHANGE_END_YEAR - ModelConfig.BIOENERGY_CHANGE_START_YEAR, year - ModelConfig.BIOENERGY_CHANGE_START_YEAR);