forked from magpiemodel/magpie
-
Notifications
You must be signed in to change notification settings - Fork 0
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 magpiemodel#645 from flohump/f_woodtrade
Bugfix Trade Timber Products
- Loading branch information
Showing
22 changed files
with
252 additions
and
227 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
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,52 +6,56 @@ | |
*** | Contact: [email protected] | ||
|
||
*#################### R SECTION START (OUTPUT DEFINITIONS) ##################### | ||
ov21_excess_dem(t,k_trade,"marginal") = v21_excess_dem.m(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"marginal") = v21_excess_prod.m(h,k_trade); | ||
ov_cost_trade(t,i,"marginal") = vm_cost_trade.m(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"marginal") = v21_cost_trade_reg.m(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"marginal") = q21_trade_glo.m(k_trade); | ||
oq21_notrade(t,h,k_notrade,"marginal") = q21_notrade.m(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"marginal") = q21_trade_reg.m(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"marginal") = q21_trade_reg_up.m(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"marginal") = q21_excess_dem.m(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"marginal") = q21_excess_supply.m(h,k_trade); | ||
oq21_cost_trade(t,h,"marginal") = q21_cost_trade.m(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"marginal") = q21_cost_trade_reg.m(h,k_trade); | ||
ov21_excess_dem(t,k_trade,"level") = v21_excess_dem.l(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"level") = v21_excess_prod.l(h,k_trade); | ||
ov_cost_trade(t,i,"level") = vm_cost_trade.l(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"level") = v21_cost_trade_reg.l(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"level") = q21_trade_glo.l(k_trade); | ||
oq21_notrade(t,h,k_notrade,"level") = q21_notrade.l(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"level") = q21_trade_reg.l(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"level") = q21_trade_reg_up.l(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"level") = q21_excess_dem.l(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"level") = q21_excess_supply.l(h,k_trade); | ||
oq21_cost_trade(t,h,"level") = q21_cost_trade.l(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"level") = q21_cost_trade_reg.l(h,k_trade); | ||
ov21_excess_dem(t,k_trade,"upper") = v21_excess_dem.up(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"upper") = v21_excess_prod.up(h,k_trade); | ||
ov_cost_trade(t,i,"upper") = vm_cost_trade.up(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"upper") = v21_cost_trade_reg.up(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"upper") = q21_trade_glo.up(k_trade); | ||
oq21_notrade(t,h,k_notrade,"upper") = q21_notrade.up(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"upper") = q21_trade_reg.up(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"upper") = q21_trade_reg_up.up(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"upper") = q21_excess_dem.up(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"upper") = q21_excess_supply.up(h,k_trade); | ||
oq21_cost_trade(t,h,"upper") = q21_cost_trade.up(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"upper") = q21_cost_trade_reg.up(h,k_trade); | ||
ov21_excess_dem(t,k_trade,"lower") = v21_excess_dem.lo(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"lower") = v21_excess_prod.lo(h,k_trade); | ||
ov_cost_trade(t,i,"lower") = vm_cost_trade.lo(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"lower") = v21_cost_trade_reg.lo(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"lower") = q21_trade_glo.lo(k_trade); | ||
oq21_notrade(t,h,k_notrade,"lower") = q21_notrade.lo(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"lower") = q21_trade_reg.lo(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"lower") = q21_trade_reg_up.lo(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"lower") = q21_excess_dem.lo(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"lower") = q21_excess_supply.lo(h,k_trade); | ||
oq21_cost_trade(t,h,"lower") = q21_cost_trade.lo(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"lower") = q21_cost_trade_reg.lo(h,k_trade); | ||
ov21_excess_dem(t,k_trade,"marginal") = v21_excess_dem.m(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"marginal") = v21_excess_prod.m(h,k_trade); | ||
ov_cost_trade(t,i,"marginal") = vm_cost_trade.m(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"marginal") = v21_cost_trade_reg.m(h,k_trade); | ||
ov21_import_for_feasibility(t,h,k_trade,"marginal") = v21_import_for_feasibility.m(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"marginal") = q21_trade_glo.m(k_trade); | ||
oq21_notrade(t,h,k_notrade,"marginal") = q21_notrade.m(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"marginal") = q21_trade_reg.m(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"marginal") = q21_trade_reg_up.m(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"marginal") = q21_excess_dem.m(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"marginal") = q21_excess_supply.m(h,k_trade); | ||
oq21_cost_trade(t,h,"marginal") = q21_cost_trade.m(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"marginal") = q21_cost_trade_reg.m(h,k_trade); | ||
ov21_excess_dem(t,k_trade,"level") = v21_excess_dem.l(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"level") = v21_excess_prod.l(h,k_trade); | ||
ov_cost_trade(t,i,"level") = vm_cost_trade.l(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"level") = v21_cost_trade_reg.l(h,k_trade); | ||
ov21_import_for_feasibility(t,h,k_trade,"level") = v21_import_for_feasibility.l(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"level") = q21_trade_glo.l(k_trade); | ||
oq21_notrade(t,h,k_notrade,"level") = q21_notrade.l(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"level") = q21_trade_reg.l(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"level") = q21_trade_reg_up.l(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"level") = q21_excess_dem.l(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"level") = q21_excess_supply.l(h,k_trade); | ||
oq21_cost_trade(t,h,"level") = q21_cost_trade.l(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"level") = q21_cost_trade_reg.l(h,k_trade); | ||
ov21_excess_dem(t,k_trade,"upper") = v21_excess_dem.up(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"upper") = v21_excess_prod.up(h,k_trade); | ||
ov_cost_trade(t,i,"upper") = vm_cost_trade.up(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"upper") = v21_cost_trade_reg.up(h,k_trade); | ||
ov21_import_for_feasibility(t,h,k_trade,"upper") = v21_import_for_feasibility.up(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"upper") = q21_trade_glo.up(k_trade); | ||
oq21_notrade(t,h,k_notrade,"upper") = q21_notrade.up(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"upper") = q21_trade_reg.up(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"upper") = q21_trade_reg_up.up(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"upper") = q21_excess_dem.up(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"upper") = q21_excess_supply.up(h,k_trade); | ||
oq21_cost_trade(t,h,"upper") = q21_cost_trade.up(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"upper") = q21_cost_trade_reg.up(h,k_trade); | ||
ov21_excess_dem(t,k_trade,"lower") = v21_excess_dem.lo(k_trade); | ||
ov21_excess_prod(t,h,k_trade,"lower") = v21_excess_prod.lo(h,k_trade); | ||
ov_cost_trade(t,i,"lower") = vm_cost_trade.lo(i); | ||
ov21_cost_trade_reg(t,h,k_trade,"lower") = v21_cost_trade_reg.lo(h,k_trade); | ||
ov21_import_for_feasibility(t,h,k_trade,"lower") = v21_import_for_feasibility.lo(h,k_trade); | ||
oq21_trade_glo(t,k_trade,"lower") = q21_trade_glo.lo(k_trade); | ||
oq21_notrade(t,h,k_notrade,"lower") = q21_notrade.lo(h,k_notrade); | ||
oq21_trade_reg(t,h,k_trade,"lower") = q21_trade_reg.lo(h,k_trade); | ||
oq21_trade_reg_up(t,h,k_trade,"lower") = q21_trade_reg_up.lo(h,k_trade); | ||
oq21_excess_dem(t,k_trade,"lower") = q21_excess_dem.lo(k_trade); | ||
oq21_excess_supply(t,h,k_trade,"lower") = q21_excess_supply.lo(h,k_trade); | ||
oq21_cost_trade(t,h,"lower") = q21_cost_trade.lo(h); | ||
oq21_cost_trade_reg(t,h,k_trade,"lower") = q21_cost_trade_reg.lo(h,k_trade); | ||
*##################### R SECTION END (OUTPUT DEFINITIONS) ###################### |
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 |
---|---|---|
|
@@ -5,5 +5,5 @@ | |
*** | MAgPIE License Exception, version 1.0 (see LICENSE file). | ||
*** | Contact: [email protected] | ||
|
||
vm_cost_trade.scale(i) = 10e4; | ||
v21_cost_trade_reg.scale(h,k_trade) = 10e2; | ||
vm_cost_trade.scale(i) = 10e5; | ||
v21_cost_trade_reg.scale(h,k_trade) = 10e3; |
Oops, something went wrong.