Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
flohump committed Nov 6, 2024
1 parent 47f3227 commit fe8cd67
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 19 deletions.
1 change: 1 addition & 0 deletions modules/29_cropland/detail_apr24/realization.gms
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ $Ifi "%phase%" == "sets" $include "./modules/29_cropland/detail_apr24/sets.gms"
$Ifi "%phase%" == "declarations" $include "./modules/29_cropland/detail_apr24/declarations.gms"
$Ifi "%phase%" == "input" $include "./modules/29_cropland/detail_apr24/input.gms"
$Ifi "%phase%" == "equations" $include "./modules/29_cropland/detail_apr24/equations.gms"
$Ifi "%phase%" == "scaling" $include "./modules/29_cropland/detail_apr24/scaling.gms"
$Ifi "%phase%" == "preloop" $include "./modules/29_cropland/detail_apr24/preloop.gms"
$Ifi "%phase%" == "presolve" $include "./modules/29_cropland/detail_apr24/presolve.gms"
$Ifi "%phase%" == "postsolve" $include "./modules/29_cropland/detail_apr24/postsolve.gms"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
*** | MAgPIE License Exception, version 1.0 (see LICENSE file).
*** | Contact: [email protected]

*v44_bii.scale(i,biome44) = 10e-4;
*vm_bv.scale(j,landcover44,potnatveg) = 10e-4;
v29_treecover.scale(j,ac) = 10e-3;
v29_treecover_missing.scale(j) = 10e-3;
2 changes: 1 addition & 1 deletion modules/38_factor_costs/sticky_labor/scaling.gms
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
*** | MAgPIE License Exception, version 1.0 (see LICENSE file).
*** | Contact: [email protected]

vm_cost_prod_crop.scale(i,factors) = 10e4;
vm_cost_prod_crop.scale(i,factors) = 10e5;
v38_investment_immobile.scale(j,kcr) = 10e3;
v38_capital_need.scale(j,kcr,mobil38) = 10e3;
1 change: 0 additions & 1 deletion modules/44_biodiversity/bii_target_apr24/realization.gms
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ $Ifi "%phase%" == "sets" $include "./modules/44_biodiversity/bii_target_apr24/se
$Ifi "%phase%" == "declarations" $include "./modules/44_biodiversity/bii_target_apr24/declarations.gms"
$Ifi "%phase%" == "input" $include "./modules/44_biodiversity/bii_target_apr24/input.gms"
$Ifi "%phase%" == "equations" $include "./modules/44_biodiversity/bii_target_apr24/equations.gms"
$Ifi "%phase%" == "scaling" $include "./modules/44_biodiversity/bii_target_apr24/scaling.gms"
$Ifi "%phase%" == "preloop" $include "./modules/44_biodiversity/bii_target_apr24/preloop.gms"
$Ifi "%phase%" == "presolve" $include "./modules/44_biodiversity/bii_target_apr24/presolve.gms"
$Ifi "%phase%" == "postsolve" $include "./modules/44_biodiversity/bii_target_apr24/postsolve.gms"
Expand Down
1 change: 1 addition & 0 deletions modules/70_livestock/fbask_jan16/realization.gms
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ $Ifi "%phase%" == "sets" $include "./modules/70_livestock/fbask_jan16/sets.gms"
$Ifi "%phase%" == "declarations" $include "./modules/70_livestock/fbask_jan16/declarations.gms"
$Ifi "%phase%" == "input" $include "./modules/70_livestock/fbask_jan16/input.gms"
$Ifi "%phase%" == "equations" $include "./modules/70_livestock/fbask_jan16/equations.gms"
$Ifi "%phase%" == "scaling" $include "./modules/70_livestock/fbask_jan16/scaling.gms"
$Ifi "%phase%" == "preloop" $include "./modules/70_livestock/fbask_jan16/preloop.gms"
$Ifi "%phase%" == "presolve" $include "./modules/70_livestock/fbask_jan16/presolve.gms"
$Ifi "%phase%" == "postsolve" $include "./modules/70_livestock/fbask_jan16/postsolve.gms"
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions modules/70_livestock/fbask_jan16_sticky/realization.gms
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ $Ifi "%phase%" == "sets" $include "./modules/70_livestock/fbask_jan16_sticky/set
$Ifi "%phase%" == "declarations" $include "./modules/70_livestock/fbask_jan16_sticky/declarations.gms"
$Ifi "%phase%" == "input" $include "./modules/70_livestock/fbask_jan16_sticky/input.gms"
$Ifi "%phase%" == "equations" $include "./modules/70_livestock/fbask_jan16_sticky/equations.gms"
$Ifi "%phase%" == "scaling" $include "./modules/70_livestock/fbask_jan16_sticky/scaling.gms"
$Ifi "%phase%" == "preloop" $include "./modules/70_livestock/fbask_jan16_sticky/preloop.gms"
$Ifi "%phase%" == "presolve" $include "./modules/70_livestock/fbask_jan16_sticky/presolve.gms"
$Ifi "%phase%" == "postsolve" $include "./modules/70_livestock/fbask_jan16_sticky/postsolve.gms"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
*** | MAgPIE License Exception, version 1.0 (see LICENSE file).
*** | Contact: [email protected]

