diff --git a/src/ac/ed/lurg/Timestep.java b/src/ac/ed/lurg/Timestep.java index 50274b6cc0df551c7b0c9960c67c7719fad93a24..d2231470f8f8872b49a6ee1b8af074907613a9f7 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; } }