Skip to content

Commit

Permalink
Clean up fixings
Browse files Browse the repository at this point in the history
  • Loading branch information
@katarkow
katarkow committed Jul 29, 2024
1 parent b40e379 commit 434cc89
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 115 deletions.
2 changes: 1 addition & 1 deletion modules/33_CDR/portfolio/declarations.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ v33_EW_onfield(ttot,all_regi,rlf,rlf) "amount of ground rock spread on fields i
v33_EW_onfield_tot(ttot,all_regi,rlf,rlf) "total amount of ground rock on fields, for each climate zone and transportation distance [Gt]"
v33_FEdemand(ttot,all_regi,all_enty,all_enty,all_te) "FE demand of each technology [TWa]"
vm_co2capture_cdr(ttot,all_regi,all_enty,all_enty,all_te,rlf) "total emissions captured through technologies in the CDR module that enter the CCUS chain + captured emissions from associated FE demand [GtC / a]"
v33_co2emi_non_atm(ttot,all_regi,all_te) "captured CO2 from CDR-related acitivites that does not come from the atmosphere [GtC / a]"
v33_co2emi_non_atm(ttot,all_regi,all_te) "CO2 from CDR-related acitivites that does not come from the atmosphere [GtC / a]"
;

negative variables
Expand Down
4 changes: 2 additions & 2 deletions modules/33_CDR/portfolio/sets.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ te_all33(all_te) "all CDR technologies"
/
weathering "enhanced weathering"
dac "direct air capture"
oae_ng "ocean akalinity ehnacement via ocean liming using a traditional calciner"
oae_el "ocean akalinity ehnacement via ocean liming using a novel calciner technology"
oae_ng "ocean akalinity ehnacement via ocean liming using a traditional calciner"
oae_el "ocean akalinity ehnacement via ocean liming using a novel calciner technology"
/

te_used33(all_te) "used CDR technologies (specified by switches)"
Expand Down
122 changes: 10 additions & 112 deletions scripts/start/prepare.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ prepare <- function() {
#require(lucode, quietly = TRUE,warn.conflicts =FALSE)
require(magclass, quietly = TRUE,warn.conflicts =FALSE)
require(tools, quietly = TRUE,warn.conflicts =FALSE)
devtools::load_all("/p/tmp/katarkow/remind2/ng-el-OAE")
# require(remind2)
require(remind2)
require(mrremind)
require(mrvalidation)

Expand Down Expand Up @@ -435,119 +434,18 @@ prepare <- function() {
}

#KK CDR module realizations
levs_manipulateThis <- c(levs_manipulateThis,
list(c("rockgrind", "weathering")), list(c("grindrock", "weathering")),
list(c("\"oae\"", "\"oae_ng\"")))
fixings_manipulateThis <- c(fixings_manipulateThis,
list(c("rockgrind", "weathering")), list(c("grindrock", "weathering")),
list(c("\"oae\"", "\"oae_ng\"")))
margs_manipulateThis <- c(margs_manipulateThis,
list(c("rockgrind", "weathering")), list(c("grindrock", "weathering")),
list(c("\"oae\"", "\"oae_ng\"")))

if(cfg$gms$CDR == 'DAC'){
fixings_manipulateThis <- c(fixings_manipulateThis,
list(c("v33_emiEW.FX", "!!v33_emiEW.FX")),
list(c("v33_weathering_onfield.FX", "!!v33_grindrock_onfield.FX")),
list(c("v33_weathering_onfield_tot.FX", "!!v33_grindrock_onfield_tot.FX")))
list(c("vm_ccs_cdr.FX", "vm_co2capture_cdr.FX")),
list(c("v33_emi.FX", "vm_emiCdrTeDetail.FX")))

levs_manipulateThis <- c(levs_manipulateThis,
list(c("v33_emiEW.L", "!!v33_emiEW.L")),
list(c("v33_weathering_onfield.L", "!!v33_grindrock_onfield.L")),
list(c("v33_weathering_onfield_tot.L", "!!v33_grindrock_onfield_tot.L")))

margs_manipulateThis <- c(margs_manipulateThis,
list(c("v33_emiEW.M", "!!v33_emiEW.M")),
list(c("v33_weathering_onfield.M", "!!v33_grindrock_onfield.M")),
list(c("v33_weathering_onfield_tot.M", "!!v33_grindrock_onfield_tot.M")),
list(c("q33_capconst_weathering.M", "!!q33_capconst_grindrock.M")),
list(c("q33_weathering_onfield_tot.M", "!!q33_grindrock_onfield_tot.M")),
list(c("q33_omcosts.M", "!!q33_omcosts.M")),
list(c("q33_potential.M", "!!q33_potential.M")),
list(c("q33_emiEW.M", "!!q33_emiEW.M")),
list(c("q33_LimEmiEW.M", "!!q33_LimEmiEW.M")))
}

if(cfg$gms$CDR == 'weathering'){
fixings_manipulateThis <- c(fixings_manipulateThis,
list(c("v33_emiDAC.FX", "!!v33_emiDAC.FX")),
list(c("v33_DacFEdemand_el.FX", "!!v33_DacFEdemand_el.FX")),
list(c("v33_DacFEdemand_heat.FX", "!!v33_DacFEdemand_heat.FX")))

levs_manipulateThis <- c(levs_manipulateThis,
list(c("v33_emiDAC.L", "!!v33_emiDAC.L")),
list(c("v33_DacFEdemand_el.L", "!!v33_DacFEdemand_el.L")),
list(c("v33_DacFEdemand_heat.L", "!!v33_DacFEdemand_heat.L")))

margs_manipulateThis <- c(margs_manipulateThis,
list(c("v33_emiDAC.M", "!!v33_emiDAC.")),
list(c("v33_DacFEdemand_el.M", "!!v33_DacFEdemand_el.M")),
list(c("v33_DacFEdemand_heat.M", "!!v33_DacFEdemand_heat.M")),
list(c("q33_DacFEdemand_heat.M", "!!q33_DacFEdemand_heat.M")),
list(c("q33_DacFEdemand_el.M", "!!q33_DacFEdemand_el.M")),
list(c("q33_capconst_dac.M", "!!q33_capconst_dac.M")),
list(c("q33_ccsbal.M", "!!q33_ccsbal.M")),
list(c("q33_H2bio_lim.M", "!!q33_H2bio_lim.M")))
}

if(cfg$gms$CDR == 'off' || cfg$gms$CDR == 'portfolio'){
fixings_manipulateThis <- c(fixings_manipulateThis,
list(c("v33_emiDAC.FX", "!!v33_emiDAC.FX")),
list(c("v33_emiEW.FX", "!!v33_emiEW.FX")),
list(c("v33_DacFEdemand_el.FX", "!!v33_DacFEdemand_el.FX")),
list(c("v33_DacFEdemand_heat.FX", "!!v33_DacFEdemand_heat.FX")),
list(c("v33_weathering_onfield.FX", "!!v33_grindrock_onfield.FX")),
list(c("v33_weathering_onfield_tot.FX", "!!v33_grindrock_onfield_tot.FX")))

levs_manipulateThis <- c(levs_manipulateThis,
list(c("v33_emiDAC.L", "!!v33_emiDAC.L")),
list(c("v33_emiEW.L", "!!v33_emiEW.L")),
list(c("v33_DacFEdemand_el.L", "!!v33_DacFEdemand_el.L")),
list(c("v33_DacFEdemand_heat.L", "!!v33_DacFEdemand_heat.L")),
list(c("v33_weathering_onfield.L", "!!v33_grindrock_onfield.L")),
list(c("v33_weathering_onfield_tot.L", "!!v33_grindrock_onfield_tot.L")))

margs_manipulateThis <- c(margs_manipulateThis,
list(c("v33_emiDAC.M", "!!v33_emiDAC.M")),
list(c("v33_emiEW.M", "!!v33_emiEW.M")),
list(c("v33_weathering_onfield.M", "!!v33_grindrock_onfield.M")),
list(c("v33_weathering_onfield_tot.M", "!!v33_grindrock_onfield_tot.M")),
list(c("v33_DacFEdemand_el.M", "!!v33_DacFEdemand_el.M")),
list(c("v33_DacFEdemand_heat.M", "!!v33_DacFEdemand_heat.M")),
list(c("q33_capconst_weathering.M", "!!q33_capconst_grindrock.M")),
list(c("q33_weathering_onfield_tot.M", "!!q33_grindrock_onfield_tot.M")),
list(c("q33_omcosts.M", "!!q33_omcosts.M")),
list(c("q33_potential.M", "!!q33_potential.M")),
list(c("q33_emiEW.M", "!!q33_emiEW.M")),
list(c("q33_LimEmiEW.M", "!!q33_LimEmiEW.M")),
list(c("q33_DacFEdemand_heat.M", "!!q33_DacFEdemand_heat.M")),
list(c("q33_DacFEdemand_el.M", "!!q33_DacFEdemand_el.M")),
list(c("q33_capconst_dac.M", "!!q33_capconst_dac.M")),
list(c("q33_DAC_capconst.M", "!!q33_DAC_capconst.M")),
list(c("q33_DAC_ccsbal.M", "!!q33_DAC_ccsbal.M")),
list(c("q33_ccsbal.M", "!!q33_ccsbal.M")),
list(c("q33_H2bio_lim.M", "!!q33_H2bio_lim.M")),
list(c("q33_OAE_FEdemand.M", "!!q33_OAE_FEdemand.M")),
list(c("q33_demFeCDR.M", "!!q33_demFeCDR.M")),
list(c("q33_emicdrregi.M", "!!q33_emicdrregi.M")),
list(c("q33_otherFEdemand.M", "!!q33_otherFEdemand.M")))
}

if(cfg$gms$CDR == 'portfolio'){
fixings_manipulateThis <- c(fixings_manipulateThis,
list(c("vm_ccs_cdr.FX", "vm_co2capture_cdr.FX")),
list(c("vm_otherFEdemand.FX", "!!vm_otherFEdemand.FX")),
list(c("v33_emi.FX", "vm_emiCdrTeDetail.FX")))

levs_manipulateThis <- c(levs_manipulateThis,
list(c("vm_ccs_cdr.L", "vm_co2capture_cdr.L")),
list(c("vm_otherFEdemand.L", "!!vm_otherFEdemand.L")),
list(c("v33_emi.L", "vm_emiCdrTeDetail.L")))
levs_manipulateThis <- c(levs_manipulateThis,
list(c("vm_ccs_cdr.L", "vm_co2capture_cdr.L")),
list(c("v33_emi.L", "vm_emiCdrTeDetail.L")))

margs_manipulateThis <- c(margs_manipulateThis,
list(c("vm_ccs_cdr.M", "vm_co2capture_cdr.M")),
list(c("vm_otherFEdemand.M", "!!vm_otherFEdemand.M")),
list(c("q33_DAC_capconst.M", "q33_DAC_emi.M")))
margs_manipulateThis <- c(margs_manipulateThis,
list(c("vm_ccs_cdr.M", "vm_co2capture_cdr.M")),
list(c("q33_DAC_ccsbal.M", "!!q33_DAC_ccsbal.M")),
list(c("q33_DAC_emi.M", "!!q33_DAC_emi.M")))
}

# end of CDR module realizations
Expand Down

0 comments on commit 434cc89

Please sign in to comment.