From b2c6c6c8caa510c868ed70a836fb252cb156fe8b Mon Sep 17 00:00:00 2001
From: Peter Alexander <>
Date: Thu, 11 Aug 2022 11:38:17 +0100
Subject: [PATCH] Interpolate bioenergy base demand when BASE_YEAR not in
trajectory dataset
---
src/ac/ed/lurg/demand/BioenergyDemandManager.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/ac/ed/lurg/demand/BioenergyDemandManager.java b/src/ac/ed/lurg/demand/BioenergyDemandManager.java
index 09cf0169..a8fa1faa 100644
--- a/src/ac/ed/lurg/demand/BioenergyDemandManager.java
+++ b/src/ac/ed/lurg/demand/BioenergyDemandManager.java
@@ -169,8 +169,7 @@ public class BioenergyDemandManager {
double bioenergyDemandAdj = 0;
if (ModelConfig.USE_BIOENERGY_TRAJECTORY) {
- int baseYear = (ModelConfig.BASE_YEAR/5) * 5; // truncation in division as int
- bioenergyDemandAdj = interpolateDemand(firstGenGlobalMass, year, 5) / firstGenGlobalMass.get(baseYear);
+ bioenergyDemandAdj = interpolateDemand(firstGenGlobalMass, year, 5) / interpolateDemand(firstGenGlobalMass, ModelConfig.BASE_YEAR, 5);
}
else {
int yearsOfChange = Math.min(ModelConfig.BIOENERGY_CHANGE_END_YEAR - ModelConfig.BIOENERGY_CHANGE_START_YEAR, year - ModelConfig.BIOENERGY_CHANGE_START_YEAR);
--
GitLab