Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GDP to 2017 base year #717

Merged
merged 50 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
5e665b5
Merge pull request #54 from magpiemodel/develop
caviddhen Apr 19, 2024
9bd989a
Merge branch 'magpiemodel:develop' into develop
caviddhen Apr 22, 2024
e02000c
Merge pull request #57 from magpiemodel/develop
caviddhen Jun 3, 2024
e8a8ddd
Merge branch 'magpiemodel:develop' into develop
caviddhen Jun 13, 2024
ae8910c
Merge branch 'magpiemodel:develop' into develop
caviddhen Aug 20, 2024
3ffe1fc
update units to 2017USD
Aug 31, 2024
0fc701c
update monetary unit to 2017 base year
Sep 5, 2024
652bd70
Merge pull request #58 from magpiemodel/develop
caviddhen Sep 10, 2024
3e22473
update to 2017 base year
Sep 10, 2024
8674f22
merge develop
Sep 10, 2024
41cf111
update config
Sep 10, 2024
057dec2
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
flohump Sep 23, 2024
bb16e1d
bugfixes
flohump Sep 23, 2024
01d91af
revert default title
flohump Sep 23, 2024
391a188
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
flohump Sep 24, 2024
62dfe6c
GDP2017 input file update rev4.112
flohump Sep 24, 2024
fcdf2ae
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
flohump Sep 24, 2024
7e22298
count-up start script
flohump Sep 24, 2024
6b93227
bugfix
flohump Sep 24, 2024
63dd571
Update config/default.cfg
flohump Sep 26, 2024
51b94fc
Update config/default.cfg
flohump Sep 26, 2024
8b03f07
Update modules/39_landconversion/calib/input.gms
flohump Sep 26, 2024
672a0f7
Update modules/29_cropland/detail_apr24/input.gms
flohump Sep 26, 2024
ea4ed1f
Update config/default.cfg
flohump Sep 26, 2024
13ab4a1
update TC module and monetary units
flohump Sep 26, 2024
16cc022
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
flohump Sep 26, 2024
b649f77
updated some more currency units
Sep 26, 2024
8f33e04
macc USD unit corrections
flohump Sep 26, 2024
82c5f15
Merge branch 'gdp2017' of github.com:caviddhen/magpie into gdp2017
flohump Sep 26, 2024
2d2c3d6
update in livestock regression and cost share regressions
Sep 26, 2024
9ace917
defaults
flohump Sep 26, 2024
e4e09b8
defaults
flohump Sep 26, 2024
bf485ed
Update config/projects/scenario_config_fsec.csv
flohump Sep 27, 2024
11de788
bugfix macc USD + land conversions cost calib
flohump Sep 27, 2024
878d2d1
bugfix sticky_labor
flohump Sep 27, 2024
d797404
bugfix warnings
flohump Sep 27, 2024
e24ba0b
FSEC calib factors
flohump Sep 27, 2024
1c467f3
fix warnings
flohump Sep 27, 2024
fa640a9
H16 calib factors
flohump Sep 27, 2024
b9a6940
update GDP17
flohump Oct 1, 2024
1f5f594
update start scripts
flohump Oct 2, 2024
52090d1
magpie4 lib version
flohump Oct 2, 2024
e7e62d7
bugfix plantation growth curves
flohump Oct 2, 2024
98e6fd1
update scaling factors
flohump Oct 2, 2024
019121a
start scripts update
flohump Oct 2, 2024
c5c92aa
bugfix
flohump Oct 2, 2024
60d5bb8
scaling update
flohump Oct 2, 2024
82fb440
start scripts
flohump Oct 2, 2024
774765e
start script update
flohump Oct 3, 2024
95feb29
Update scaling factors and start scripts
flohump Oct 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **scripts** `.nc` files are no longer created by default after disaggregation
- **config** `cfg$gms$land_snv`changed from "secdforest, forestry, past, other" to "secdforest, other"
- **config** Submissions with high memory requirements now get 16 CPUs and 80GB of memory to account for the new specifications of PIK's new HPC 'Foote'. `maxMem` was renamed to `highMem`, because 80GB of memory does not correspond to the maximum available memory of a compute node.

- **inputdata** changed GDP base year from 2005USD to 2017USD
- **config** changed default input data to use 2017USD
- **module_documentation** all references to USD05 changed to USD17

