Backout changeset 992cd7dbff89b8360d0ba1d401113a7fae56563d

src/ac/ed/lurg/Timestep.java

@@ -4,8 +4,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import ac.ed.lurg.utils.LogWriter;
-
 
 public class Timestep {
 
@@ -87,14 +85,9 @@ public class Timestep {
 	}
 	
 	public String getYearSubDir(String rootDir) {
-		
-		int startOfYield = getYieldYear()-4;
-		
-		if (ModelConfig.CHANGE_YIELD_DATA_YEAR){
-			return rootDir + File.separator + startOfYield+"-"+getYieldYear();
-		}
+		if (ModelConfig.CHANGE_YIELD_DATA_YEAR)
+			return rootDir + File.separator + getYieldYear();
 		else
-			return rootDir + File.separator + (ModelConfig.BASE_YEAR-4)+"-"+ModelConfig.BASE_YEAR;
-		//return rootDir + File.separator +ModelConfig.BASE_YEAR;
+			return rootDir + File.separator + ModelConfig.BASE_YEAR;
 	}
 }