diff --git a/GAMS/IntExtOpt.gms b/GAMS/IntExtOpt.gms
index 45ae5bf102a78a35b03cc235bcad4b12626308bc..aa7e1d674dadb3acccbfe82cc7b38f00ace84e5b 100644
--- a/GAMS/IntExtOpt.gms
+++ b/GAMS/IntExtOpt.gms
@@ -63,7 +63,7 @@ $gdxin
starchyRoots 4.0
pasture 0.1 / ;
- SCALAR fertiliserUnitCost / 1.5 /
+ SCALAR fertiliserUnitCost / 1.0 /
PARAMETER previousCropTotalAreas(location);
previousCropTotalAreas(location) = sum(crop_less_pasture, previousArea(crop_less_pasture, location));
@@ -169,6 +169,8 @@ $gdxin
scalar count / 1 /;
scalar newPasture / 0 /;
scalar newCropland / 0 /;
+ scalar cropAdjSingle / 0 /;
+ scalar pastureAdjSingle / 0 /;
parameter temp(location);
@@ -191,11 +193,15 @@ $gdxin
newPasture = sum(location, area.l("pasture", location));
newCropland = sum((location, crop_less_pasture), area.l(crop_less_pasture, location));
- cropAdj(crop_less_pasture) = cropAdj(crop_less_pasture) * newCropland / baseCropland;
- cropAdj("pasture") = cropAdj("pasture") * newPasture / basePasture;
+ cropAdjSingle = newCropland / baseCropland;
+ cropAdjSingle = min(max(cropAdjSingle, 0.5), 2);
+ cropAdj(crop_less_pasture) = cropAdj(crop_less_pasture) * cropAdjSingle;
+
+ pastureAdjSingle = newPasture / basePasture;
+ pastureAdjSingle = min(max(pastureAdjSingle, 0.5), 2);
+ cropAdj("pasture") = cropAdj("pasture") * pastureAdjSingle;
- cropAdj(crop) = max(cropAdj(crop), 0.2);
- cropAdj(crop) = min(cropAdj(crop), 5);
+ cropAdj(crop) = min(max(cropAdj(crop), 0.2), 5);
display area.l, count, basePasture, baseCropland, newPasture, newCropland, cropAdj;
count = count+1 ;
diff --git a/data/bio_demand.csv b/data/bio_demand.csv
new file mode 100644
index 0000000000000000000000000000000000000000..81e882fcde5bcfcbd2005d675eb70d2cb4e66c5b
--- /dev/null
+++ b/data/bio_demand.csv
@@ -0,0 +1,863 @@
+Country,Year,Item,other
+Afghanistan,2010,Cereals - Excluding Beer + (Total),0
+Albania,2010,Cereals - Excluding Beer + (Total),0.143274
+Algeria,2010,Cereals - Excluding Beer + (Total),0.5
+Angola,2010,Cereals - Excluding Beer + (Total),0.079646
+Antigua and Barbuda,2010,Cereals - Excluding Beer + (Total),0.001361
+Argentina,2010,Cereals - Excluding Beer + (Total),1.093777
+Armenia,2010,Cereals - Excluding Beer + (Total),0.036707
+Australia,2010,Cereals - Excluding Beer + (Total),0.692487
+Austria,2010,Cereals - Excluding Beer + (Total),0.1524
+Azerbaijan,2010,Cereals - Excluding Beer + (Total),0.152997
+Bahamas,2010,Cereals - Excluding Beer + (Total),0.007549
+Bangladesh,2010,Cereals - Excluding Beer + (Total),0.444604
+Barbados,2010,Cereals - Excluding Beer + (Total),0.004153
+Belarus,2010,Cereals - Excluding Beer + (Total),0.046277
+Belgium,2010,Cereals - Excluding Beer + (Total),1.108636
+Belize,2010,Cereals - Excluding Beer + (Total),0.004155
+Benin,2010,Cereals - Excluding Beer + (Total),0.052763
+Bermuda,2010,Cereals - Excluding Beer + (Total),0.002164
+Bolivia (Plurinational State of),2010,Cereals - Excluding Beer + (Total),0.385057
+Bosnia and Herzegovina,2010,Cereals - Excluding Beer + (Total),0.320397
+Botswana,2010,Cereals - Excluding Beer + (Total),0.000797
+Brazil,2010,Cereals - Excluding Beer + (Total),0.001737
+Brunei Darussalam,2010,Cereals - Excluding Beer + (Total),0.002797
+Bulgaria,2010,Cereals - Excluding Beer + (Total),0.301789
+Burkina Faso,2010,Cereals - Excluding Beer + (Total),3e-06
+Cabo Verde,2010,Cereals - Excluding Beer + (Total),0.024938
+Cambodia,2010,Cereals - Excluding Beer + (Total),1.980156
+Cameroon,2010,Cereals - Excluding Beer + (Total),0.070672
+Canada,2010,Cereals - Excluding Beer + (Total),1.257206
+Central African Republic,2010,Cereals - Excluding Beer + (Total),0
+Chad,2010,Cereals - Excluding Beer + (Total),0
+Chile,2010,Cereals - Excluding Beer + (Total),0.442625
+China,2010,Cereals - Excluding Beer + (Total),34.91782
+Colombia,2010,Cereals - Excluding Beer + (Total),0.001936
+Congo,2010,Cereals - Excluding Beer + (Total),1.3e-05
+Costa Rica,2010,Cereals - Excluding Beer + (Total),0.01324
+Cote d'Ivoire,2010,Cereals - Excluding Beer + (Total),0.005871
+Croatia,2010,Cereals - Excluding Beer + (Total),8.7e-05
+Cuba,2010,Cereals - Excluding Beer + (Total),0.001008
+Cyprus,2010,Cereals - Excluding Beer + (Total),0.013504
+Czech Republic,2010,Cereals - Excluding Beer + (Total),0.16159
+Democratic People's Republic of Korea,2010,Cereals - Excluding Beer + (Total),0.272819
+Denmark,2010,Cereals - Excluding Beer + (Total),0.230832
+Djibouti,2010,Cereals - Excluding Beer + (Total),0.004388
+Dominica,2010,Cereals - Excluding Beer + (Total),6.3e-05
+Dominican Republic,2010,Cereals - Excluding Beer + (Total),0.014001
+Ecuador,2010,Cereals - Excluding Beer + (Total),0.986481
+Egypt,2010,Cereals - Excluding Beer + (Total),0.254936
+El Salvador,2010,Cereals - Excluding Beer + (Total),0.006684
+Estonia,2010,Cereals - Excluding Beer + (Total),0.003197
+Ethiopia,2010,Cereals - Excluding Beer + (Total),2.8625
+Fiji,2010,Cereals - Excluding Beer + (Total),0.004455
+Finland,2010,Cereals - Excluding Beer + (Total),0.08207
+France,2010,Cereals - Excluding Beer + (Total),3.413063
+French Polynesia,2010,Cereals - Excluding Beer + (Total),0.020148
+Gabon,2010,Cereals - Excluding Beer + (Total),0.002172
+Gambia,2010,Cereals - Excluding Beer + (Total),0.044519
+Georgia,2010,Cereals - Excluding Beer + (Total),0.010543
+Germany,2010,Cereals - Excluding Beer + (Total),0.83977
+Ghana,2010,Cereals - Excluding Beer + (Total),0.000693
+Greece,2010,Cereals - Excluding Beer + (Total),0.290085
+Grenada,2010,Cereals - Excluding Beer + (Total),0.00214
+Guatemala,2010,Cereals - Excluding Beer + (Total),0
+Guinea,2010,Cereals - Excluding Beer + (Total),0.184222
+Guinea-Bissau,2010,Cereals - Excluding Beer + (Total),0
+Guyana,2010,Cereals - Excluding Beer + (Total),0.002928
+Haiti,2010,Cereals - Excluding Beer + (Total),0.002886
+Honduras,2010,Cereals - Excluding Beer + (Total),0
+Hungary,2010,Cereals - Excluding Beer + (Total),0.008692
+Iceland,2010,Cereals - Excluding Beer + (Total),0.005669
+India,2010,Cereals - Excluding Beer + (Total),0.018391
+Indonesia,2010,Cereals - Excluding Beer + (Total),12.088205
+Iran (Islamic Republic of),2010,Cereals - Excluding Beer + (Total),0.010268
+Iraq,2010,Cereals - Excluding Beer + (Total),0.40106
+Ireland,2010,Cereals - Excluding Beer + (Total),0.007696
+Israel,2010,Cereals - Excluding Beer + (Total),0.276221
+Italy,2010,Cereals - Excluding Beer + (Total),0.455185
+Jamaica,2010,Cereals - Excluding Beer + (Total),0.001198
+Japan,2010,Cereals - Excluding Beer + (Total),0.100101
+Jordan,2010,Cereals - Excluding Beer + (Total),0.007167
+Kazakhstan,2010,Cereals - Excluding Beer + (Total),1.088946
+Kenya,2010,Cereals - Excluding Beer + (Total),0.045347
+Kiribati,2010,Cereals - Excluding Beer + (Total),0.002715
+Kuwait,2010,Cereals - Excluding Beer + (Total),0.017883
+Kyrgyzstan,2010,Cereals - Excluding Beer + (Total),0.002073
+Lao People's Democratic Republic,2010,Cereals - Excluding Beer + (Total),0.679083
+Latvia,2010,Cereals - Excluding Beer + (Total),0.000375
+Lebanon,2010,Cereals - Excluding Beer + (Total),0.013658
+Lesotho,2010,Cereals - Excluding Beer + (Total),0
+Liberia,2010,Cereals - Excluding Beer + (Total),0
+Libya,2010,Cereals - Excluding Beer + (Total),0.264168
+Lithuania,2010,Cereals - Excluding Beer + (Total),0.109585
+Madagascar,2010,Cereals - Excluding Beer + (Total),0.000567
+Malawi,2010,Cereals - Excluding Beer + (Total),4e-04
+Malaysia,2010,Cereals - Excluding Beer + (Total),0.278756
+Maldives,2010,Cereals - Excluding Beer + (Total),0.009843
+Mali,2010,Cereals - Excluding Beer + (Total),1.260693
+Malta,2010,Cereals - Excluding Beer + (Total),0.009487
+Mauritania,2010,Cereals - Excluding Beer + (Total),0
+Mauritius,2010,Cereals - Excluding Beer + (Total),0.004213
+Mexico,2010,Cereals - Excluding Beer + (Total),1.796047
+Mongolia,2010,Cereals - Excluding Beer + (Total),4.1e-05
+Morocco,2010,Cereals - Excluding Beer + (Total),0.01974
+Mozambique,2010,Cereals - Excluding Beer + (Total),0
+Myanmar,2010,Cereals - Excluding Beer + (Total),0.809318
+Namibia,2010,Cereals - Excluding Beer + (Total),0.000369
+Nepal,2010,Cereals - Excluding Beer + (Total),0.000383
+Netherlands,2010,Cereals - Excluding Beer + (Total),0.997272
+Netherlands Antilles,2010,Cereals - Excluding Beer + (Total),0.001389
+New Caledonia,2010,Cereals - Excluding Beer + (Total),0.023471
+New Zealand,2010,Cereals - Excluding Beer + (Total),0.041677
+Nicaragua,2010,Cereals - Excluding Beer + (Total),0.047599
+Niger,2010,Cereals - Excluding Beer + (Total),4e-06
+Nigeria,2010,Cereals - Excluding Beer + (Total),0.034688
+Norway,2010,Cereals - Excluding Beer + (Total),0.088607
+Occupied Palestinian Territory,2010,Cereals - Excluding Beer + (Total),0
+Pakistan,2010,Cereals - Excluding Beer + (Total),1.640673
+Panama,2010,Cereals - Excluding Beer + (Total),0.035333
+Paraguay,2010,Cereals - Excluding Beer + (Total),0.005416
+Peru,2010,Cereals - Excluding Beer + (Total),0.49848
+Philippines,2010,Cereals - Excluding Beer + (Total),1.392329
+Poland,2010,Cereals - Excluding Beer + (Total),0.863639
+Portugal,2010,Cereals - Excluding Beer + (Total),0.034625
+Republic of Korea,2010,Cereals - Excluding Beer + (Total),0.134704
+Republic of Moldova,2010,Cereals - Excluding Beer + (Total),0.001305
+Romania,2010,Cereals - Excluding Beer + (Total),0.701143
+Russian Federation,2010,Cereals - Excluding Beer + (Total),0.005931
+Rwanda,2010,Cereals - Excluding Beer + (Total),1.1e-05
+Saint Kitts and Nevis,2010,Cereals - Excluding Beer + (Total),0.001403
+Saint Lucia,2010,Cereals - Excluding Beer + (Total),0.002507
+Saint Vincent and the Grenadines,2010,Cereals - Excluding Beer + (Total),0.001077
+Samoa,2010,Cereals - Excluding Beer + (Total),0.002042
+Sao Tome and Principe,2010,Cereals - Excluding Beer + (Total),0
+Saudi Arabia,2010,Cereals - Excluding Beer + (Total),0.009729
+Senegal,2010,Cereals - Excluding Beer + (Total),0.240932
+Serbia,2010,Cereals - Excluding Beer + (Total),0.01531
+Sierra Leone,2010,Cereals - Excluding Beer + (Total),2.1e-05
+Slovakia,2010,Cereals - Excluding Beer + (Total),0.091428
+Slovenia,2010,Cereals - Excluding Beer + (Total),0.01362
+Solomon Islands,2010,Cereals - Excluding Beer + (Total),0.006155
+Somalia,2010,Cereals - Excluding Beer + (Total),0
+South Africa,2010,Cereals - Excluding Beer + (Total),0.25
+Spain,2010,Cereals - Excluding Beer + (Total),1.33862
+Sri Lanka,2010,Cereals - Excluding Beer + (Total),0.013544
+Sudan (former),2010,Cereals - Excluding Beer + (Total),0.085
+Suriname,2010,Cereals - Excluding Beer + (Total),0.01409
+Swaziland,2010,Cereals - Excluding Beer + (Total),0.028665
+Sweden,2010,Cereals - Excluding Beer + (Total),0.023042
+Switzerland,2010,Cereals - Excluding Beer + (Total),0.066246
+Syrian Arab Republic,2010,Cereals - Excluding Beer + (Total),0
+Tajikistan,2010,Cereals - Excluding Beer + (Total),0.005011
+Thailand,2010,Cereals - Excluding Beer + (Total),0
+The former Yugoslav Republic of Macedonia,2010,Cereals - Excluding Beer + (Total),0.078508
+Timor-Leste,2010,Cereals - Excluding Beer + (Total),0
+Togo,2010,Cereals - Excluding Beer + (Total),0
+Trinidad and Tobago,2010,Cereals - Excluding Beer + (Total),0.001512
+Tunisia,2010,Cereals - Excluding Beer + (Total),0.010492
+Turkey,2010,Cereals - Excluding Beer + (Total),1.538229
+Turkmenistan,2010,Cereals - Excluding Beer + (Total),0
+Uganda,2010,Cereals - Excluding Beer + (Total),0.000796
+Ukraine,2010,Cereals - Excluding Beer + (Total),0.030646
+United Arab Emirates,2010,Cereals - Excluding Beer + (Total),0.194776
+United Kingdom,2010,Cereals - Excluding Beer + (Total),1.10391
+United Republic of Tanzania,2010,Cereals - Excluding Beer + (Total),0.008227
+United States of America,2010,Cereals - Excluding Beer + (Total),136.858107
+Uruguay,2010,Cereals - Excluding Beer + (Total),0.008394
+Uzbekistan,2010,Cereals - Excluding Beer + (Total),0.004418
+Vanuatu,2010,Cereals - Excluding Beer + (Total),0.000822
+Venezuela (Bolivarian Republic of),2010,Cereals - Excluding Beer + (Total),0.001671
+Viet Nam,2010,Cereals - Excluding Beer + (Total),1.144035
+Yemen,2010,Cereals - Excluding Beer + (Total),0
+Zambia,2010,Cereals - Excluding Beer + (Total),0.000667
+Zimbabwe,2010,Cereals - Excluding Beer + (Total),0
+Afghanistan,2010,Oilcrops + (Total),0
+Albania,2010,Oilcrops + (Total),0.022936
+Algeria,2010,Oilcrops + (Total),0.001166
+Angola,2010,Oilcrops + (Total),0.016103
+Antigua and Barbuda,2010,Oilcrops + (Total),0
+Argentina,2010,Oilcrops + (Total),1.947646
+Armenia,2010,Oilcrops + (Total),0.001
+Australia,2010,Oilcrops + (Total),0.105136
+Austria,2010,Oilcrops + (Total),0.183033
+Azerbaijan,2010,Oilcrops + (Total),0.001183
+Bahamas,2010,Oilcrops + (Total),0.000203
+Bangladesh,2010,Oilcrops + (Total),0.083833
+Barbados,2010,Oilcrops + (Total),0.001795
+Belarus,2010,Oilcrops + (Total),0.010523
+Belgium,2010,Oilcrops + (Total),0.674075
+Belize,2010,Oilcrops + (Total),0.000603
+Benin,2010,Oilcrops + (Total),0.016656
+Bermuda,2010,Oilcrops + (Total),0
+Bolivia (Plurinational State of),2010,Oilcrops + (Total),0.065183
+Bosnia and Herzegovina,2010,Oilcrops + (Total),0.021589
+Botswana,2010,Oilcrops + (Total),1.7e-05
+Brazil,2010,Oilcrops + (Total),3.053598
+Brunei Darussalam,2010,Oilcrops + (Total),9e-05
+Bulgaria,2010,Oilcrops + (Total),0.032419
+Burkina Faso,2010,Oilcrops + (Total),0
+Cabo Verde,2010,Oilcrops + (Total),0.004579
+Cambodia,2010,Oilcrops + (Total),0.001368
+Cameroon,2010,Oilcrops + (Total),0.037716
+Canada,2010,Oilcrops + (Total),0.218264
+Central African Republic,2010,Oilcrops + (Total),0.017143
+Chad,2010,Oilcrops + (Total),0.00043
+Chile,2010,Oilcrops + (Total),0.123139
+China,2010,Oilcrops + (Total),13.460773
+Colombia,2010,Oilcrops + (Total),0.060516
+Congo,2010,Oilcrops + (Total),0
+Costa Rica,2010,Oilcrops + (Total),0.008889
+Cote d'Ivoire,2010,Oilcrops + (Total),0
+Croatia,2010,Oilcrops + (Total),0.044453
+Cuba,2010,Oilcrops + (Total),0.0188
+Cyprus,2010,Oilcrops + (Total),0.008952
+Czech Republic,2010,Oilcrops + (Total),0.073148
+Democratic People's Republic of Korea,2010,Oilcrops + (Total),0.079171
+Denmark,2010,Oilcrops + (Total),0.156803
+Djibouti,2010,Oilcrops + (Total),0
+Dominica,2010,Oilcrops + (Total),0.002995
+Dominican Republic,2010,Oilcrops + (Total),0.040024
+Ecuador,2010,Oilcrops + (Total),0.0438
+Egypt,2010,Oilcrops + (Total),0.519321
+El Salvador,2010,Oilcrops + (Total),0.000624
+Estonia,2010,Oilcrops + (Total),0.014673
+Ethiopia,2010,Oilcrops + (Total),0
+Fiji,2010,Oilcrops + (Total),0.109179
+Finland,2010,Oilcrops + (Total),0.043489
+France,2010,Oilcrops + (Total),1.711561
+French Polynesia,2010,Oilcrops + (Total),0.016837
+Gabon,2010,Oilcrops + (Total),0.00079
+Gambia,2010,Oilcrops + (Total),0.002795
+Georgia,2010,Oilcrops + (Total),0.0242
+Germany,2010,Oilcrops + (Total),1.922239
+Ghana,2010,Oilcrops + (Total),0.012833
+Greece,2010,Oilcrops + (Total),0.21473
+Grenada,2010,Oilcrops + (Total),0.000326
+Guatemala,2010,Oilcrops + (Total),0.034947
+Guinea,2010,Oilcrops + (Total),0.05968
+Guinea-Bissau,2010,Oilcrops + (Total),0.00269
+Guyana,2010,Oilcrops + (Total),0.002001
+Haiti,2010,Oilcrops + (Total),0.006937
+Honduras,2010,Oilcrops + (Total),0.000247
+Hungary,2010,Oilcrops + (Total),0.139322
+Iceland,2010,Oilcrops + (Total),0.003075
+India,2010,Oilcrops + (Total),1.043418
+Indonesia,2010,Oilcrops + (Total),4.507639
+Iran (Islamic Republic of),2010,Oilcrops + (Total),0.120021
+Iraq,2010,Oilcrops + (Total),0
+Ireland,2010,Oilcrops + (Total),0.035169
+Israel,2010,Oilcrops + (Total),0.004
+Italy,2010,Oilcrops + (Total),0.494229
+Jamaica,2010,Oilcrops + (Total),0.148786
+Japan,2010,Oilcrops + (Total),0.009055
+Jordan,2010,Oilcrops + (Total),2.2e-05
+Kazakhstan,2010,Oilcrops + (Total),0.005986
+Kenya,2010,Oilcrops + (Total),7e-06
+Kiribati,2010,Oilcrops + (Total),0.10175
+Kuwait,2010,Oilcrops + (Total),0.003363
+Kyrgyzstan,2010,Oilcrops + (Total),0.01
+Lao People's Democratic Republic,2010,Oilcrops + (Total),0.000915
+Latvia,2010,Oilcrops + (Total),0.065006
+Lebanon,2010,Oilcrops + (Total),0.030108
+Lesotho,2010,Oilcrops + (Total),0
+Liberia,2010,Oilcrops + (Total),0
+Libya,2010,Oilcrops + (Total),0.046622
+Lithuania,2010,Oilcrops + (Total),0.054625
+Madagascar,2010,Oilcrops + (Total),0.002394
+Malawi,2010,Oilcrops + (Total),0.000422
+Malaysia,2010,Oilcrops + (Total),0.025904
+Maldives,2010,Oilcrops + (Total),8e-05
+Mali,2010,Oilcrops + (Total),0.12045
+Malta,2010,Oilcrops + (Total),0.001744
+Mauritania,2010,Oilcrops + (Total),0
+Mauritius,2010,Oilcrops + (Total),0.015069
+Mexico,2010,Oilcrops + (Total),1.122133
+Mongolia,2010,Oilcrops + (Total),6e-06
+Morocco,2010,Oilcrops + (Total),0.21087
+Mozambique,2010,Oilcrops + (Total),0
+Myanmar,2010,Oilcrops + (Total),0.357799
+Namibia,2010,Oilcrops + (Total),0
+Nepal,2010,Oilcrops + (Total),0.027776
+Netherlands,2010,Oilcrops + (Total),0.38513
+Netherlands Antilles,2010,Oilcrops + (Total),0.000462
+New Caledonia,2010,Oilcrops + (Total),0.010364
+New Zealand,2010,Oilcrops + (Total),0.031109
+Nicaragua,2010,Oilcrops + (Total),0.012254
+Niger,2010,Oilcrops + (Total),4e-06
+Nigeria,2010,Oilcrops + (Total),0.673609
+Norway,2010,Oilcrops + (Total),0.15872
+Occupied Palestinian Territory,2010,Oilcrops + (Total),0.000173
+Pakistan,2010,Oilcrops + (Total),0.491287
+Panama,2010,Oilcrops + (Total),0.022491
+Paraguay,2010,Oilcrops + (Total),0.025012
+Peru,2010,Oilcrops + (Total),0.31795
+Philippines,2010,Oilcrops + (Total),3.055173
+Poland,2010,Oilcrops + (Total),0.57847
+Portugal,2010,Oilcrops + (Total),0.309846
+Republic of Korea,2010,Oilcrops + (Total),0
+Republic of Moldova,2010,Oilcrops + (Total),0.00288
+Romania,2010,Oilcrops + (Total),0.066744
+Russian Federation,2010,Oilcrops + (Total),0.718975
+Rwanda,2010,Oilcrops + (Total),4e-06
+Saint Kitts and Nevis,2010,Oilcrops + (Total),0.000156
+Saint Lucia,2010,Oilcrops + (Total),0.000382
+Saint Vincent and the Grenadines,2010,Oilcrops + (Total),4.1e-05
+Samoa,2010,Oilcrops + (Total),0.056964
+Sao Tome and Principe,2010,Oilcrops + (Total),0.0014
+Saudi Arabia,2010,Oilcrops + (Total),0.041977
+Senegal,2010,Oilcrops + (Total),0.121489
+Serbia,2010,Oilcrops + (Total),0.029845
+Sierra Leone,2010,Oilcrops + (Total),0
+Slovakia,2010,Oilcrops + (Total),0.108945
+Slovenia,2010,Oilcrops + (Total),0.03167
+Solomon Islands,2010,Oilcrops + (Total),0.244808
+Somalia,2010,Oilcrops + (Total),0
+South Africa,2010,Oilcrops + (Total),0.061476
+Spain,2010,Oilcrops + (Total),0.413958
+Sri Lanka,2010,Oilcrops + (Total),3e-06
+Sudan (former),2010,Oilcrops + (Total),0.224407
+Suriname,2010,Oilcrops + (Total),0.003231
+Swaziland,2010,Oilcrops + (Total),0.000318
+Sweden,2010,Oilcrops + (Total),0.189995
+Switzerland,2010,Oilcrops + (Total),0.009526
+Syrian Arab Republic,2010,Oilcrops + (Total),0.046279
+Tajikistan,2010,Oilcrops + (Total),0
+Thailand,2010,Oilcrops + (Total),0.509355
+The former Yugoslav Republic of Macedonia,2010,Oilcrops + (Total),0.001702
+Timor-Leste,2010,Oilcrops + (Total),0
+Togo,2010,Oilcrops + (Total),0.000575
+Trinidad and Tobago,2010,Oilcrops + (Total),0.009526
+Tunisia,2010,Oilcrops + (Total),0.04454
+Turkey,2010,Oilcrops + (Total),0.467729
+Turkmenistan,2010,Oilcrops + (Total),0
+Uganda,2010,Oilcrops + (Total),2e-06
+Ukraine,2010,Oilcrops + (Total),0.023979
+United Arab Emirates,2010,Oilcrops + (Total),0.112118
+United Kingdom,2010,Oilcrops + (Total),0.196523
+United Republic of Tanzania,2010,Oilcrops + (Total),0.094509
+United States of America,2010,Oilcrops + (Total),1.291421
+Uruguay,2010,Oilcrops + (Total),0.015958
+Uzbekistan,2010,Oilcrops + (Total),0.035
+Vanuatu,2010,Oilcrops + (Total),0.16829
+Venezuela (Bolivarian Republic of),2010,Oilcrops + (Total),0.111418
+Viet Nam,2010,Oilcrops + (Total),2.906231
+Yemen,2010,Oilcrops + (Total),0.00017
+Zambia,2010,Oilcrops + (Total),6.1e-05
+Zimbabwe,2010,Oilcrops + (Total),5.5e-05
+Afghanistan,2010,Pulses + (Total),0
+Albania,2010,Pulses + (Total),0
+Algeria,2010,Pulses + (Total),0
+Angola,2010,Pulses + (Total),0
+Antigua and Barbuda,2010,Pulses + (Total),0
+Argentina,2010,Pulses + (Total),0
+Armenia,2010,Pulses + (Total),0
+Australia,2010,Pulses + (Total),0
+Austria,2010,Pulses + (Total),0
+Azerbaijan,2010,Pulses + (Total),0
+Bahamas,2010,Pulses + (Total),0
+Bangladesh,2010,Pulses + (Total),0
+Barbados,2010,Pulses + (Total),0
+Belarus,2010,Pulses + (Total),0
+Belgium,2010,Pulses + (Total),0
+Belize,2010,Pulses + (Total),0
+Benin,2010,Pulses + (Total),0
+Bermuda,2010,Pulses + (Total),0
+Bolivia (Plurinational State of),2010,Pulses + (Total),0
+Bosnia and Herzegovina,2010,Pulses + (Total),0
+Botswana,2010,Pulses + (Total),0
+Brazil,2010,Pulses + (Total),0
+Brunei Darussalam,2010,Pulses + (Total),0
+Bulgaria,2010,Pulses + (Total),0
+Burkina Faso,2010,Pulses + (Total),0.29
+Cabo Verde,2010,Pulses + (Total),0
+Cambodia,2010,Pulses + (Total),0
+Cameroon,2010,Pulses + (Total),0
+Canada,2010,Pulses + (Total),0
+Central African Republic,2010,Pulses + (Total),0
+Chad,2010,Pulses + (Total),0
+Chile,2010,Pulses + (Total),0.007
+China,2010,Pulses + (Total),3.8e-05
+Colombia,2010,Pulses + (Total),0
+Congo,2010,Pulses + (Total),0
+Costa Rica,2010,Pulses + (Total),0
+Cote d'Ivoire,2010,Pulses + (Total),0
+Croatia,2010,Pulses + (Total),0
+Cuba,2010,Pulses + (Total),0.005
+Cyprus,2010,Pulses + (Total),0
+Czech Republic,2010,Pulses + (Total),0
+Democratic People's Republic of Korea,2010,Pulses + (Total),0
+Denmark,2010,Pulses + (Total),0
+Djibouti,2010,Pulses + (Total),0
+Dominica,2010,Pulses + (Total),5e-06
+Dominican Republic,2010,Pulses + (Total),0
+Ecuador,2010,Pulses + (Total),0
+Egypt,2010,Pulses + (Total),0
+El Salvador,2010,Pulses + (Total),0
+Estonia,2010,Pulses + (Total),0
+Ethiopia,2010,Pulses + (Total),0
+Fiji,2010,Pulses + (Total),0
+Finland,2010,Pulses + (Total),0
+France,2010,Pulses + (Total),0
+French Polynesia,2010,Pulses + (Total),0
+Gabon,2010,Pulses + (Total),0
+Gambia,2010,Pulses + (Total),0
+Georgia,2010,Pulses + (Total),0
+Germany,2010,Pulses + (Total),0
+Ghana,2010,Pulses + (Total),0
+Greece,2010,Pulses + (Total),0.000898
+Grenada,2010,Pulses + (Total),4.8e-05
+Guatemala,2010,Pulses + (Total),0
+Guinea,2010,Pulses + (Total),0
+Guinea-Bissau,2010,Pulses + (Total),0
+Guyana,2010,Pulses + (Total),0
+Haiti,2010,Pulses + (Total),0
+Honduras,2010,Pulses + (Total),0
+Hungary,2010,Pulses + (Total),5.3e-05
+Iceland,2010,Pulses + (Total),0
+India,2010,Pulses + (Total),0
+Indonesia,2010,Pulses + (Total),0
+Iran (Islamic Republic of),2010,Pulses + (Total),0
+Iraq,2010,Pulses + (Total),0
+Ireland,2010,Pulses + (Total),0
+Israel,2010,Pulses + (Total),0
+Italy,2010,Pulses + (Total),0
+Jamaica,2010,Pulses + (Total),0
+Japan,2010,Pulses + (Total),0
+Jordan,2010,Pulses + (Total),0
+Kazakhstan,2010,Pulses + (Total),0
+Kenya,2010,Pulses + (Total),0
+Kiribati,2010,Pulses + (Total),0
+Kuwait,2010,Pulses + (Total),0
+Kyrgyzstan,2010,Pulses + (Total),0
+Lao People's Democratic Republic,2010,Pulses + (Total),0
+Latvia,2010,Pulses + (Total),0
+Lebanon,2010,Pulses + (Total),0.001
+Lesotho,2010,Pulses + (Total),0
+Liberia,2010,Pulses + (Total),0
+Libya,2010,Pulses + (Total),0
+Lithuania,2010,Pulses + (Total),0
+Madagascar,2010,Pulses + (Total),0
+Malawi,2010,Pulses + (Total),0
+Malaysia,2010,Pulses + (Total),0
+Maldives,2010,Pulses + (Total),5e-05
+Mali,2010,Pulses + (Total),0
+Malta,2010,Pulses + (Total),0.00012
+Mauritania,2010,Pulses + (Total),0
+Mauritius,2010,Pulses + (Total),0
+Mexico,2010,Pulses + (Total),0
+Mongolia,2010,Pulses + (Total),0
+Morocco,2010,Pulses + (Total),0
+Mozambique,2010,Pulses + (Total),0
+Myanmar,2010,Pulses + (Total),0.315
+Namibia,2010,Pulses + (Total),0
+Nepal,2010,Pulses + (Total),0
+Netherlands,2010,Pulses + (Total),0
+Netherlands Antilles,2010,Pulses + (Total),0
+New Caledonia,2010,Pulses + (Total),0
+New Zealand,2010,Pulses + (Total),0
+Nicaragua,2010,Pulses + (Total),0
+Niger,2010,Pulses + (Total),0
+Nigeria,2010,Pulses + (Total),0
+Norway,2010,Pulses + (Total),0.05
+Occupied Palestinian Territory,2010,Pulses + (Total),0
+Pakistan,2010,Pulses + (Total),0
+Panama,2010,Pulses + (Total),0
+Paraguay,2010,Pulses + (Total),0
+Peru,2010,Pulses + (Total),1e-04
+Philippines,2010,Pulses + (Total),0
+Poland,2010,Pulses + (Total),0
+Portugal,2010,Pulses + (Total),0
+Republic of Korea,2010,Pulses + (Total),0
+Republic of Moldova,2010,Pulses + (Total),0
+Romania,2010,Pulses + (Total),0
+Russian Federation,2010,Pulses + (Total),0
+Rwanda,2010,Pulses + (Total),0
+Saint Kitts and Nevis,2010,Pulses + (Total),2.9e-05
+Saint Lucia,2010,Pulses + (Total),7e-06
+Saint Vincent and the Grenadines,2010,Pulses + (Total),3.2e-05
+Samoa,2010,Pulses + (Total),0
+Sao Tome and Principe,2010,Pulses + (Total),0
+Saudi Arabia,2010,Pulses + (Total),0
+Senegal,2010,Pulses + (Total),0.01
+Serbia,2010,Pulses + (Total),0
+Sierra Leone,2010,Pulses + (Total),0
+Slovakia,2010,Pulses + (Total),0
+Slovenia,2010,Pulses + (Total),0
+Solomon Islands,2010,Pulses + (Total),0
+Somalia,2010,Pulses + (Total),0
+South Africa,2010,Pulses + (Total),0
+Spain,2010,Pulses + (Total),0
+Sri Lanka,2010,Pulses + (Total),0.015
+Sudan (former),2010,Pulses + (Total),0
+Suriname,2010,Pulses + (Total),0
+Swaziland,2010,Pulses + (Total),0
+Sweden,2010,Pulses + (Total),0
+Switzerland,2010,Pulses + (Total),0
+Syrian Arab Republic,2010,Pulses + (Total),0
+Tajikistan,2010,Pulses + (Total),0
+Thailand,2010,Pulses + (Total),0
+The former Yugoslav Republic of Macedonia,2010,Pulses + (Total),0
+Timor-Leste,2010,Pulses + (Total),0
+Togo,2010,Pulses + (Total),0
+Trinidad and Tobago,2010,Pulses + (Total),0
+Tunisia,2010,Pulses + (Total),0
+Turkey,2010,Pulses + (Total),0
+Turkmenistan,2010,Pulses + (Total),0
+Uganda,2010,Pulses + (Total),0
+Ukraine,2010,Pulses + (Total),0
+United Arab Emirates,2010,Pulses + (Total),0.013613
+United Kingdom,2010,Pulses + (Total),0
+United Republic of Tanzania,2010,Pulses + (Total),0
+United States of America,2010,Pulses + (Total),0
+Uruguay,2010,Pulses + (Total),0
+Uzbekistan,2010,Pulses + (Total),0
+Vanuatu,2010,Pulses + (Total),0
+Venezuela (Bolivarian Republic of),2010,Pulses + (Total),0
+Viet Nam,2010,Pulses + (Total),0
+Yemen,2010,Pulses + (Total),0
+Zambia,2010,Pulses + (Total),0
+Zimbabwe,2010,Pulses + (Total),0
+Afghanistan,2010,Soyabeans,0
+Albania,2010,Soyabeans,0
+Algeria,2010,Soyabeans,0
+Angola,2010,Soyabeans,0.015
+Antigua and Barbuda,2010,Soyabeans,0
+Argentina,2010,Soyabeans,1.7
+Armenia,2010,Soyabeans,0
+Australia,2010,Soyabeans,0.000358
+Austria,2010,Soyabeans,0.002839
+Azerbaijan,2010,Soyabeans,5e-06
+Bahamas,2010,Soyabeans,1e-04
+Bangladesh,2010,Soyabeans,0.08
+Barbados,2010,Soyabeans,0.00178
+Belarus,2010,Soyabeans,0
+Belgium,2010,Soyabeans,0.019886
+Belize,2010,Soyabeans,0
+Benin,2010,Soyabeans,0
+Bolivia (Plurinational State of),2010,Soyabeans,0.065
+Bosnia and Herzegovina,2010,Soyabeans,0
+Botswana,2010,Soyabeans,0
+Brazil,2010,Soyabeans,2.717479
+Brunei Darussalam,2010,Soyabeans,0
+Bulgaria,2010,Soyabeans,0
+Burkina Faso,2010,Soyabeans,0
+Cabo Verde,2010,Soyabeans,0.0045
+Cambodia,2010,Soyabeans,0
+Cameroon,2010,Soyabeans,0
+Canada,2010,Soyabeans,0.06545
+Central African Republic,2010,Soyabeans,0
+Chile,2010,Soyabeans,0.119748
+China,2010,Soyabeans,7.544093
+Colombia,2010,Soyabeans,0.033055
+Congo,2010,Soyabeans,0
+Costa Rica,2010,Soyabeans,0.0086
+Cote d'Ivoire,2010,Soyabeans,0
+Croatia,2010,Soyabeans,1e-04
+Cuba,2010,Soyabeans,0.0174
+Cyprus,2010,Soyabeans,0.006
+Czech Republic,2010,Soyabeans,0.005366
+Democratic People's Republic of Korea,2010,Soyabeans,0
+Denmark,2010,Soyabeans,0.046438
+Djibouti,2010,Soyabeans,0
+Dominica,2010,Soyabeans,0
+Dominican Republic,2010,Soyabeans,0.04
+Ecuador,2010,Soyabeans,0.04065
+Egypt,2010,Soyabeans,0.267
+El Salvador,2010,Soyabeans,0
+Estonia,2010,Soyabeans,2e-04
+Ethiopia,2010,Soyabeans,0
+Fiji,2010,Soyabeans,5e-04
+Finland,2010,Soyabeans,5.2e-05
+France,2010,Soyabeans,0
+French Polynesia,2010,Soyabeans,8.2e-05
+Gabon,2010,Soyabeans,0
+Gambia,2010,Soyabeans,0
+Georgia,2010,Soyabeans,0
+Germany,2010,Soyabeans,0.357021
+Ghana,2010,Soyabeans,0
+Greece,2010,Soyabeans,0.053
+Grenada,2010,Soyabeans,0
+Guatemala,2010,Soyabeans,0.03445
+Guinea,2010,Soyabeans,0
+Guinea-Bissau,2010,Soyabeans,0
+Guyana,2010,Soyabeans,0
+Haiti,2010,Soyabeans,0
+Honduras,2010,Soyabeans,0
+Hungary,2010,Soyabeans,0
+Iceland,2010,Soyabeans,0.0011
+India,2010,Soyabeans,1
+Indonesia,2010,Soyabeans,0
+Iran (Islamic Republic of),2010,Soyabeans,0.056431
+Iraq,2010,Soyabeans,0
+Ireland,2010,Soyabeans,0.03
+Israel,2010,Soyabeans,0
+Italy,2010,Soyabeans,0.0025
+Jamaica,2010,Soyabeans,0
+Japan,2010,Soyabeans,0.007838
+Jordan,2010,Soyabeans,0
+Kazakhstan,2010,Soyabeans,0
+Kenya,2010,Soyabeans,0
+Kiribati,2010,Soyabeans,0
+Kuwait,2010,Soyabeans,0
+Kyrgyzstan,2010,Soyabeans,0
+Lao People's Democratic Republic,2010,Soyabeans,0.000915
+Latvia,2010,Soyabeans,0.002519
+Lebanon,2010,Soyabeans,0
+Liberia,2010,Soyabeans,0
+Libya,2010,Soyabeans,0
+Lithuania,2010,Soyabeans,0
+Madagascar,2010,Soyabeans,0
+Malawi,2010,Soyabeans,0
+Malaysia,2010,Soyabeans,0
+Maldives,2010,Soyabeans,7e-05
+Mali,2010,Soyabeans,0
+Malta,2010,Soyabeans,0.000619
+Mauritania,2010,Soyabeans,0
+Mauritius,2010,Soyabeans,0.005
+Mexico,2010,Soyabeans,0.49471
+Mongolia,2010,Soyabeans,0
+Morocco,2010,Soyabeans,0.209356
+Mozambique,2010,Soyabeans,0
+Myanmar,2010,Soyabeans,0
+Namibia,2010,Soyabeans,0
+Nepal,2010,Soyabeans,0
+Netherlands,2010,Soyabeans,0.082608
+Netherlands Antilles,2010,Soyabeans,0.000456
+New Caledonia,2010,Soyabeans,0
+New Zealand,2010,Soyabeans,0.007125
+Nicaragua,2010,Soyabeans,0.012
+Niger,2010,Soyabeans,0
+Nigeria,2010,Soyabeans,0
+Norway,2010,Soyabeans,0
+Occupied Palestinian Territory,2010,Soyabeans,0
+Pakistan,2010,Soyabeans,0.005169
+Panama,2010,Soyabeans,0
+Paraguay,2010,Soyabeans,0
+Peru,2010,Soyabeans,0.313053
+Philippines,2010,Soyabeans,0
+Poland,2010,Soyabeans,0.003035
+Portugal,2010,Soyabeans,0.15
+Republic of Korea,2010,Soyabeans,0
+Republic of Moldova,2010,Soyabeans,0
+Romania,2010,Soyabeans,0.000189
+Russian Federation,2010,Soyabeans,0.085137
+Rwanda,2010,Soyabeans,4e-06
+Saint Kitts and Nevis,2010,Soyabeans,3.8e-05
+Saint Lucia,2010,Soyabeans,0.000382
+Saint Vincent and the Grenadines,2010,Soyabeans,0
+Samoa,2010,Soyabeans,0
+Sao Tome and Principe,2010,Soyabeans,0.0014
+Saudi Arabia,2010,Soyabeans,0
+Senegal,2010,Soyabeans,0
+Serbia,2010,Soyabeans,0.019022
+Sierra Leone,2010,Soyabeans,0
+Slovakia,2010,Soyabeans,0
+Slovenia,2010,Soyabeans,0.0035
+Solomon Islands,2010,Soyabeans,0
+Somalia,2010,Soyabeans,0
+South Africa,2010,Soyabeans,0
+Spain,2010,Soyabeans,0.203885
+Sri Lanka,2010,Soyabeans,0
+Sudan (former),2010,Soyabeans,0
+Suriname,2010,Soyabeans,0.0032
+Swaziland,2010,Soyabeans,0
+Sweden,2010,Soyabeans,0
+Switzerland,2010,Soyabeans,0
+Syrian Arab Republic,2010,Soyabeans,0.009
+Tajikistan,2010,Soyabeans,0
+Thailand,2010,Soyabeans,0.50771
+The former Yugoslav Republic of Macedonia,2010,Soyabeans,0
+Timor-Leste,2010,Soyabeans,0
+Togo,2010,Soyabeans,0
+Trinidad and Tobago,2010,Soyabeans,0.0063
+Tunisia,2010,Soyabeans,0.0425
+Turkey,2010,Soyabeans,0.018215
+Turkmenistan,2010,Soyabeans,0
+Uganda,2010,Soyabeans,0
+Ukraine,2010,Soyabeans,0.000118
+United Arab Emirates,2010,Soyabeans,0.027
+United Kingdom,2010,Soyabeans,0.001145
+United Republic of Tanzania,2010,Soyabeans,0
+United States of America,2010,Soyabeans,0.4
+Uruguay,2010,Soyabeans,0
+Uzbekistan,2010,Soyabeans,0
+Vanuatu,2010,Soyabeans,0
+Venezuela (Bolivarian Republic of),2010,Soyabeans,0.111304
+Viet Nam,2010,Soyabeans,2.856461
+Yemen,2010,Soyabeans,0
+Zambia,2010,Soyabeans,0
+Zimbabwe,2010,Soyabeans,0
+Afghanistan,2010,Starchy Roots + (Total),0
+Albania,2010,Starchy Roots + (Total),0.00328
+Algeria,2010,Starchy Roots + (Total),0.015747
+Angola,2010,Starchy Roots + (Total),0
+Antigua and Barbuda,2010,Starchy Roots + (Total),0.000333
+Argentina,2010,Starchy Roots + (Total),0.07318
+Armenia,2010,Starchy Roots + (Total),0.088444
+Australia,2010,Starchy Roots + (Total),0.04748
+Austria,2010,Starchy Roots + (Total),0.086141
+Azerbaijan,2010,Starchy Roots + (Total),0.010108
+Bahamas,2010,Starchy Roots + (Total),0.00314
+Bangladesh,2010,Starchy Roots + (Total),0.132339
+Barbados,2010,Starchy Roots + (Total),0.00087
+Belarus,2010,Starchy Roots + (Total),0
+Belgium,2010,Starchy Roots + (Total),0.017031
+Belize,2010,Starchy Roots + (Total),2.9e-05
+Benin,2010,Starchy Roots + (Total),0.95
+Bermuda,2010,Starchy Roots + (Total),0.00017
+Bolivia (Plurinational State of),2010,Starchy Roots + (Total),0.013191
+Bosnia and Herzegovina,2010,Starchy Roots + (Total),0.002085
+Botswana,2010,Starchy Roots + (Total),0.000512
+Brazil,2010,Starchy Roots + (Total),1.605401
+Brunei Darussalam,2010,Starchy Roots + (Total),0.001568
+Bulgaria,2010,Starchy Roots + (Total),0.020452
+Burkina Faso,2010,Starchy Roots + (Total),0.000184
+Cabo Verde,2010,Starchy Roots + (Total),4.7e-05
+Cambodia,2010,Starchy Roots + (Total),3.384801
+Cameroon,2010,Starchy Roots + (Total),0
+Canada,2010,Starchy Roots + (Total),0.018572
+Central African Republic,2010,Starchy Roots + (Total),0
+Chad,2010,Starchy Roots + (Total),0
+Chile,2010,Starchy Roots + (Total),0.023
+China,2010,Starchy Roots + (Total),6.535347
+Colombia,2010,Starchy Roots + (Total),0.350024
+Congo,2010,Starchy Roots + (Total),9.3e-05
+Costa Rica,2010,Starchy Roots + (Total),0.016368
+Cote d'Ivoire,2010,Starchy Roots + (Total),0.000913
+Croatia,2010,Starchy Roots + (Total),0.002409
+Cuba,2010,Starchy Roots + (Total),0.053175
+Cyprus,2010,Starchy Roots + (Total),0.002187
+Czech Republic,2010,Starchy Roots + (Total),7e-06
+Democratic People's Republic of Korea,2010,Starchy Roots + (Total),0
+Denmark,2010,Starchy Roots + (Total),0.002596
+Djibouti,2010,Starchy Roots + (Total),0
+Dominica,2010,Starchy Roots + (Total),0.002035
+Dominican Republic,2010,Starchy Roots + (Total),0.00012
+Ecuador,2010,Starchy Roots + (Total),0.010115
+Egypt,2010,Starchy Roots + (Total),0.001553
+El Salvador,2010,Starchy Roots + (Total),0.005517
+Estonia,2010,Starchy Roots + (Total),6.8e-05
+Ethiopia,2010,Starchy Roots + (Total),0
+Fiji,2010,Starchy Roots + (Total),0.029
+Finland,2010,Starchy Roots + (Total),0.231465
+France,2010,Starchy Roots + (Total),0.179697
+French Polynesia,2010,Starchy Roots + (Total),0.001229
+Gabon,2010,Starchy Roots + (Total),0.000745
+Gambia,2010,Starchy Roots + (Total),0
+Georgia,2010,Starchy Roots + (Total),0.00421
+Germany,2010,Starchy Roots + (Total),0.41016
+Ghana,2010,Starchy Roots + (Total),2.078509
+Greece,2010,Starchy Roots + (Total),0.018483
+Grenada,2010,Starchy Roots + (Total),0.000304
+Guatemala,2010,Starchy Roots + (Total),0.304739
+Guinea,2010,Starchy Roots + (Total),0.000333
+Guinea-Bissau,2010,Starchy Roots + (Total),0
+Guyana,2010,Starchy Roots + (Total),0.000249
+Haiti,2010,Starchy Roots + (Total),0
+Honduras,2010,Starchy Roots + (Total),0.005264
+Hungary,2010,Starchy Roots + (Total),0.04758
+Iceland,2010,Starchy Roots + (Total),1.3e-05
+India,2010,Starchy Roots + (Total),0.006187
+Indonesia,2010,Starchy Roots + (Total),9.656515
+Iran (Islamic Republic of),2010,Starchy Roots + (Total),0.0064
+Iraq,2010,Starchy Roots + (Total),0
+Ireland,2010,Starchy Roots + (Total),0.049988
+Israel,2010,Starchy Roots + (Total),0.107183
+Italy,2010,Starchy Roots + (Total),0.241705
+Jamaica,2010,Starchy Roots + (Total),0.002787
+Japan,2010,Starchy Roots + (Total),0.010038
+Jordan,2010,Starchy Roots + (Total),0.034044
+Kazakhstan,2010,Starchy Roots + (Total),0.093535
+Kenya,2010,Starchy Roots + (Total),0.003441
+Kiribati,2010,Starchy Roots + (Total),0.000189
+Kuwait,2010,Starchy Roots + (Total),0.000193
+Kyrgyzstan,2010,Starchy Roots + (Total),0
+Lao People's Democratic Republic,2010,Starchy Roots + (Total),0.2
+Latvia,2010,Starchy Roots + (Total),0.002341
+Lebanon,2010,Starchy Roots + (Total),0.048684
+Lesotho,2010,Starchy Roots + (Total),0
+Liberia,2010,Starchy Roots + (Total),0
+Libya,2010,Starchy Roots + (Total),0.073195
+Lithuania,2010,Starchy Roots + (Total),0.000238
+Madagascar,2010,Starchy Roots + (Total),0.25355
+Malawi,2010,Starchy Roots + (Total),0.900042
+Malaysia,2010,Starchy Roots + (Total),0.96607
+Maldives,2010,Starchy Roots + (Total),0.000555
+Mali,2010,Starchy Roots + (Total),4e-06
+Malta,2010,Starchy Roots + (Total),0.002599
+Mauritania,2010,Starchy Roots + (Total),1.6e-05
+Mauritius,2010,Starchy Roots + (Total),0.003803
+Mexico,2010,Starchy Roots + (Total),0.191817
+Mongolia,2010,Starchy Roots + (Total),0
+Morocco,2010,Starchy Roots + (Total),0
+Mozambique,2010,Starchy Roots + (Total),2.7e-05
+Myanmar,2010,Starchy Roots + (Total),0
+Namibia,2010,Starchy Roots + (Total),0
+Nepal,2010,Starchy Roots + (Total),0
+Netherlands,2010,Starchy Roots + (Total),0.552061
+Netherlands Antilles,2010,Starchy Roots + (Total),0
+New Caledonia,2010,Starchy Roots + (Total),0.000112
+New Zealand,2010,Starchy Roots + (Total),0.017164
+Nicaragua,2010,Starchy Roots + (Total),0.000724
+Niger,2010,Starchy Roots + (Total),0
+Nigeria,2010,Starchy Roots + (Total),8.889227
+Norway,2010,Starchy Roots + (Total),0.01276
+Occupied Palestinian Territory,2010,Starchy Roots + (Total),0
+Pakistan,2010,Starchy Roots + (Total),0.022905
+Panama,2010,Starchy Roots + (Total),0.000969
+Paraguay,2010,Starchy Roots + (Total),0.1194
+Peru,2010,Starchy Roots + (Total),0
+Philippines,2010,Starchy Roots + (Total),0.295325
+Poland,2010,Starchy Roots + (Total),0.169456
+Portugal,2010,Starchy Roots + (Total),0.036235
+Republic of Korea,2010,Starchy Roots + (Total),0.036968
+Republic of Moldova,2010,Starchy Roots + (Total),0.00444
+Romania,2010,Starchy Roots + (Total),0.070149
+Russian Federation,2010,Starchy Roots + (Total),0.16368
+Rwanda,2010,Starchy Roots + (Total),0
+Saint Kitts and Nevis,2010,Starchy Roots + (Total),0.000182
+Saint Lucia,2010,Starchy Roots + (Total),0.000153
+Saint Vincent and the Grenadines,2010,Starchy Roots + (Total),0
+Samoa,2010,Starchy Roots + (Total),0.000156
+Sao Tome and Principe,2010,Starchy Roots + (Total),0
+Saudi Arabia,2010,Starchy Roots + (Total),0
+Senegal,2010,Starchy Roots + (Total),0.005031
+Serbia,2010,Starchy Roots + (Total),0.122545
+Sierra Leone,2010,Starchy Roots + (Total),0
+Slovakia,2010,Starchy Roots + (Total),1.6e-05
+Slovenia,2010,Starchy Roots + (Total),0
+Solomon Islands,2010,Starchy Roots + (Total),0
+Somalia,2010,Starchy Roots + (Total),0
+South Africa,2010,Starchy Roots + (Total),0.185186
+Spain,2010,Starchy Roots + (Total),0.436468
+Sri Lanka,2010,Starchy Roots + (Total),0.017631
+Sudan (former),2010,Starchy Roots + (Total),0.0011
+Suriname,2010,Starchy Roots + (Total),0.001809
+Swaziland,2010,Starchy Roots + (Total),0.001344
+Sweden,2010,Starchy Roots + (Total),0.384903
+Switzerland,2010,Starchy Roots + (Total),0.115329
+Syrian Arab Republic,2010,Starchy Roots + (Total),0.016412
+Tajikistan,2010,Starchy Roots + (Total),0.027371
+Thailand,2010,Starchy Roots + (Total),0.410241
+The former Yugoslav Republic of Macedonia,2010,Starchy Roots + (Total),0.003413
+Timor-Leste,2010,Starchy Roots + (Total),0
+Togo,2010,Starchy Roots + (Total),0.000975
+Trinidad and Tobago,2010,Starchy Roots + (Total),0.00036
+Tunisia,2010,Starchy Roots + (Total),0.001273
+Turkey,2010,Starchy Roots + (Total),0.0745
+Turkmenistan,2010,Starchy Roots + (Total),0
+Uganda,2010,Starchy Roots + (Total),0.01322
+Ukraine,2010,Starchy Roots + (Total),0.291239
+United Arab Emirates,2010,Starchy Roots + (Total),0.04963
+United Kingdom,2010,Starchy Roots + (Total),0.454925
+United Republic of Tanzania,2010,Starchy Roots + (Total),0.039312
+United States of America,2010,Starchy Roots + (Total),0.744911
+Uruguay,2010,Starchy Roots + (Total),0.011327
+Uzbekistan,2010,Starchy Roots + (Total),0.01678
+Vanuatu,2010,Starchy Roots + (Total),0
+Venezuela (Bolivarian Republic of),2010,Starchy Roots + (Total),0.025931
+Viet Nam,2010,Starchy Roots + (Total),0
+Yemen,2010,Starchy Roots + (Total),0.000647
+Zambia,2010,Starchy Roots + (Total),0.000136
+Zimbabwe,2010,Starchy Roots + (Total),0.000905
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 2aee58d618c35bc3b2afa3c9b53f47924ea27f65..b6a80705c2e02f7357b5637ed9ec2643e57247a3 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -94,9 +94,13 @@ public class ModelConfig {
public static final String COUNTRY_CODES_FILE = DATA_DIR + File.separator + "country_codes3.csv";
public static final String COUNTRY_DATA_FILE = DATA_DIR + File.separator + "country_data.csv";
public static final String COMMODITY_DATA_FILE = DATA_DIR + File.separator + "con_prod_c_and_m.csv";
+ public static final String BIOENERGY_DEMAND_FILE = DATA_DIR + File.separator + "bio_demand.csv";
// yield data
public static final String YIELD_DIR = getProperty("YIELD_DIR");
+
+ public static final String ANPP_FILENAME = getProperty("ANPP_FILENAME", "anpp_plum.out");
+ public static final String YIELD_FILENAME = getProperty("YIELD_FILENAME", "yield_plum.out");
// Spatial (gridded) data
public static final double CELL_SIZE_X = getDoubleProperty("CELL_SIZE_X", 3.0);
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index af5ee2d615f415f0b844eafe8c2dff56d524149b..6a148feddff23cd96b23642ebee26ae4c5b71f59 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -18,6 +18,7 @@ import ac.ed.lurg.country.gams.GamsRasterOutput;
import ac.ed.lurg.demand.DemandManager;
import ac.ed.lurg.landuse.AreasItem;
import ac.ed.lurg.landuse.CropUsageData;
+import ac.ed.lurg.landuse.CropUsageReader;
import ac.ed.lurg.landuse.IntensitiesItem;
import ac.ed.lurg.landuse.IrrigationCostItem;
import ac.ed.lurg.landuse.IrrigiationCostReader;
@@ -241,7 +242,8 @@ public class ModelMain {
RasterSet<LandCoverItem> initLC = getInitialLandCover();
RasterSet<IrrigationCostItem> allIrrigationCosts = getIrrigationCosts();
- Map<Country, Map<CropType, CropUsageData>> cropUsageDataMap = CropUsageData.readCommodityData();
+
+ Map<Country, Map<CropType, CropUsageData>> cropUsageDataMap = new CropUsageReader().getCommodityData();
HashSet<String> countryExclusionList = new HashSet<String>(Arrays.asList("Bangladesh", "Portugal", "Haiti")); //"French Polynesia", "Cabo Verde", "Samoa", "Saint Vincent and the Grenadines"));
@@ -251,7 +253,7 @@ public class ModelMain {
// DEBUG code
- if (!(country.getCountryName().equals("United States of America") || country.getCountryName().equals("Russian Federationxx") || country.getCountryName().equals("Indonesiaxx")) ) { //|| country.getCountryName().equals("China")
+ if (!(country.getCountryName().equals("United States of America") || country.getCountryName().equals("Russian Federationxx") || country.getCountryName().equals("Brazilxx")) ) { //|| country.getCountryName().equals("China")
continue;
}
diff --git a/src/ac/ed/lurg/country/CountryAgent.java b/src/ac/ed/lurg/country/CountryAgent.java
index 5cdad3a0479ced8dd61ddca6f53bbfb8ec3301f0..ce2bfa7491329de1d1d80e193e1fdb6238ed66e1 100644
--- a/src/ac/ed/lurg/country/CountryAgent.java
+++ b/src/ac/ed/lurg/country/CountryAgent.java
@@ -3,7 +3,6 @@ package ac.ed.lurg.country;
import java.util.HashMap;
import java.util.Map;
-import ac.ed.lurg.ModelConfig;
import ac.ed.lurg.Timestep;
import ac.ed.lurg.country.gams.GamsCountryInput;
import ac.ed.lurg.country.gams.GamsRasterInput;
@@ -41,7 +40,6 @@ public class CountryAgent {
this.irrigationCostRaster = irrigationCostRaster;
GamsRasterOutput initialData = new GamsRasterOutput(cropAreaRaster, cropUsageData);
-
resultsTimeseries.put(new Timestep(0), initialData);
}
diff --git a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
index fda3db3270886e348eaccba923e9d8bba5f06e2a..e11dbb0158e639125c344f9a98935d0b85da80fe 100644
--- a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
+++ b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
@@ -245,7 +245,7 @@ public class GamsLocationOptimiser {
prod = getParmValue(parmProd, itemName);
prodCost = getParmValue(parmProdCost, itemName);
- cropUsageData.put(cropType, new CropUsageData(feedAmount, netImport, prod, prodCost, Double.NaN));
+ cropUsageData.put(cropType, new CropUsageData(feedAmount, netImport, prod, prodCost));
cropAdjs.put(cropType, cropAdj);
if (DEBUG) LogWriter.println(String.format("\n%s:\tfeedAmount= %.1f,\tnetImports= %.3f,\tprod= %.3f,\tprodCost= %.3f,\tcropAdj= %.3f", itemName, feedAmount, netImport, prod, prodCost, cropAdj));
}
@@ -270,7 +270,7 @@ public class GamsLocationOptimiser {
netImport = varNetImports.findRecord(CropType.MEAT.getGamsName()).getLevel();
prod = parmProd.findRecord(CropType.MEAT.getGamsName()).getValue();
prodCost = parmProdCost.findRecord(CropType.MEAT.getGamsName()).getValue();
- cropUsageData.put(CropType.MEAT, new CropUsageData(0.0, netImport, prod, prodCost, 0));
+ cropUsageData.put(CropType.MEAT, new CropUsageData(0.0, netImport, prod, prodCost));
if (DEBUG) {
LogWriter.println(String.format("\n%s:\t\t\t\t\tnetImports= %.3f,\tprod= %.3f,\tprodCost= %.3f", CropType.MEAT.getGamsName(), netImport, prod, prodCost));
LogWriter.println(String.format("\nTotal area= %.1f", totalArea));
diff --git a/src/ac/ed/lurg/demand/BioenergyDemand.java b/src/ac/ed/lurg/demand/BioenergyDemand.java
new file mode 100644
index 0000000000000000000000000000000000000000..45dbb491d57242931f6132e07b02fc66805b98fd
--- /dev/null
+++ b/src/ac/ed/lurg/demand/BioenergyDemand.java
@@ -0,0 +1,62 @@
+package ac.ed.lurg.demand;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import ac.ed.lurg.ModelConfig;
+import ac.ed.lurg.country.Country;
+import ac.ed.lurg.country.CountryManager;
+import ac.ed.lurg.types.CommodityType;
+import ac.ed.lurg.utils.LazyHashMap;
+import ac.ed.lurg.utils.LogWriter;
+
+public class BioenergyDemand {
+ private static final int COUNTRY_COL = 0;
+ private static final int COMMODITY_COL = 2;
+ private static final int OTHER_COL = 3;
+
+ @SuppressWarnings("serial")
+ public Map<Country, Map<CommodityType, Double>> getBioenergyData() {
+
+ LazyHashMap<Country, Map<CommodityType, Double>> bioenergyMap = new LazyHashMap<Country, Map<CommodityType, Double>>() {
+ protected Map<CommodityType, Double> createValue() { return new HashMap<CommodityType, Double>(); }
+ };
+
+ String filename = ModelConfig.BIOENERGY_DEMAND_FILE;
+ try {
+ BufferedReader fitReader = new BufferedReader(new FileReader(filename));
+ String line, countryName, commodityName;
+ double other;
+ fitReader.readLine(); // read header
+
+ while ((line=fitReader.readLine()) != null) {
+ String[] tokens = line.split(",");
+
+ if (tokens.length < 4)
+ LogWriter.printlnError("Too few columns in " + filename + ", " + line);
+
+ countryName = tokens[COUNTRY_COL];
+ commodityName = tokens[COMMODITY_COL];
+ other = Double.parseDouble(tokens[OTHER_COL]);
+
+ Country country = CountryManager.getForName(countryName);
+ CommodityType crop = CommodityType.getForFaoName(commodityName);
+
+ Map<CommodityType, Double> countryData = bioenergyMap.lazyGet(country);
+ countryData.put(crop, other);
+ }
+ fitReader.close();
+
+ } catch (IOException e) {
+ LogWriter.printlnError("Failed in reading commodity demand fits");
+ e.printStackTrace();
+ }
+ LogWriter.println("Processed " + filename + ", create " + bioenergyMap.size() + " country commodity maps values");
+
+ return bioenergyMap;
+ }
+}
+
diff --git a/src/ac/ed/lurg/demand/DemandManager.java b/src/ac/ed/lurg/demand/DemandManager.java
index 061e2ae48141602b274549a930031b88b8cfec05..0721321a3ef2048f9ebb5ec3a74e7dd3548b123f 100644
--- a/src/ac/ed/lurg/demand/DemandManager.java
+++ b/src/ac/ed/lurg/demand/DemandManager.java
@@ -14,6 +14,7 @@ public class DemandManager {
private DemandCurveManager demandCurveManager;
private SspManager sspManager;
private BaseConsumpManager baseConsumpManager;
+ private Map<Country, Map<CommodityType, Double>> bioenergyBaseDemand;
private ModelFitType fitType; // these could be mutable
private String ssp_scenario;
@@ -24,6 +25,7 @@ public class DemandManager {
demandCurveManager = new DemandCurveManager();
sspManager = new SspManager();
baseConsumpManager = new BaseConsumpManager();
+ bioenergyBaseDemand = new BioenergyDemand().getBioenergyData();
}
public Map<CommodityType, Double> getDemand(Country country, int year) {
@@ -43,11 +45,22 @@ public class DemandManager {
double cpc = dc.getConsumptionPc(baseSspData.getGdpPc(), baseConsumpManager.get(country, dc.getCommodityType()), sd.getGdpPc());
double d = cpc * sd.getPopulation();
- demandMap.put(dc.getCommodityType(), d);
+ double bioenergy = getBioenergyDemand(country, year, dc.getCommodityType());
+ // LogWriter.println(String.format("Country %s comm %s: %f", country, dc.getCommodityType(), bioenergy));
+ demandMap.put(dc.getCommodityType(), d + bioenergy);
}
return demandMap;
}
+ private double getBioenergyDemand(Country country, int year, CommodityType commodity) {
+ // could adjust for year somehow, but not doing this yet
+ if (bioenergyBaseDemand != null && bioenergyBaseDemand.containsKey(country)) {
+ Double d = bioenergyBaseDemand.get(country).get(commodity);
+ return d == null ? 0 : d.doubleValue();
+ }
+ return 0.0;
+ }
+
public double getPopulation (Country country, int year) {
SspData sd = sspManager.get(ssp_scenario, year, country);
if (sd == null) {
diff --git a/src/ac/ed/lurg/landuse/CropUsageData.java b/src/ac/ed/lurg/landuse/CropUsageData.java
index 7f973283b7583b3c732bb4e86a0f28d5b6b5e2f2..dd77197bda552688023949b31fd6a7b44def6f0b 100644
--- a/src/ac/ed/lurg/landuse/CropUsageData.java
+++ b/src/ac/ed/lurg/landuse/CropUsageData.java
@@ -1,38 +1,18 @@
package ac.ed.lurg.landuse;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import ac.ed.lurg.ModelConfig;
-import ac.ed.lurg.country.Country;
-import ac.ed.lurg.country.CountryManager;
-import ac.ed.lurg.types.CropType;
-import ac.ed.lurg.utils.LogWriter;
-
public class CropUsageData {
- private static final int COUNTRY_COL = 0;
- private static final int COMMODITY_COL = 2;
- private static final int FEED_COL = 4;
- private static final int NET_IMPORT_COL = 5;
- private static final int PROD_COL = 6;
- private static final int OTHER_COL = 7;
-
+
private double feedAmount;
private double netImports;
private double prod;
private double prodCost;
- private double bioenergyAmount;
- public CropUsageData(double feedAmount, double netImports, double prod, double prodCost, double bioenergyAmount) {
+ public CropUsageData(double feedAmount, double netImports, double prod, double prodCost) {
super();
this.feedAmount = feedAmount;
this.netImports = netImports;
this.prod = prod;
this.prodCost = prodCost;
- this.bioenergyAmount = bioenergyAmount;
}
public double getFeedAmount() {
@@ -50,52 +30,4 @@ public class CropUsageData {
public double getProdCost() {
return prodCost;
}
-
- public double getBioenergyAmount() {
- return bioenergyAmount;
- }
-
- public static Map<Country, Map<CropType, CropUsageData>> readCommodityData() {
- Map<Country, Map<CropType, CropUsageData>> commodityMap = new HashMap<Country, Map<CropType, CropUsageData>>();
- String filename = ModelConfig.COMMODITY_DATA_FILE;
- try {
- BufferedReader fitReader = new BufferedReader(new FileReader(filename));
- String line, countryName, commodityName;
- double feedAmount, netImports, prod, other;
- fitReader.readLine(); // read header
-
- while ((line=fitReader.readLine()) != null) {
- String[] tokens = line.split(",");
-
- if (tokens.length < 6)
- LogWriter.printlnError("Too few columns in " + filename + ", " + line);
-
- countryName = tokens[COUNTRY_COL];
- commodityName = tokens[COMMODITY_COL];
- feedAmount = Double.parseDouble(tokens[FEED_COL]);
- netImports = Double.parseDouble(tokens[NET_IMPORT_COL]);
- prod = Double.parseDouble(tokens[PROD_COL]);
- other = Double.parseDouble(tokens[OTHER_COL]);
-
- Country country = CountryManager.getForName(countryName);
-
- CropUsageData data = new CropUsageData(feedAmount, netImports, prod, Double.NaN, other);
- Map<CropType, CropUsageData> countryData = commodityMap.get(country);
- if (countryData == null) {
- countryData = new HashMap<CropType, CropUsageData>();
- commodityMap.put(country, countryData);
- }
-
- countryData.put(CropType.getForFaoName(commodityName), data);
- }
- fitReader.close();
-
- } catch (IOException e) {
- LogWriter.printlnError("Failed in reading commodity demand fits");
- e.printStackTrace();
- }
- LogWriter.println("Processed " + filename + ", create " + commodityMap.size() + " country commodity maps values");
-
- return commodityMap;
- }
}
diff --git a/src/ac/ed/lurg/landuse/CropUsageReader.java b/src/ac/ed/lurg/landuse/CropUsageReader.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0f1297a44d3c1f5490b774e197377b3d392f799
--- /dev/null
+++ b/src/ac/ed/lurg/landuse/CropUsageReader.java
@@ -0,0 +1,66 @@
+package ac.ed.lurg.landuse;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import ac.ed.lurg.ModelConfig;
+import ac.ed.lurg.country.Country;
+import ac.ed.lurg.country.CountryManager;
+import ac.ed.lurg.types.CropType;
+import ac.ed.lurg.utils.LazyHashMap;
+import ac.ed.lurg.utils.LogWriter;
+
+public class CropUsageReader {
+ private static final int COUNTRY_COL = 0;
+ private static final int COMMODITY_COL = 2;
+ private static final int FEED_COL = 4;
+ private static final int NET_IMPORT_COL = 5;
+ private static final int PROD_COL = 6;
+
+ @SuppressWarnings("serial")
+ public Map<Country, Map<CropType, CropUsageData>> getCommodityData() {
+
+ LazyHashMap<Country, Map<CropType, CropUsageData>> commodityMap = new LazyHashMap<Country, Map<CropType, CropUsageData>>() {
+ protected Map<CropType, CropUsageData> createValue() { return new HashMap<CropType, CropUsageData>(); }
+ };
+
+ String filename = ModelConfig.COMMODITY_DATA_FILE;
+ try {
+ BufferedReader fitReader = new BufferedReader(new FileReader(filename));
+ String line, countryName, commodityName;
+ double feedAmount, netImports, prod;
+ fitReader.readLine(); // read header
+
+ while ((line=fitReader.readLine()) != null) {
+ String[] tokens = line.split(",");
+
+ if (tokens.length < 6)
+ LogWriter.printlnError("Too few columns in " + filename + ", " + line);
+
+ countryName = tokens[COUNTRY_COL];
+ commodityName = tokens[COMMODITY_COL];
+ feedAmount = Double.parseDouble(tokens[FEED_COL]);
+ netImports = Double.parseDouble(tokens[NET_IMPORT_COL]);
+ prod = Double.parseDouble(tokens[PROD_COL]);
+
+ Country country = CountryManager.getForName(countryName);
+ CropType crop = CropType.getForFaoName(commodityName);
+
+ CropUsageData data = new CropUsageData(feedAmount, netImports, prod, Double.NaN);
+ Map<CropType, CropUsageData> countryData = commodityMap.lazyGet(country);
+ countryData.put(crop, data);
+ }
+ fitReader.close();
+
+ } catch (IOException e) {
+ LogWriter.printlnError("Failed in reading commodity demand fits");
+ e.printStackTrace();
+ }
+ LogWriter.println("Processed " + filename + ", create " + commodityMap.size() + " country commodity maps values");
+
+ return commodityMap;
+ }
+}
diff --git a/src/ac/ed/lurg/yield/LPJYieldResponseMapReader.java b/src/ac/ed/lurg/yield/LPJYieldResponseMapReader.java
index 9b6593eb8eab8fb8b6f52ee32e6f45247ee057a2..be4b835aea1b297b13ac14c20b3317fb6d7c7535 100644
--- a/src/ac/ed/lurg/yield/LPJYieldResponseMapReader.java
+++ b/src/ac/ed/lurg/yield/LPJYieldResponseMapReader.java
@@ -37,10 +37,10 @@ public class LPJYieldResponseMapReader extends AbstractTabularRasterReader<Yield
YieldRaster yieldRaster = new YieldRaster(rasterProj);
dataset = yieldRaster;
- String nppFilename = rootDir + File.separator + "anpp.out";
+ String nppFilename = rootDir + File.separator + ModelConfig.ANPP_FILENAME;
getRasterDataFromFile(nppFilename);
- String yieldFilename = rootDir + File.separator + "yield.out";
+ String yieldFilename = rootDir + File.separator + ModelConfig.YIELD_FILENAME;
getRasterDataFromFile(yieldFilename);
return yieldRaster;