### added
- **scripts** added output script converting all grid-level .mz files to .nc (netCDF)
Expand Down
132 changes: 75 additions & 57 deletions config/default.cfg

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/projects/scenario_config_el2.csv
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ gms$s15_exo_alcohol;1;1;1
gms$s15_alc_scen;0;0;0
gms$factor_costs;sticky_labor;sticky_labor;sticky_labor
gms$c70_feed_scen;ssp1;ssp2;ssp2
input['cellular'];rev4.111EL2_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz;;
input['cellular'];rev4.112EL2_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz;;
magicc_emis_scen;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax_DeepDive_noNDC-rem-12.mif;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax_DeepDive_noNDC-rem-12.mif;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax_DeepDive_noNDC-rem-12.mif
6 changes: 3 additions & 3 deletions config/projects/scenario_config_fsec.csv
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ gms$s62_max_dem_bioplastic;0;;;;400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c70_fac_req_regr;reg;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c70_feed_scen;;;;;;;;;;;;;;;;;;ssp1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c73_build_demand;;;;;;;;;;;;;;;;;;;;;;;;50pc;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['cellular'];rev4.111_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.111_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.111_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.111_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.111_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.111_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.111_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;;
input['regional'];rev4.111_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['validation'];rev4.111_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['cellular'];rev4.112_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.112_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.112_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.112_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.112_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.112_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.112_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;;
input['regional'];rev4.112_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['validation'];rev4.112_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['additional'];additional_data_rev4.51.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
flohump marked this conversation as resolved.
Show resolved Hide resolved
input['calibration'];calibration_FSEC_26Mar24.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;;;;;;;;;;bjoernAR6_C_RemSDP-900-MagSSP1.mif;;
2 changes: 1 addition & 1 deletion config/scenario_config.csv
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ gms$c60_biodem_level;;;;;;;;;;;;;;;;;1;0;;;;;;;;;;;;
gms$c60_res_2ndgenBE_dem;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;sdp;ssp2;sdp;sdp;;;;;;;;;;;;;;;;;
gms$c70_feed_scen;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;ssp1;ssp5;ssp1;ssp1;;;;;;;;;;;;;;;;;
gms$s73_timber_demand_switch;;;;;;;;;;;;;;;;;;;;;;1;1;0;;;;;;
input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;rev4.111_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.111_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.111_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.111_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.111_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.111_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz
input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;rev4.112_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.112_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.112_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.112_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.112_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.112_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz
36 changes: 17 additions & 19 deletions main.gms
Original file line number Diff line number Diff line change
Expand Up @@ -148,26 +148,25 @@ $title magpie

*##################### R SECTION START (VERSION INFO) ##########################
*
* Used data set: rev4.109_h12_magpie.tgz
* md5sum: NA
* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
* Used data set: rev4.112DC_GDP2017_h12_magpie.tgz
* md5sum: 86f9d7b7efb543e017959f3c69380a55
* Repository: /p/projects/rd3mod/inputdata/output_1.27
*
* Used data set: rev4.109_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
* md5sum: NA
* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
* Used data set: rev4.112DC_GDP2017_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
* md5sum: 9023d9affc5e0ad1ee7c5f8d40cb5baf
* Repository: /p/projects/rd3mod/inputdata/output_1.27
*
* Used data set: rev4.109_h12_validation.tgz
* md5sum: NA
* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
* Used data set: rev4.112DC_GDP2017_h12_validation.tgz
* md5sum: a2a8886d20c347ed26d3562c6ba8809f
* Repository: /p/projects/rd3mod/inputdata/output_1.27
*
* Used data set: additional_data_rev4.50.tgz
* md5sum: NA
* Repository: https://rse.pik-potsdam.de/data/magpie/public

* Used data set: additional_data_rev4.53devGDP2017.tgz
* md5sum: dbc43a67f3a803c8a6aa4aa251fdc18f
* Repository: /p/projects/landuse/data/input/archive
*
* Used data set: calibration_H12_26Mar24.tgz
* md5sum: NA
* Repository: https://rse.pik-potsdam.de/data/magpie/public
* md5sum: d295e7ff0c65d97c1e0b84c440d0056b
* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
*
* Low resolution: c200
* High resolution: 0.5
Expand All @@ -180,11 +179,11 @@ $title magpie
*
* Regionscode: 62eff8f7
*
* Regions data revision: 4.109
* Regions data revision: 4.112
*
* lpj2magpie settings:
* * LPJmL data: MRI-ESM2-0:ssp370
* * Revision: 4.109
* * Revision: 4.112
*
* aggregation settings:
* * Input resolution: 0.5
Expand All @@ -196,8 +195,7 @@ $title magpie
* * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler, error = errorHandler)
*
*
* Last modification (input data): Tue Jun 18 09:52:31 2024

