From 65727749f3e5e493839f614c70bd6ad8c4d0be7f Mon Sep 17 00:00:00 2001
From: "ED\\rhenry2" <roslyn.henry@ed.ac.uk>
Date: Thu, 26 Jan 2017 11:40:50 +0000
Subject: [PATCH] no message
---
src/ac/ed/lurg/Timestep.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/ac/ed/lurg/Timestep.java b/src/ac/ed/lurg/Timestep.java
index 50274b6c..d2231470 100644
--- a/src/ac/ed/lurg/Timestep.java
+++ b/src/ac/ed/lurg/Timestep.java
@@ -4,6 +4,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
+import ac.ed.lurg.utils.LogWriter;
+
public class Timestep {
@@ -85,9 +87,14 @@ public class Timestep {
}
public String getYearSubDir(String rootDir) {
- if (ModelConfig.CHANGE_YIELD_DATA_YEAR)
- return rootDir + File.separator + getYieldYear();
+
+ int startOfYield = getYieldYear()-4;
+
+ if (ModelConfig.CHANGE_YIELD_DATA_YEAR){
+ return rootDir + File.separator + startOfYield+"-"+getYieldYear();
+ }
else
- return rootDir + File.separator + ModelConfig.BASE_YEAR;
+ return rootDir + File.separator + (ModelConfig.BASE_YEAR-4)+"-"+ModelConfig.BASE_YEAR;
+ //return rootDir + File.separator +ModelConfig.BASE_YEAR;
}
}
--
GitLab