From c34291a130d6f983e6f2b531aefc2ecbf51e972b Mon Sep 17 00:00:00 2001
From: Peter Alexander <>
Date: Sat, 6 Aug 2022 19:35:55 +0100
Subject: [PATCH] Allow base year to not be multiple of 5 in bioenergy demand
calc
---
src/ac/ed/lurg/demand/BioenergyDemandManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ac/ed/lurg/demand/BioenergyDemandManager.java b/src/ac/ed/lurg/demand/BioenergyDemandManager.java
index c01e0cbf..09cf0169 100644
--- a/src/ac/ed/lurg/demand/BioenergyDemandManager.java
+++ b/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);
--
GitLab