* Last modification (input data): Fri Sep 6 15:10:50 2024
*
*###################### R SECTION END (VERSION INFO) ###########################

Expand Down
24 changes: 12 additions & 12 deletions modules/09_drivers/aug17/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ parameters
i09_pop_raw(t_all,i,pop_gdp_scen09) Population (mio. per yr)

* GDP in MER
i09_gdp_mer_iso(t_all,iso) Income in market exchange rates (mio. USD05MER per yr)
im_gdp_pc_mer_iso(t_all,iso) Income in market exchange rates (mio. USD05MER per yr)
i09_gdp_mer_raw(t_all,i,pop_gdp_scen09) Income in market exchange rates (mio. USD05MER per yr)
i09_gdp_mer_iso(t_all,iso) Income in market exchange rates (mio. USD17MER per yr)
im_gdp_pc_mer_iso(t_all,iso) Income in market exchange rates (mio. USD17MER per yr)
i09_gdp_mer_raw(t_all,i,pop_gdp_scen09) Income in market exchange rates (mio. USD17MER per yr)

i09_gdp_pc_mer_raw(t_all,i,pop_gdp_scen09) Per capita income in market exchange rates (USD05MER per cap per yr)
im_gdp_pc_mer(t_all,i) Per capita income in market exchange rates (USD05MER per cap per yr)
i09_gdp_pc_mer_iso_raw(t_all,iso,pop_gdp_scen09) Per capita income in market exchange rates (USD05MER per cap per yr)
i09_gdp_pc_mer_raw(t_all,i,pop_gdp_scen09) Per capita income in market exchange rates (USD17MER per cap per yr)
im_gdp_pc_mer(t_all,i) Per capita income in market exchange rates (USD17MER per cap per yr)
i09_gdp_pc_mer_iso_raw(t_all,iso,pop_gdp_scen09) Per capita income in market exchange rates (USD17MER per cap per yr)

* GDP in PPP
i09_gdp_ppp_iso(t_all,iso) Income in purchasing power parity (mio. USD05PPP per yr)
i09_gdp_ppp_raw(t_all,i,pop_gdp_scen09) Income in purchasing power parity (mio. USD05PPP per yr)

i09_gdp_pc_ppp_raw(t_all,i,pop_gdp_scen09) Per capita income in purchasing power parity (USD05PPP per cap per yr)
i09_gdp_pc_ppp_iso_raw(t_all,iso,pop_gdp_scen09) Per capita income in purchasing power parity (USD05PPP per cap per yr)
im_gdp_pc_ppp_iso(t_all,iso) Per capita income in purchasing power parity (USD05PPP per cap per yr)
i09_gdp_ppp_iso(t_all,iso) Income in purchasing power parity (mio. USD17PPP per yr)
i09_gdp_ppp_raw(t_all,i,pop_gdp_scen09) Income in purchasing power parity (mio. USD17PPP per yr)

i09_gdp_pc_ppp_raw(t_all,i,pop_gdp_scen09) Per capita income in purchasing power parity (USD17PPP per cap per yr)
i09_gdp_pc_ppp_iso_raw(t_all,iso,pop_gdp_scen09) Per capita income in purchasing power parity (USD17PPP per cap per yr)
im_gdp_pc_ppp_iso(t_all,iso) Per capita income in purchasing power parity (USD17PPP per cap per yr)

* Development State
im_development_state(t_all,i) Development state according to the World Bank definition where 0=low income country 1=high income country in high income level (1)
im_physical_inactivity(t_all,iso,sex,age) Share of population which is physically inactive (1)
Expand Down
11 changes: 9 additions & 2 deletions modules/09_drivers/aug17/input.gms
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ parameters
sm_fix_cc year until which all parameters affected by cc are fixed to historical values (year) / 2025 /
;

table f09_gdp_ppp_iso(t_all,iso,pop_gdp_scen09) Income in purchasing power parity (mio. USD05PPP per yr)
table f09_gdp_ppp_iso(t_all,iso,pop_gdp_scen09) Income in purchasing power parity (mio. USD17PPP per yr)
$ondelim
$include "./modules/09_drivers/input/f09_gdp_ppp_iso.csv"
$offdelim;

