-
Notifications
You must be signed in to change notification settings - Fork 169
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #717 from caviddhen/gdp2017
Update GDP to 2017 base year
- Loading branch information
Showing
134 changed files
with
742 additions
and
653 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,4 @@ f09_pop_iso.csv | |
f09_urban_iso.csv | ||
f09_demography.cs3 | ||
f09_physical_inactivity.cs3 | ||
fm_gdp_defl_ppp.cs4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
*** | Contact: [email protected] | ||
|
||
scalars | ||
s10_cost_balance Artificial cost for balance variable (USD05MER per ha) / 1e+06 / | ||
s10_cost_balance Artificial cost for balance variable (USD17MER per ha) / 1e+06 / | ||
; | ||
|
||
table f10_land(t_ini10,j,land) Different land type areas (mio. ha) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,5 @@ | |
*** | Contact: [email protected] | ||
|
||
vm_landdiff.scale = 10e3; | ||
v10_balance_positive.scale(j) = 10e-10; | ||
v10_balance_negative.scale(j) = 10e-10; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,20 +6,20 @@ | |
*** | Contact: [email protected] | ||
|
||
variables | ||
vm_cost_glo Total costs of production (mio. USD05MER per yr) | ||
v11_cost_reg(i) Regional costs (mio. USD05MER per yr) | ||
vm_cost_glo Total costs of production (mio. USD17MER per yr) | ||
v11_cost_reg(i) Regional costs (mio. USD17MER per yr) | ||
; | ||
|
||
equations | ||
q11_cost_glo Objective function (mio. USD05MER per yr) | ||
q11_cost_reg(i) Regional cost constraint (mio. USD05MER per yr) | ||
q11_cost_glo Objective function (mio. USD17MER per yr) | ||
q11_cost_reg(i) Regional cost constraint (mio. USD17MER per yr) | ||
; | ||
|
||
*#################### R SECTION START (OUTPUT DECLARATIONS) #################### | ||
parameters | ||
ov_cost_glo(t,type) Total costs of production (mio. USD05MER per yr) | ||
ov11_cost_reg(t,i,type) Regional costs (mio. USD05MER per yr) | ||
oq11_cost_glo(t,type) Objective function (mio. USD05MER per yr) | ||
oq11_cost_reg(t,i,type) Regional cost constraint (mio. USD05MER per yr) | ||
ov_cost_glo(t,type) Total costs of production (mio. USD17MER per yr) | ||
ov11_cost_reg(t,i,type) Regional costs (mio. USD17MER per yr) | ||
oq11_cost_glo(t,type) Objective function (mio. USD17MER per yr) | ||
oq11_cost_reg(t,i,type) Regional cost constraint (mio. USD17MER per yr) | ||
; | ||
*##################### R SECTION END (OUTPUT DECLARATIONS) ##################### |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.