Merge pull request #1486 from katarkow/migrate_EW_data_to_mrremind

Move enhanced weathering data to mrremind
remindmodel · Dec 12, 2023 · 01b0dec · 01b0dec
2 parents 5720c47 + b887135
commit 01b0dec
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 248 deletions.
diff --git a/config/default.cfg b/config/default.cfg
@@ -27,7 +27,7 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
 ### Additional (optional) region mapping, so that those validation data can be loaded that contain the corresponding additional regions.
 cfg$extramappings_historic <- ""
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$inputRevision <- "6.606"
+cfg$inputRevision <- "6.607"
 
 #### Current CES parameter and GDX revision (commit hash) ####
 cfg$CESandGDXversion <- "878ac5d69254efb4eba5c1fa39aba64000307bb1"

diff --git a/modules/33_CDR/portfolio/datainput.gms b/modules/33_CDR/portfolio/datainput.gms
@@ -17,9 +17,16 @@ $ondelim
 $include "./modules/33_CDR/portfolio/input/f33_maxProdGradeRegiWeathering.cs3r"
 $offdelim
 ;
-!! display f33_maxProdGradeRegiWeathering;
-!! $include "./modules/33_CDR/portfolio/input/p33_transport_costs.inc"
-p33_transport_costs(regi, rlf, rlf) = 0.05; !! KK a temporary fix before p33_transport_costs are moved to mrremind
+display f33_maxProdGradeRegiWeathering;
+
+parameter p33_EW_transport_costs(all_regi,rlf,rlf)    "transport costs [T$/Gt stone]"
+/
+$ondelim
+$include "./modules/33_CDR/portfolio/input/p33_transportCostsWeathering.cs4r"
+$offdelim
+/
+;
+display p33_EW_transport_costs;
 
 s33_step = 2.5;
 *** fix costs [T$/Gt stone]. Data from strefler et al. in $/t stone: mining, crushing, grinding (5.0 investment costs, 25.1 O&M costs), spreading (12.1 O&M costs)

diff --git a/modules/33_CDR/portfolio/declarations.gms b/modules/33_CDR/portfolio/declarations.gms
@@ -16,7 +16,6 @@ s33_step                    "size of bins in v33_weathering_onfield [Gt stone]"
 parameters
 p33_fedem(all_te,all_enty)               "final energy demand of each technology [EJ/GtC] (for EW the unit is [EJ/Gt stone])"
 p33_LimRock(all_regi)                    "regional share of EW limit [fraction], calculated ex ante for a maximal annual amount of 8 Gt rock in D:\projects\CEMICS\paper_technical\supply_curve_transport_remind_regions.m"
-p33_transport_costs(all_regi,rlf,rlf)    "transport costs [T$/Gt stone]"
 p33_co2_rem_rate(rlf)                    "carbon removal rate [fraction of annual reduction of total carbon removal potential], multiplied with grade factor"
 ;
 

diff --git a/modules/33_CDR/portfolio/equations.gms b/modules/33_CDR/portfolio/equations.gms
@@ -142,7 +142,7 @@ q33_EW_omcosts(t,regi)..
     vm_omcosts_cdr(t,regi)
     =e=
     sum((rlf_cz33, rlf),
-        (s33_costs_fix + p33_transport_costs(regi,rlf_cz33,rlf)) * v33_EW_onfield(t,regi,rlf_cz33,rlf)
+        (s33_costs_fix + p33_EW_transport_costs(regi,rlf_cz33,rlf)) * v33_EW_onfield(t,regi,rlf_cz33,rlf)
     )
     ;
 

diff --git a/modules/33_CDR/portfolio/input/files b/modules/33_CDR/portfolio/input/files
@@ -1 +1,2 @@
 f33_maxProdGradeRegiWeathering.cs3r
+p33_transportCostsWeathering.cs4r
diff --git a/modules/33_CDR/portfolio/input/p33_transport_costs.inc b/modules/33_CDR/portfolio/input/p33_transport_costs.inc