CDR cleaning session

core/declarations.gms

@@ -405,7 +405,6 @@ v_co2capturevalve(ttot,all_regi)                            "CO2 emitted right a
 vm_prodUe(ttot,all_regi,all_enty,all_enty,all_te)    "Useful energy production [TWa]"
 
 vm_capEarlyReti(tall,all_regi,all_te)                "fraction of early retired capital"
-vm_otherFEdemand(ttot,all_regi,all_enty)             "final energy demand from no transformation technologies (e.g. enhanced weathering)"
 
 vm_demSeOth(ttot,all_regi,all_enty,all_te)	         "other sety demand from certain technologies, have to calculated in additional equations [TWa]"
 vm_prodSeOth(ttot,all_regi,all_enty,all_te)	         "other sety production from certain technologies, have to be calculated in additional equations [TWa]"

core/sets.gms

@@ -275,7 +275,6 @@ $ENDIF.WindOff
         apCarElT        "Cars using final energy electricity (FEELT) to produce useful energy as electricity for transport (UEELT)"
         apTrnElT        "Trains using final energy electricity (FEELT) to produce useful energy as electricity for transport (UEELT)"
 ***  appCarGaT  "Cars using FEGAT to produce ESGAT."  ???
-        rockgrind       "grinding rock for enhanced weathering" !! deprecated, will be removed with CDR module refactoring
         weathering      "enhanced weathering"
         dac             "direct air capture"
         x_gas2elec

main.gms

@@ -316,11 +316,8 @@ $setglobal fossil  grades2poly        !! def = grades2poly
 $setglobal power  IntC        !! def = IntC
 *'---------------------    33_CDR       ----------------------------------------
 *'
-*' * (off)        : no carbon dioxide removal technologies except BECCS
-*' * (weathering) : includes enhanced weathering
-*' * (DAC) :    includes direct air capture
-*' * (all) :    includes all CDR technologies
-$setglobal CDR  DAC        !! def = DAC
+*' * (portfolio) : CDR options added via switches: cm_33[option abbreviation]
+$setglobal CDR  portfolio        !! def = portfolio
 *'---------------------    35_transport    ----------------------------------------
 *'
 *' * (complex):  transport realization with aggregated transport demand (LDV, HDV, electric trains) via CES function with constrained choice on vehicle technologies
@@ -847,6 +844,16 @@ parameter
 *' * (0): no import, the default starting value as specified in modules/ 0 /on/input/tax_CO2.inc, core/input/data_emibudget.inc, modules/15_climate/box/datainput.gms is used
 *' * (1): the values from the gdx are read in (works only if the gdx has a parameter value) ATTENTION: make sure that the values from the gdx have the right structure (e.g. regionally differentiated or not)
 *'
+parameter
+  cm_33DAC                  "choose whether DAC (direct air capture) should be included into the CDR portfolio. 0 = DAC not used, 1 = used"
+;
+  cm_33DAC                 = 1;   !! def = 1
+*'
+parameter
+  cm_33EW                   "choose whether EW (enhanced weathering) should be included into the CDR portfolio. 0 = EW not used, 1 = used"
+;
+  cm_33EW                  = 0;   !! def = 0
+*'
 parameter
   cm_gs_ew                  "grain size (for enhanced weathering, CDR module) [micrometre]"
 ;