table f09_gdp_mer_iso(t_all,iso,pop_gdp_scen09) Income in market exchange rates (mio. USD05MER per yr)
table f09_gdp_mer_iso(t_all,iso,pop_gdp_scen09) Income in market exchange rates (mio. USD17MER per yr)
$ondelim
$include "./modules/09_drivers/input/f09_gdp_mer_iso.csv"
$offdelim;
Expand All @@ -52,3 +52,10 @@ table f09_physical_inactivity(t_all,iso,pop_gdp_scen09,sex,age) Share of populat
$ondelim
$include "./modules/09_drivers/input/f09_physical_inactivity.cs3"
$offdelim;

parameter fm_gdp_defl_ppp(iso) GDP deflator
/
$ondelim
$include "./modules/09_drivers/input/fm_gdp_defl_ppp.cs4"
$offdelim
/;
1 change: 1 addition & 0 deletions modules/09_drivers/input/files
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ f09_pop_iso.csv
f09_urban_iso.csv
f09_demography.cs3
f09_physical_inactivity.cs3
fm_gdp_defl_ppp.cs4
8 changes: 4 additions & 4 deletions modules/10_land/landmatrix_dec18/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ positive variables
vm_land(j,land) Land area of the different land types (mio. ha)
vm_landexpansion(j,land) Land expansion (mio. ha)
vm_landreduction(j,land) Land reduction (mio. ha)
vm_cost_land_transition(j) Costs for lu transitions (mio. USD05MER per yr)
vm_cost_land_transition(j) Costs for lu transitions (mio. USD17MER per yr)
vm_lu_transitions(j,land_from,land_to) Land transitions between time steps (mio. ha)
v10_balance_positive(j) Balance variable for land transitions (mio. ha)
v10_balance_negative(j) Balance variable for land transitions (mio. ha)
Expand All @@ -31,7 +31,7 @@ equations
q10_transition_from(j,land_from) Land transition constraint from (mio. ha)
q10_landexpansion(j,land_to) Land expansion constraint (mio. ha)
q10_landreduction(j,land_from) Land reduction constraint (mio. ha)
q10_cost(j) Costs for lu transitions (mio. USD05MER per yr)
q10_cost(j) Costs for lu transitions (mio. USD17MER per yr)
q10_landdiff Land difference constraint (mio. ha)
;

Expand All @@ -41,7 +41,7 @@ parameters
ov_land(t,j,land,type) Land area of the different land types (mio. ha)
ov_landexpansion(t,j,land,type) Land expansion (mio. ha)
ov_landreduction(t,j,land,type) Land reduction (mio. ha)
ov_cost_land_transition(t,j,type) Costs for lu transitions (mio. USD05MER per yr)
ov_cost_land_transition(t,j,type) Costs for lu transitions (mio. USD17MER per yr)
ov_lu_transitions(t,j,land_from,land_to,type) Land transitions between time steps (mio. ha)
ov10_balance_positive(t,j,type) Balance variable for land transitions (mio. ha)
ov10_balance_negative(t,j,type) Balance variable for land transitions (mio. ha)
Expand All @@ -50,7 +50,7 @@ parameters
oq10_transition_from(t,j,land_from,type) Land transition constraint from (mio. ha)
oq10_landexpansion(t,j,land_to,type) Land expansion constraint (mio. ha)
oq10_landreduction(t,j,land_from,type) Land reduction constraint (mio. ha)
oq10_cost(t,j,type) Costs for lu transitions (mio. USD05MER per yr)
oq10_cost(t,j,type) Costs for lu transitions (mio. USD17MER per yr)
oq10_landdiff(t,type) Land difference constraint (mio. ha)
;
*##################### R SECTION END (OUTPUT DECLARATIONS) #####################
2 changes: 1 addition & 1 deletion modules/10_land/landmatrix_dec18/input.gms
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions modules/11_costs/default/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -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) #####################
26 changes: 13 additions & 13 deletions modules/13_tc/endo_jan22/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,33 @@

positive variable
vm_tau(h,tautype) Agricultural land use intensity tau (1)
vm_tech_cost(i) Total Annuitized costs of TC (mio. USD05PPP per yr)
v13_cost_tc(i,tautype) Technical change costs per region (mio. USD05PPP)
v13_tech_cost(i,tautype) Annuitized costs of TC for crops and pasture (mio. USD05PPP per yr)
vm_tech_cost(i) Total Annuitized costs of TC (mio. USD17PPP per yr)
v13_cost_tc(i,tautype) Technical change costs per region (mio. USD17PPP)
v13_tech_cost(i,tautype) Annuitized costs of TC for crops and pasture (mio. USD17PPP per yr)
;

