Remove outputting of animal products as if they were crops

debug_config.properties

@@ -16,8 +16,6 @@ ORIG_LEAST_COST_MIN=false
 
 DEBUG_JUST_DEMAND_OUTPUT=false
 
-SSP_SCENARIO=SSP3_v9_130325
-
 IS_CALIBRATION_RUN = false
 GENERATE_NEW_YIELD_CLUSTERS = false
 NUM_YIELD_CLUSTERS=200
@@ -25,13 +23,27 @@ NUM_YIELD_CLUSTERS=200
 USE_BIOENERGY_TRAJECTORY=true
 ENABLE_GEN2_BIOENERGY=true
 
-FERTILISER_COST_PER_T=1.9
-
 #INITIAL_PRICE_SHIFT=3
 
-END_TIMESTEP=5
-TIMESTEP_SIZE=1
+END_TIMESTEP=18
+TIMESTEP_SIZE=5
 
 INTERPOLATE_OUTPUT_YEARS = false
 
-YIELD_FILENAME=yield.out
\ No newline at end of file
+YIELD_FILENAME=yield.out
+
+
+AGRI_LAND_EXPANSION_COST_FACTOR=0.598864839488112
+ANNUAL_MAX_IMPORT_CHANGE=0.0144521138994884
+FERTILISER_COST_PER_T=1.74996893009364
+IRRIG_COST_SCALE_FACTOR=0.000315070463316282
+IRRIGATION_EFFICIENCY=0.456856935948328
+LAND_CHANGE_COST=0.2
+MIN_NATURAL_RATE=0.0445126831921568
+OTHER_INTENSITY_COST=0.56324510448156
+SSP_SCENARIO=SSP3_v9_130325
+TECHNOLOGY_CHANGE_ANNUAL_RATE=0.000182337114264667
+TRADE_BARRIER_ADJ=1.4404211095802
+TRANSPORT_COST=0.0426490208963119
+BIOENERGY_FUTURE_DEMAND_FILENAME=bioenergy_scenario_data.csv
+BIOENERGY_DEMAND_SCENARIO=SSP3_RCP60

src/ac/ed/lurg/output/LandUseOutputer.java

@@ -35,7 +35,7 @@ public class LandUseOutputer extends AbstractLandUseOutputer {
 				sbHeader.append(" " + cover.getName());
 			}
 			
-			for (CropType crop : CropType.getAllItems()) {
+			for (CropType crop : CropType.getNonMeatTypes()) {
 				String cropString = crop.getGamsName();
 				sbHeader.append(" " + cropString + "_A " + cropString + "_FI " + cropString + "_FQ " + 
 							cropString + "_II " + cropString + "_IQ " + cropString + "_OI " + cropString + "_Y");
@@ -62,7 +62,7 @@ public class LandUseOutputer extends AbstractLandUseOutputer {
 					sbData.append(String.format(" %.8f", item.getLandCoverArea(cover)));
 				}
 
-				for (CropType crop : CropType.getAllItems()) {
+				for (CropType crop : CropType.getNonMeatTypes()) {
 					double cropFract = item.getCropFraction(crop);
 					Intensity intensity = item.getIntensity(crop);
 					double fertI = intensity==null ? 0.0 : intensity.getFertiliserIntensity();