From fe8cd67a21d9659ac9453b484d75e65dfd0cb180 Mon Sep 17 00:00:00 2001 From: florianh Date: Wed, 6 Nov 2024 06:48:39 +0100 Subject: [PATCH] update --- modules/29_cropland/detail_apr24/realization.gms | 1 + .../detail_apr24}/scaling.gms | 4 ++-- modules/38_factor_costs/sticky_labor/scaling.gms | 2 +- .../44_biodiversity/bii_target_apr24/realization.gms | 1 - modules/70_livestock/fbask_jan16/realization.gms | 1 + modules/70_livestock/{ => fbask_jan16}/scaling.gms | 0 .../70_livestock/fbask_jan16_sticky/realization.gms | 1 + .../fbask_jan16_sticky}/scaling.gms | 6 +++--- .../71_disagg_lvst/foragebased_aug18/realization.gms | 1 - modules/71_disagg_lvst/foragebased_aug18/scaling.gms | 10 ---------- .../71_disagg_lvst/foragebased_jul23/realization.gms | 1 - 11 files changed, 9 insertions(+), 19 deletions(-) rename modules/{44_biodiversity/bii_target_apr24 => 29_cropland/detail_apr24}/scaling.gms (82%) rename modules/70_livestock/{ => fbask_jan16}/scaling.gms (100%) rename modules/{71_disagg_lvst/foragebased_jul23 => 70_livestock/fbask_jan16_sticky}/scaling.gms (65%) delete mode 100644 modules/71_disagg_lvst/foragebased_aug18/scaling.gms diff --git a/modules/29_cropland/detail_apr24/realization.gms b/modules/29_cropland/detail_apr24/realization.gms index 071000bd1e..c9b62fec84 100644 --- a/modules/29_cropland/detail_apr24/realization.gms +++ b/modules/29_cropland/detail_apr24/realization.gms @@ -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" diff --git a/modules/44_biodiversity/bii_target_apr24/scaling.gms b/modules/29_cropland/detail_apr24/scaling.gms similarity index 82% rename from modules/44_biodiversity/bii_target_apr24/scaling.gms rename to modules/29_cropland/detail_apr24/scaling.gms index 33a5a12965..49bccf2ac2 100644 --- a/modules/44_biodiversity/bii_target_apr24/scaling.gms +++ b/modules/29_cropland/detail_apr24/scaling.gms @@ -5,5 +5,5 @@ *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -*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; diff --git a/modules/38_factor_costs/sticky_labor/scaling.gms b/modules/38_factor_costs/sticky_labor/scaling.gms index f24ae1f0b4..27fd45cc58 100644 --- a/modules/38_factor_costs/sticky_labor/scaling.gms +++ b/modules/38_factor_costs/sticky_labor/scaling.gms @@ -5,6 +5,6 @@ *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -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; diff --git a/modules/44_biodiversity/bii_target_apr24/realization.gms b/modules/44_biodiversity/bii_target_apr24/realization.gms index f8fbd4252e..1b1298ab5a 100644 --- a/modules/44_biodiversity/bii_target_apr24/realization.gms +++ b/modules/44_biodiversity/bii_target_apr24/realization.gms @@ -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" diff --git a/modules/70_livestock/fbask_jan16/realization.gms b/modules/70_livestock/fbask_jan16/realization.gms index 97f9aa4279..c3b44b9ebc 100644 --- a/modules/70_livestock/fbask_jan16/realization.gms +++ b/modules/70_livestock/fbask_jan16/realization.gms @@ -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" diff --git a/modules/70_livestock/scaling.gms b/modules/70_livestock/fbask_jan16/scaling.gms similarity index 100% rename from modules/70_livestock/scaling.gms rename to modules/70_livestock/fbask_jan16/scaling.gms diff --git a/modules/70_livestock/fbask_jan16_sticky/realization.gms b/modules/70_livestock/fbask_jan16_sticky/realization.gms index 46ff7d5323..734972e767 100644 --- a/modules/70_livestock/fbask_jan16_sticky/realization.gms +++ b/modules/70_livestock/fbask_jan16_sticky/realization.gms @@ -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" diff --git a/modules/71_disagg_lvst/foragebased_jul23/scaling.gms b/modules/70_livestock/fbask_jan16_sticky/scaling.gms similarity index 65% rename from modules/71_disagg_lvst/foragebased_jul23/scaling.gms rename to modules/70_livestock/fbask_jan16_sticky/scaling.gms index c3e721d03f..120fe57164 100644 --- a/modules/71_disagg_lvst/foragebased_jul23/scaling.gms +++ b/modules/70_livestock/fbask_jan16_sticky/scaling.gms @@ -5,6 +5,6 @@ *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -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; diff --git a/modules/71_disagg_lvst/foragebased_aug18/realization.gms b/modules/71_disagg_lvst/foragebased_aug18/realization.gms index 00e90d4012..94a0fdc42f 100644 --- a/modules/71_disagg_lvst/foragebased_aug18/realization.gms +++ b/modules/71_disagg_lvst/foragebased_aug18/realization.gms @@ -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) ############################### diff --git a/modules/71_disagg_lvst/foragebased_aug18/scaling.gms b/modules/71_disagg_lvst/foragebased_aug18/scaling.gms deleted file mode 100644 index a9ec69a79e..0000000000 --- a/modules/71_disagg_lvst/foragebased_aug18/scaling.gms +++ /dev/null @@ -1,10 +0,0 @@ -*** | (C) 2008-2024 Potsdam Institute for Climate Impact Research (PIK) -*** | authors, and contributors see CITATION.cff file. This file is part -*** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -*** | AGPL-3.0, you are granted additional permissions described in the -*** | MAgPIE License Exception, version 1.0 (see LICENSE file). -*** | Contact: magpie@pik-potsdam.de - -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,kli_rum,kforage) = 10e3; diff --git a/modules/71_disagg_lvst/foragebased_jul23/realization.gms b/modules/71_disagg_lvst/foragebased_jul23/realization.gms index 638bb9c520..d1cb9f6507 100644 --- a/modules/71_disagg_lvst/foragebased_jul23/realization.gms +++ b/modules/71_disagg_lvst/foragebased_jul23/realization.gms @@ -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"