equations
q13_tech_cost(i, tautype) Total annuitized costs for TC (mio. USD05PPP)
q13_cost_tc(i, tautype) Costs for TC (mio. USD05PPP per yr)
q13_tech_cost_sum(i) Total Total annuitized costs for TC (mio. USD05PPP per yr)
q13_tech_cost(i, tautype) Total annuitized costs for TC (mio. USD17PPP)
q13_cost_tc(i, tautype) Costs for TC (mio. USD17PPP per yr)
q13_tech_cost_sum(i) Total Total annuitized costs for TC (mio. USD17PPP per yr)
;

parameters
pc13_land(i, tautype) Crop and grass land area per region (mio ha)
pcm_tau(h, tautype) Tau factor of the previous time step (1)
pc13_tcguess(h, tautype) Guess for annual tc rates in the next time step (1)
i13_tc_factor(t) Regression factor (USD05PPP per ha)
i13_tc_factor(t) Regression factor (USD17PPP per ha)
i13_tc_exponent(t) Regression exponent (1)
;

*#################### R SECTION START (OUTPUT DECLARATIONS) ####################
parameters
ov_tau(t,h,tautype,type) Agricultural land use intensity tau (1)
ov_tech_cost(t,i,type) Total Annuitized costs of TC (mio. USD05PPP per yr)
ov13_cost_tc(t,i,tautype,type) Technical change costs per region (mio. USD05PPP)
ov13_tech_cost(t,i,tautype,type) Annuitized costs of TC for crops and pasture (mio. USD05PPP per yr)
oq13_tech_cost(t,i,tautype,type) Total annuitized costs for TC (mio. USD05PPP)
oq13_cost_tc(t,i,tautype,type) Costs for TC (mio. USD05PPP per yr)
oq13_tech_cost_sum(t,i,type) Total Total annuitized costs for TC (mio. USD05PPP per yr)
ov_tech_cost(t,i,type) Total Annuitized costs of TC (mio. USD17PPP per yr)
ov13_cost_tc(t,i,tautype,type) Technical change costs per region (mio. USD17PPP)
ov13_tech_cost(t,i,tautype,type) Annuitized costs of TC for crops and pasture (mio. USD17PPP per yr)
oq13_tech_cost(t,i,tautype,type) Total annuitized costs for TC (mio. USD17PPP)
oq13_cost_tc(t,i,tautype,type) Costs for TC (mio. USD17PPP per yr)
oq13_tech_cost_sum(t,i,type) Total Total annuitized costs for TC (mio. USD17PPP per yr)
;
*##################### R SECTION END (OUTPUT DECLARATIONS) #####################
10 changes: 5 additions & 5 deletions modules/13_tc/exo/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@

positive variable
vm_tau(h,tautype) Agricultural land use intensity tau (1)
vm_tech_cost(i) Costs of TC (mio. USD05PPP per yr)
vm_tech_cost(i) Costs of TC (mio. USD17PPP per yr)
;

parameters
p13_cost_tc(i,tautype) Technical change costs per region (mio. USD05PPP)
p13_cost_tc(i,tautype) Technical change costs per region (mio. USD17PPP)
pc13_land(i,tautype) Crop and grass land area per region (mio ha)
pcm_tau(h,tautype) Tau factor of the previous time step (1)
i13_tc_factor(t) Regression factor (USD05PPP per ha)
i13_tc_factor(t) Regression factor (USD17PPP per ha)
i13_tc_exponent(t) Regression exponent (1)
p13_tech_cost(i,tautype) Annuitized costs of TC for crops and pasture (mio. USD05PPP per yr)
p13_tech_cost(i,tautype) Annuitized costs of TC for crops and pasture (mio. USD17PPP per yr)
;

*#################### R SECTION START (OUTPUT DECLARATIONS) ####################
parameters
ov_tau(t,h,tautype,type) Agricultural land use intensity tau (1)
ov_tech_cost(t,i,type) Costs of TC (mio. USD05PPP per yr)
ov_tech_cost(t,i,type) Costs of TC (mio. USD17PPP per yr)
;
*##################### R SECTION END (OUTPUT DECLARATIONS) #####################
Loading
Loading