Changes to try to allow start timestep other than 0

src/ac/ed/lurg/Timestep.java

@@ -19,13 +19,17 @@ public class Timestep implements Serializable {
 		return timestep;
 	}
 	
+	private static int getYear(int tstep) {
+		return ModelConfig.TIMESTEP_SIZE * tstep + ModelConfig.BASE_YEAR;
+	}
+	
 	public int getYear() {
-		return ModelConfig.TIMESTEP_SIZE * (timestep - ModelConfig.START_TIMESTEP) + ModelConfig.BASE_YEAR;
+		return getYear(timestep);
 	}
 	
 	public int getYieldYear() {
 		if (isInitialTimestep()) {
-			return ModelConfig.BASE_YEAR;
+			return getYear(ModelConfig.START_TIMESTEP);
 		}
 		else {
 			return getPreviousTimestep().getYear();

src/ac/ed/lurg/country/CountryAgent.java

@@ -167,7 +167,7 @@ public class CountryAgent extends AbstractCountryAgent {
 	private GamsRasterInput getGamsRasterInput(RasterSet<IrrigationItem> irrigData, YieldRaster countryYieldSurfaces) {
 		double allowedImportChange;
 
-		if (currentTimestep.isInitialTimestep() || (ModelConfig.IS_CALIBRATION_RUN && currentTimestep.getTimestep() <= ModelConfig.END_FIRST_STAGE_CALIBRATION)) {  // initialisation time-step
+		if (ModelConfig.IS_CALIBRATION_RUN && currentTimestep.getTimestep() <= ModelConfig.END_FIRST_STAGE_CALIBRATION) {  // initialisation time-step
 			allowedImportChange = 0.0;
 		}
 		else { // normal (not the initial) time-step