Skip to content
Snippets Groups Projects
Commit b2c6c6c8 authored by Peter Alexander's avatar Peter Alexander
Browse files

Interpolate bioenergy base demand when BASE_YEAR not in trajectory dataset

parent 307984c6
No related branches found
No related tags found
No related merge requests found
...@@ -169,8 +169,7 @@ public class BioenergyDemandManager { ...@@ -169,8 +169,7 @@ public class BioenergyDemandManager {
double bioenergyDemandAdj = 0; double bioenergyDemandAdj = 0;
if (ModelConfig.USE_BIOENERGY_TRAJECTORY) { if (ModelConfig.USE_BIOENERGY_TRAJECTORY) {
int baseYear = (ModelConfig.BASE_YEAR/5) * 5; // truncation in division as int bioenergyDemandAdj = interpolateDemand(firstGenGlobalMass, year, 5) / interpolateDemand(firstGenGlobalMass, ModelConfig.BASE_YEAR, 5);
bioenergyDemandAdj = interpolateDemand(firstGenGlobalMass, year, 5) / firstGenGlobalMass.get(baseYear);
} }
else { else {
int yearsOfChange = Math.min(ModelConfig.BIOENERGY_CHANGE_END_YEAR - ModelConfig.BIOENERGY_CHANGE_START_YEAR, year - ModelConfig.BIOENERGY_CHANGE_START_YEAR); int yearsOfChange = Math.min(ModelConfig.BIOENERGY_CHANGE_END_YEAR - ModelConfig.BIOENERGY_CHANGE_START_YEAR, year - ModelConfig.BIOENERGY_CHANGE_START_YEAR);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment