From e993340ef2710e663c998f0e87e53ea368401958 Mon Sep 17 00:00:00 2001 From: florianh Date: Sun, 24 Nov 2024 16:45:12 +0100 Subject: [PATCH] bugfix removal grassland realisation --- CHANGELOG.md | 1 + modules/13_tc/endo_jan22/input.gms | 2 +- modules/13_tc/endo_jan22/preloop.gms | 2 +- modules/13_tc/endo_jan22/presolve.gms | 2 +- modules/13_tc/exo/input.gms | 2 +- modules/13_tc/exo/preloop.gms | 2 +- modules/31_past/endo_jun13/not_used.txt | 4 ---- modules/31_past/static/not_used.txt | 3 --- 8 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 modules/31_past/endo_jun13/not_used.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 650e9df00b..2ef775bf19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### removed - **31_past** removed `grasslands_apr22` realization +- **13_tau** removed interface `fm_pastr_tau_hist` ### fixed - **11_costs** changed equation to fix bug in total water cost calculation diff --git a/modules/13_tc/endo_jan22/input.gms b/modules/13_tc/endo_jan22/input.gms index f9a37ab622..b74ae99b53 100644 --- a/modules/13_tc/endo_jan22/input.gms +++ b/modules/13_tc/endo_jan22/input.gms @@ -45,7 +45,7 @@ $include "./modules/13_tc/input/f13_tau_historical.csv" $offdelim ; -table fm_pastr_tau_hist(t_all,h) Historical managed pasture tau (1) +table f13_pastr_tau_hist(t_all,h) Historical managed pasture tau (1) $ondelim $include "./modules/13_tc/input/f13_pastr_tau_hist.csv" $offdelim diff --git a/modules/13_tc/endo_jan22/preloop.gms b/modules/13_tc/endo_jan22/preloop.gms index b96d0b99a3..31cbb0fe18 100644 --- a/modules/13_tc/endo_jan22/preloop.gms +++ b/modules/13_tc/endo_jan22/preloop.gms @@ -16,5 +16,5 @@ loop(t, ); pcm_tau(h,"crop") = fm_tau1995(h); -pcm_tau(h,"pastr") = fm_pastr_tau_hist("y1995",h); +pcm_tau(h,"pastr") = f13_pastr_tau_hist("y1995",h); pc13_tcguess(h,tautype) = f13_tcguess(h); diff --git a/modules/13_tc/endo_jan22/presolve.gms b/modules/13_tc/endo_jan22/presolve.gms index f769dc97ba..9e37d6aae3 100644 --- a/modules/13_tc/endo_jan22/presolve.gms +++ b/modules/13_tc/endo_jan22/presolve.gms @@ -10,7 +10,7 @@ pc13_land(i,"pastr") = sum(cell(i,j),pcm_land(j,"past")); pc13_land(i,"crop") = sum(cell(i,j),pcm_land(j,"crop")); if (sum(sameas(t_past,t),1) = 1 AND s13_ignore_tau_historical = 0, - vm_tau.lo(h,"pastr") = fm_pastr_tau_hist(t,h); + vm_tau.lo(h,"pastr") = f13_pastr_tau_hist(t,h); vm_tau.lo(h,"crop") = f13_tau_historical(t,h); else vm_tau.lo(h, tautype) = pcm_tau(h, tautype); diff --git a/modules/13_tc/exo/input.gms b/modules/13_tc/exo/input.gms index f5743743e1..39b97b6336 100644 --- a/modules/13_tc/exo/input.gms +++ b/modules/13_tc/exo/input.gms @@ -34,7 +34,7 @@ $include "./modules/13_tc/input/f13_tau_scenario.csv" $offdelim ; -table fm_pastr_tau_hist(t_all,h) Historical managed pasture tau (1) +table f13_pastr_tau_hist(t_all,h) Historical managed pasture tau (1) $ondelim $include "./modules/13_tc/input/f13_pastr_tau_hist.csv" $offdelim diff --git a/modules/13_tc/exo/preloop.gms b/modules/13_tc/exo/preloop.gms index 6c62b24803..0d26231054 100644 --- a/modules/13_tc/exo/preloop.gms +++ b/modules/13_tc/exo/preloop.gms @@ -16,4 +16,4 @@ loop(t, ); pcm_tau(h,"crop") = fm_tau1995(h); -pcm_tau(h,"pastr") = fm_pastr_tau_hist("y1995",h); +pcm_tau(h,"pastr") = f13_pastr_tau_hist("y1995",h); diff --git a/modules/31_past/endo_jun13/not_used.txt b/modules/31_past/endo_jun13/not_used.txt deleted file mode 100644 index 2c2efa6670..0000000000 --- a/modules/31_past/endo_jun13/not_used.txt +++ /dev/null @@ -1,4 +0,0 @@ -name,type,reason -vm_tau,input,questionnaire -fm_pastr_tau_hist,input,questionnaire -sm_fix_cc, input, not needed diff --git a/modules/31_past/static/not_used.txt b/modules/31_past/static/not_used.txt index 6bd07855f0..3b1a814ba5 100644 --- a/modules/31_past/static/not_used.txt +++ b/modules/31_past/static/not_used.txt @@ -2,6 +2,3 @@ name,type,reason vm_prod, input, not needed vm_yld, input, not needed pm_land_conservation,input,questionnaire -vm_tau,input,questionnaire -fm_pastr_tau_hist,input,questionnaire -sm_fix_cc, input, not needed