diff --git a/GAMS/IntExtOpt.gms b/GAMS/IntExtOpt.gms index b61979719759be4d99fdb4a2902cb7aea14604ae..84e31fc34716607b44d51fa79b949a486f58c4d8 100644 --- a/GAMS/IntExtOpt.gms +++ b/GAMS/IntExtOpt.gms @@ -38,10 +38,9 @@ $gdxin area(crop) total area for each crop - ha feedAmount(crop) amount of feed for each crop - t intensity(crop) intensity for each crop - unitless + netImportAmount(crop) export of crop - t yield(crop) yield per area for each crop - t per ha unit_energy(crop) energy per area for each crop - energy - netImportAmount(crop) export of crop - t - tradeBarrierFactor(crop) energy total input energy - energy; POSITIVE VARIABLE area, intensity, feedAmount; @@ -51,7 +50,6 @@ $gdxin YIELD_EQ(crop) yield given chosen intensity CROP_DEMAND_CONSTRAINT(crop_less_pasture) satisfy demand for crop MEAT_DEMAND_CONSTRAINT satisfy demand for crop - MIN_INTENSITY_CONSTRAINT(crop) intensity constraint MAX_INTENSITY_CONSTRAINT(crop) constraint on maximum intensity which will tend to rise over time CROPLAND_CHANGE_CONSTRAINT constraint on the rate of land use change PASTURE_CHANGE_CONSTRAINT constraint on the rate of land use change @@ -71,9 +69,7 @@ $gdxin MEAT_DEMAND_CONSTRAINT .. meatEfficency*sum(feed_crop, feedDM(feed_crop) * feedAmount(feed_crop)) + feedDM('pasture_or_meat') * area('pasture_or_meat') * yield('pasture_or_meat') =G= demand('pasture_or_meat') - netImportAmount('pasture_or_meat'); - - MIN_INTENSITY_CONSTRAINT(crop) .. intensity(crop) =G= 1; - + MAX_INTENSITY_CONSTRAINT(crop) .. intensity(crop) =L= maxIntensity; CROPLAND_CHANGE_CONSTRAINT .. 1 - sum(crop_less_pasture, area(crop_less_pasture))/sum(crop_less_pasture, previous_area(crop_less_pasture)) =L= maxLandUseChange; diff --git a/src/ac/ed/lurg/country/gams/GamsTest.java b/src/ac/ed/lurg/country/gams/GamsTest.java index 42059b2f9b8de58fa6098c449e7d3e71ee718d78..b780158c5d7e6449ec6666c989187ef68cbe64af 100644 --- a/src/ac/ed/lurg/country/gams/GamsTest.java +++ b/src/ac/ed/lurg/country/gams/GamsTest.java @@ -133,5 +133,4 @@ public class GamsTest implements GamsInputData { public double getMinFeedRate() { return 0.15; } - }