vm_costs_additional_mon.scale(i) = 10e4;
*Don't scale this variable. Model is very sensitive to scaling this variable and might become infeasible or very slow.
*v71_feed_balanceflow.scale(j,kforage) = 10e3;

vm_cost_prod_livst.scale(i,factors) = 10e5;
vm_cost_prod_fish.scale(i) = 10e5;
1 change: 0 additions & 1 deletion modules/71_disagg_lvst/foragebased_aug18/realization.gms
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
$Ifi "%phase%" == "sets" $include "./modules/71_disagg_lvst/foragebased_aug18/sets.gms"
$Ifi "%phase%" == "declarations" $include "./modules/71_disagg_lvst/foragebased_aug18/declarations.gms"
$Ifi "%phase%" == "equations" $include "./modules/71_disagg_lvst/foragebased_aug18/equations.gms"
$Ifi "%phase%" == "scaling" $include "./modules/71_disagg_lvst/foragebased_aug18/scaling.gms"
$Ifi "%phase%" == "preloop" $include "./modules/71_disagg_lvst/foragebased_aug18/preloop.gms"
$Ifi "%phase%" == "postsolve" $include "./modules/71_disagg_lvst/foragebased_aug18/postsolve.gms"
*######################## R SECTION END (PHASES) ###############################
10 changes: 0 additions & 10 deletions modules/71_disagg_lvst/foragebased_aug18/scaling.gms

This file was deleted.

1 change: 0 additions & 1 deletion modules/71_disagg_lvst/foragebased_jul23/realization.gms
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
$Ifi "%phase%" == "sets" $include "./modules/71_disagg_lvst/foragebased_jul23/sets.gms"
$Ifi "%phase%" == "declarations" $include "./modules/71_disagg_lvst/foragebased_jul23/declarations.gms"
$Ifi "%phase%" == "equations" $include "./modules/71_disagg_lvst/foragebased_jul23/equations.gms"
$Ifi "%phase%" == "scaling" $include "./modules/71_disagg_lvst/foragebased_jul23/scaling.gms"
$Ifi "%phase%" == "preloop" $include "./modules/71_disagg_lvst/foragebased_jul23/preloop.gms"
$Ifi "%phase%" == "postsolve" $include "./modules/71_disagg_lvst/foragebased_jul23/postsolve.gms"
$Ifi "%phase%" == "nl_fix" $include "./modules/71_disagg_lvst/foragebased_jul23/nl_fix.gms"
Expand Down

0 comments on commit fe8cd67

Please sign in to comment.