formating changes required by code check

remindmodel · Nov 13, 2024 · 7b95a91 · 7b95a91
1 parent 13e6cda
commit 7b95a91
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/core/declarations.gms b/core/declarations.gms
@@ -414,7 +414,7 @@ vm_costAddTeInv(tall,all_regi,all_te,emi_sectors)    "additional sector-specific
 
 vm_co2CCS(ttot,all_regi,all_enty,all_enty,all_te,rlf)       "all different ccs. [GtC/a]"
 
-vm_co2capture(ttot,all_regi,all_enty,all_enty,all_te,rlf)   "all captured CO2. [GtC/a]"
+v_co2capture(ttot,all_regi,all_enty,all_enty,all_te,rlf)   "all captured CO2. [GtC/a]"
 v_co2capturevalve(ttot,all_regi)                            "CO2 emitted right after capture [GtC/a] (in q_balCCUvsCCS to account for different lifetimes of capture and CCU/CCS te and capacities)"
 
 v_prodUe (ttot,all_regi,all_enty,all_enty,all_te)    "Useful energy production [TWa]"

diff --git a/core/equations.gms b/core/equations.gms
@@ -744,7 +744,7 @@ q_emiCdrAll(t,regi)..
   )
   * ( !! scaled by the fraction that gets stored geologically
     sum(teCCS2rlf(te, rlf), vm_co2CCS(t, regi, "cco2", "ico2", te, rlf))
-    / (sum(teCCS2rlf(te, rlf), vm_co2capture(t, regi, "cco2", "ico2", "ccsinje", rlf)) + sm_eps)
+    / (sum(teCCS2rlf(te, rlf), v_co2capture(t, regi, "cco2", "ico2", "ccsinje", rlf)) + sm_eps)
   )
   !! net negative emissions from co2luc
   -  p_macBaseMagpieNegCo2(t,regi)
@@ -829,7 +829,7 @@ q_budgetCO2eqGlob$(cm_emiscen=6)..
 *' Definition of carbon capture :
 ***---------------------------------------------------------------------------
 q_balcapture(t,regi,ccs2te(ccsCo2(enty),enty2,te)) ..
-  sum(teCCS2rlf(te,rlf), vm_co2capture(t,regi,enty,enty2,te,rlf))
+  sum(teCCS2rlf(te,rlf), v_co2capture(t,regi,enty,enty2,te,rlf))
   =e=
     !! carbon captured in energy sector
     sum(emi2te(enty3,enty4,te2,enty),
@@ -852,7 +852,7 @@ q_balcapture(t,regi,ccs2te(ccsCo2(enty),enty2,te)) ..
 *' atmosphere)
 ***---------------------------------------------------------------------------
 q_balCCUvsCCS(t,regi) ..
-  sum(teCCS2rlf(te,rlf), vm_co2capture(t,regi,"cco2","ico2",te,rlf))
+  sum(teCCS2rlf(te,rlf), v_co2capture(t,regi,"cco2","ico2",te,rlf))
   =e=
     sum(teCCS2rlf(te,rlf), vm_co2CCS(t,regi,"cco2","ico2",te,rlf))
   + sum(teCCU2rlf(te,rlf), vm_co2CCUshort(t,regi,"cco2","ccuco2short",te,rlf))

diff --git a/core/postsolve.gms b/core/postsolve.gms
@@ -581,7 +581,7 @@ pm_PEPrice(ttot,regi,entyPe)$(abs (qm_budget.m(ttot,regi)) gt sm_eps) =
        q_balPe.m(ttot,regi,entyPe) / qm_budget.m(ttot,regi);
 
 *** calculate share of stored CO2 from captured CO2
-pm_share_CCS_CCO2(t,regi) = sum(teCCS2rlf(te,rlf), vm_co2CCS.l(t,regi,"cco2","ico2",te,rlf)) / (sum(teCCS2rlf(te,rlf), vm_co2capture.l(t,regi,"cco2","ico2",te,rlf))+sm_eps);
+pm_share_CCS_CCO2(t,regi) = sum(teCCS2rlf(te,rlf), vm_co2CCS.l(t,regi,"cco2","ico2",te,rlf)) / (sum(teCCS2rlf(te,rlf), v_co2capture.l(t,regi,"cco2","ico2",te,rlf))+sm_eps);
 
 *** emissions reporting helper parameters
 o_emissions_bunkers(ttot,regi,emi)$(ttot.val ge 2005) = 
@@ -732,7 +732,7 @@ o_emissions_other(ttot,regi,emi)$(ttot.val ge 2005) =
 ***Carbon Management|Carbon Capture (Mt CO2/yr)
 o_capture(ttot,regi,"co2")$(ttot.val ge 2005) =
     sum(teCCS2rlf(te,rlf),
-        vm_co2capture.l(ttot,regi,"cco2","ico2","ccsinje",rlf)
+        v_co2capture.l(ttot,regi,"cco2","ico2","ccsinje",rlf)
     )*o_emi_conv("co2");
 
 ***Carbon Management|Carbon Capture|Process|Energy (Mt CO2/yr)

diff --git a/modules/39_CCU/off/not_used.txt b/modules/39_CCU/off/not_used.txt
@@ -10,4 +10,5 @@ pm_emifac,input,questionnaire
 cm_emiscen,input,questionnaire
 cm_shSynGas,input,questionnaire
 vm_prodSe,input,questionnaire
-vm_co2capture,input,questionnaire
+pm_gdp,input,not used
+pm_cf,input,not used
diff --git a/modules/39_CCU/on/not_used.txt b/modules/39_CCU/on/not_used.txt
@@ -5,4 +5,3 @@
 # |  REMIND License Exception, version 1.0 (see LICENSE file).
 # |  Contact: [email protected]
 name,type,reason
-