Skip to content
Snippets Groups Projects

Merging changes from master

Closed Merging changes from master
master into subnational_inequality
Closed s1713176 requested to merge master into subnational_inequality
Viewing commit bea5b8a2
Prev Next
Show latest version
3 files
+ 13
− 14
Compare changes
  • Side-by-side
  • Inline
Files
3
GAMS/IntExtOpt.gms
+ 1
− 1
@@ -95,7 +95,7 @@
SCALAR discountRate;
SCALAR energyPrice;
*$gdxin "../Documents/PLUM_Output/calib_forest/GamsTmp/UnitedKingdom2020landuse.gdx"
*$gdxin "~/Documents/PLUM_Output/calib_forest/GamsTmp/China2020landuse.gdx"
$gdxin %gdxincname%
$load location, suitableLandArea, demand
$load previousCropArea, previousFertIntensity, previousIrrigIntensity, previousOtherIntensity, previousRuminantFeed, previousMonogastricFeed, previousImportAmount, previousExportAmount