Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CDR switches cleanup #1487

Merged
merged 4 commits into from
Dec 4, 2023
Merged

CDR switches cleanup #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0bf8ea
Remove cm_DAC_eff
katarkow Nov 30, 2023
a91be09
Update switches related to the CDR module
katarkow Nov 30, 2023
280afee
fixup! Remove cm_DAC_eff
katarkow Nov 30, 2023
cbee53c
Merge branch 'develop' into CDR_switches_cleanup
orichters Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions main.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,14 +843,18 @@ parameter
*' * (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 "choose whether DAC (direct air capture) should be included into the CDR portfolio."
;
cm_33DAC = 1; !! def = 1
cm_33DAC = 1; !! def = 1 !! regexp = 0|1
*' * (1): direct air capture is included
*' * (0): not included
*'
parameter
cm_33EW "choose whether EW (enhanced weathering) should be included into the CDR portfolio. 0 = EW not used, 1 = used"
cm_33EW "choose whether EW (enhanced weathering) should be included into the CDR portfolio."
;
cm_33EW = 0; !! def = 0
cm_33EW = 0; !! def = 0 !! regexp = 0|1
*' * (1): enhanced weathering is included
*' * (0): not included
*'
parameter
cm_gs_ew "grain size (for enhanced weathering, CDR module) [micrometre]"
Expand Down Expand Up @@ -1503,10 +1507,6 @@ $setglobal cm_Industry_CCS_markup off !! def = off
*** def <- "off" = use default floor cost for renewables.
*** or list of techs with respective value to be added to the renewables floor cost in Europe
$setglobal cm_renewables_floor_cost off !! def = off
*** cm_DAC_eff "multiplicative factor for energy demand per unit carbon captured with DAC"
*** def <- "off" = use default p33_dac_fedem value.
*** or list of stationary energy carriers with respective value to be multiplied to p33_dac_fedem
$setglobal cm_DAC_eff off !! def = off
*** cm_sehe_upper "secondary energy district heating and heat pumps upper bound"
*** def <- "off" = no additional limit for district heating and heat pumps.
*** or number (ex. 2), district heating and heat pumps are limited to an upper bound of 2 times the 2020 model values.
Expand Down
1 change: 1 addition & 0 deletions scripts/start/readCheckScenarioConfig.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ readCheckScenarioConfig <- function(filename, remindPath = ".", testmode = FALSE
"cm_OILRETIRE" = "Now always on by default, see https://github.com/remindmodel/remind/pull/1102",
"cm_fixCO2price" = "Was never in use, removed in https://github.com/remindmodel/remind/pull/1369",
"cm_calibration_FE" = "Deleted, only used for old hand made industry trajectories, see https://github.com/remindmodel/remind/pull/1468",
"cm_DAC_eff" = "Deleted, not used anymore, see https://github.com/remindmodel/remind/pull/1487",
katarkow marked this conversation as resolved.
Show resolved Hide resolved
"cm_peakBudgYr" = "Rename to c_peakBudgYr, see https://github.com/remindmodel/remind/pull/1488",
"cm_taxCO2inc_after_peakBudgYr" = "Rename to c_taxCO2inc_after_peakBudgYr, see https://github.com/remindmodel/remind/pull/1488",
NULL)
Expand Down
2 changes: 0 additions & 2 deletions standalone/MOFEX/MOFEX.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,8 +490,6 @@ $setglobal cm_CCS_markup off !! def = off
$setglobal cm_Industry_CCS_markup off !! def = off
$setglobal cm_renewables_floor_cost off !! def = off

$setglobal cm_DAC_eff off !! def = off

$setglobal cm_sehe_upper off !! def = off

$setglobal cm_feShareLimits off !! def = off
Expand Down
2 changes: 0 additions & 2 deletions standalone/trade/trade.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,6 @@ $setglobal cm_CCS_markup off !! def = off
$setglobal cm_Industry_CCS_markup off !! def = off
$setglobal cm_renewables_floor_cost off !! def = off

$setglobal cm_DAC_eff off !! def = off

$setglobal cm_sehe_upper off !! def = off

$setglobal cm_feShareLimits off !! def = off
Expand Down