From 59ad766f03bb767adbc696ab69230ae856d70b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurin=20K=C3=B6hler-Schindler?= Date: Thu, 12 Dec 2024 11:32:01 +0100 Subject: [PATCH] Define vm_emiAll as sum over vm_emiAllMkt and ensure consistent use of vm_emiAll in 45_carbonprice/functionalForm/postsolve.gms --- core/equations.gms | 13 ++++--------- modules/45_carbonprice/NDC/not_used.txt | 3 --- modules/45_carbonprice/NPi/not_used.txt | 3 --- modules/45_carbonprice/NPi2025/not_used.txt | 3 --- modules/45_carbonprice/NPi2025expo/not_used.txt | 3 --- modules/45_carbonprice/NPiexpo/not_used.txt | 3 --- modules/45_carbonprice/exogenous/not_used.txt | 3 --- modules/45_carbonprice/expoLinear/not_used.txt | 3 --- modules/45_carbonprice/functionalForm/postsolve.gms | 2 +- modules/45_carbonprice/none/not_used.txt | 3 --- .../temperatureNotToExceed/not_used.txt | 3 --- 11 files changed, 5 insertions(+), 37 deletions(-) diff --git a/core/equations.gms b/core/equations.gms index 216f1b455..1c8071df0 100644 --- a/core/equations.gms +++ b/core/equations.gms @@ -754,19 +754,14 @@ q_emiCdrAll(t,regi).. ***------------------------------------------------------ -*' Total regional emissions are the sum of emissions from technologies, MAC-curves, CDR-technologies and emissions that are exogenously given for REMIND. +*' Total regional emissions are computed as the sum of total emissions over all emission markets. ***------------------------------------------------------ -*LB* calculate total emissions for each region at each time step -q_emiAll(t,regi,emi(enty)).. - vm_emiAll(t,regi,enty) +q_emiAll(t,regi,emi).. + vm_emiAll(t,regi,emi) =e= - vm_emiTe(t,regi,enty) - + vm_emiMac(t,regi,enty) - + vm_emiCdr(t,regi,enty) - + pm_emiExog(t,regi,enty) + sum(emiMkt, vm_emiAllMkt(t,regi,emi,emiMkt)) ; - ***------------------------------------------------------ *' Total regional emissions in CO2 equivalents that are part of the climate policy are computed based on regional GHG *' emissions from different sectors(energy system, non-energy system, exogenous, CDR technologies). diff --git a/modules/45_carbonprice/NDC/not_used.txt b/modules/45_carbonprice/NDC/not_used.txt index 7186a99c3..9ea020e6b 100644 --- a/modules/45_carbonprice/NDC/not_used.txt +++ b/modules/45_carbonprice/NDC/not_used.txt @@ -21,9 +21,6 @@ pm_gdp,input,questionnaire cm_peakBudgYr,input,added by codeCheck fm_taxCO2eqHist,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment diff --git a/modules/45_carbonprice/NPi/not_used.txt b/modules/45_carbonprice/NPi/not_used.txt index 418cf7ed9..3d5f6419e 100644 --- a/modules/45_carbonprice/NPi/not_used.txt +++ b/modules/45_carbonprice/NPi/not_used.txt @@ -29,9 +29,6 @@ cm_startyear,input,added by codeCheck cm_peakBudgYr,input,added by codeCheck fm_taxCO2eqHist,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment diff --git a/modules/45_carbonprice/NPi2025/not_used.txt b/modules/45_carbonprice/NPi2025/not_used.txt index eefae6532..b5b76d545 100755 --- a/modules/45_carbonprice/NPi2025/not_used.txt +++ b/modules/45_carbonprice/NPi2025/not_used.txt @@ -29,9 +29,6 @@ pm_emifac,input,questionnaire cm_peakBudgYr,input,not needed sm_D2005_2_D2017,input,not needed sm_budgetCO2eqGlob,input,added by codeCheck -vm_emiTe,input,added by codeCheck -vm_emiCdr,input,added by codeCheck -vm_emiMac,input,added by codeCheck vm_emiAll,input,added by codeCheck pm_taxCO2eq_anchor_iterationdiff,input,added by codeCheck pm_taxCO2eq_anchor_iterationdiff_tmp,input,added by codeCheck diff --git a/modules/45_carbonprice/NPi2025expo/not_used.txt b/modules/45_carbonprice/NPi2025expo/not_used.txt index cfd59fed7..cc8ed8d41 100755 --- a/modules/45_carbonprice/NPi2025expo/not_used.txt +++ b/modules/45_carbonprice/NPi2025expo/not_used.txt @@ -29,9 +29,6 @@ pm_emifac,input,questionnaire cm_peakBudgYr,input,not needed sm_D2005_2_D2017,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment diff --git a/modules/45_carbonprice/NPiexpo/not_used.txt b/modules/45_carbonprice/NPiexpo/not_used.txt index 6f185a95a..0dd0b3635 100644 --- a/modules/45_carbonprice/NPiexpo/not_used.txt +++ b/modules/45_carbonprice/NPiexpo/not_used.txt @@ -30,9 +30,6 @@ cm_peakBudgYr,input,added by codeCheck fm_taxCO2eqHist,input,not needed sm_D2005_2_D2017,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment diff --git a/modules/45_carbonprice/exogenous/not_used.txt b/modules/45_carbonprice/exogenous/not_used.txt index 5e413153f..585e96ae1 100644 --- a/modules/45_carbonprice/exogenous/not_used.txt +++ b/modules/45_carbonprice/exogenous/not_used.txt @@ -29,9 +29,6 @@ cm_peakBudgYr,input,added by codeCheck sm_D2005_2_D2017,input,not needed fm_taxCO2eqHist,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment diff --git a/modules/45_carbonprice/expoLinear/not_used.txt b/modules/45_carbonprice/expoLinear/not_used.txt index 419ccd566..fd139e736 100644 --- a/modules/45_carbonprice/expoLinear/not_used.txt +++ b/modules/45_carbonprice/expoLinear/not_used.txt @@ -26,9 +26,6 @@ cm_peakBudgYr,input,added by codeCheck sm_D2005_2_D2017,input,not needed fm_taxCO2eqHist,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment diff --git a/modules/45_carbonprice/functionalForm/postsolve.gms b/modules/45_carbonprice/functionalForm/postsolve.gms index 34b90b5aa..0133de38f 100644 --- a/modules/45_carbonprice/functionalForm/postsolve.gms +++ b/modules/45_carbonprice/functionalForm/postsolve.gms @@ -13,7 +13,7 @@ *** `p45_actualbudgetco2(ttot)` includes emissions from 2020 to `ttot` (inclusive). p45_actualbudgetco2(ttot)$( 2020 lt ttot.val ) = sum((regi,ttot2)$( 2020 le ttot2.val AND ttot2.val le ttot.val ), - ( vm_emiTe.l(ttot2,regi,"co2") + vm_emiCdr.l(ttot2,regi,"co2") + vm_emiMac.l(ttot2,regi,"co2")) + vm_emiAll.l(ttot2,regi,"co2") * ( (0.5 + pm_ts(ttot2) / 2)$( ttot2.val eq 2020 ) !! second half of the 2020 period (mid 2020 - end 2022) plus 0.5 to account fo beginning 2020 - mid 2020 + (pm_ts(ttot2))$( 2020 lt ttot2.val AND ttot2.val lt ttot.val ) !! entire middle periods + ((pm_ttot_val(ttot) - pm_ttot_val(ttot-1)) / 2 + 0.5)$(ttot2.val eq ttot.val ) !! first half of the final period plus 0.5 to account fo mid - end of final year diff --git a/modules/45_carbonprice/none/not_used.txt b/modules/45_carbonprice/none/not_used.txt index 4021ac8f6..24253228d 100644 --- a/modules/45_carbonprice/none/not_used.txt +++ b/modules/45_carbonprice/none/not_used.txt @@ -31,9 +31,6 @@ cm_peakBudgYr,input,added by codeCheck sm_D2005_2_D2017,input,not needed fm_taxCO2eqHist,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment diff --git a/modules/45_carbonprice/temperatureNotToExceed/not_used.txt b/modules/45_carbonprice/temperatureNotToExceed/not_used.txt index 7f79dc042..48119a22a 100644 --- a/modules/45_carbonprice/temperatureNotToExceed/not_used.txt +++ b/modules/45_carbonprice/temperatureNotToExceed/not_used.txt @@ -23,9 +23,6 @@ cm_peakBudgYr,input,added by codeCheck sm_D2005_2_D2017,input,not needed fm_taxCO2eqHist,input,not needed sm_budgetCO2eqGlob,input,no iterative target adjustment -vm_emiTe,input,no iterative target adjustment -vm_emiCdr,input,no iterative target adjustment -vm_emiMac,input,no iterative target adjustment vm_emiAll,input,no iterative target adjustment pm_budgetCO2eq,input,no iterative target adjustment pm_ts,input,no iterative target adjustment