Output total suitable land

debug_config.properties

-BASE_DIR=.
+BASE_DIR=..
 
-#YIELD_DIR=/Users/peteralexander/Documents/LURG/LPJ/IPSL/LPJG_PLUM_expt1.2_rcp45_ipsl_lessIO_forED
-#YIELD_DIR=/Users/peteralexander/Documents/LURG/LPJ/runs_20170925/LPJG_PLUM_expt1.2_rcp26_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925154752
 YIELD_DIR=/Users/peteralexander/Documents/LURG/LPJ/LPJGPLUM_expt1.1_2006-2100_PLUM6xtra_20180412171654/rcp60
 
-# Properties for testing
-#CHANGE_YIELD_DATA_YEAR=true
-#CHANGE_DEMAND_YEAR=false
-DEBUG_LIMIT_COUNTRIES=false
-DEBUG_COUNTRY_NAME=China
-#MAX_IMPORT_CHANGE=0.0
-#MARKET_ADJ_PRICE=false
-
-DEBUG_JUST_DEMAND_OUTPUT=false
-
-SSP_SCENARIO=SSP2_v9_130325
+DEBUG_LIMIT_COUNTRIES=true
+DEBUG_COUNTRY_NAME=Republic of Korea
 
 IS_CALIBRATION_RUN = true
-GENERATE_NEW_YIELD_CLUSTERS = false
-
-LIMIT_CEREAL_FRACTION=true
-
-USE_BIOENERGY_TRAJECTORY=true
-ENABLE_GEN2_BIOENERGY=true
-#BIOENERGY_CHANGE_ANNUAL_RATE=0.1111111
-#TECHNOLOGY_CHANGE_ANNUAL_RATE=0.005
-#TRADE_BARRIER_FACTOR_DEFAULT=0.3
-#NUM_YIELD_CLUSTERS=100
-
+GENERATE_NEW_YIELD_CLUSTERS = true
+NUM_YIELD_CLUSTERS=1000
 
-END_TIMESTEP=4
+END_TIMESTEP=0
 TIMESTEP_SIZE=1
 
 INTERPOLATE_OUTPUT_YEARS = false
\ No newline at end of file

src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java

@@ -98,6 +98,7 @@ public class GamsLocationOptimiser {
 		GAMSParameter agriExpansionCostP = inDB.addParameter("agriExpansionCost", 1);		
 
 		double totalAgriLand = 0;
+		double totalSuitable = 0;
 
 		for (Map.Entry<Integer, ? extends LandUseItem> entry : inputData.getPreviousLandUse().entrySet()) {
 			Integer locationId = entry.getKey();
@@ -105,6 +106,7 @@ public class GamsLocationOptimiser {
 			LandUseItem landUseItem = entry.getValue();
 			
 			double suitableLand = landUseItem.getSuitableLand();
+			totalSuitable += suitableLand;
 			if (DEBUG) LogWriter.println(String.format("  %d   %15s,\t %.3f", locationId, "suitableLand", suitableLand));
 			setGamsParamValueTruncate(landP.addRecord(locString), suitableLand, 3);
 			
@@ -153,7 +155,7 @@ public class GamsLocationOptimiser {
 				totalAgriLand += area;
 			}
 		}
-		if (DEBUG) LogWriter.println(String.format("  Total agricultural\t %.1f", totalAgriLand));
+		if (DEBUG) LogWriter.println(String.format("  Total agricultural %.1f,\t suitable %.1f", totalAgriLand, totalSuitable));
 
 		if (DEBUG) LogWriter.println("\nIrrigation data (cost, constraint)");
 		GAMSParameter irrigCostP = inDB.addParameter("irrigCost", 1);