remove no longer needed functions

pik-piam · Jan 7, 2025 · 25fb242 · 25fb242
1 parent 2220b0b
commit 25fb242
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 77 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '40962870'
+ValidationKey: '41013895'
 AcceptedWarnings:
 - Invalid URL: .*
 - 'Warning: package ''.*'' was built under R version'
@@ -10,3 +10,4 @@ AutocreateReadme: yes
 allowLinterWarnings: yes
 enforceVersionUpdate: yes
 skipCoverage: yes
+AutocreateCITATION: yes
diff --git a/CITATION.cff b/CITATION.cff
@@ -3,7 +3,7 @@ message: If you use this software, please cite it using the metadata from this f
 type: software
 title: 'mrremind: MadRat REMIND Input Data Package'
 version: 0.204.1
-date-released: '2024-12-13'
+date-released: '2025-01-07'
 abstract: The mrremind packages contains data preprocessing for the REMIND model.
 authors:
 - family-names: Baumstark

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Type: Package
 Package: mrremind
 Title: MadRat REMIND Input Data Package
 Version: 0.204.1
-Date: 2024-12-13
+Date: 2025-01-07
 Authors@R: c(
     person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
     person("Renato", "Rodrigues", role = "aut"),

diff --git a/R/convertREMIND_11Regi.R b/R/convertREMIND_11Regi.R
@@ -13,7 +13,7 @@
 convertREMIND_11Regi <- function(x,subtype) {
 
   if(subtype == "p4" | subtype == "biomass" | subtype == "tradecost" |
-     subtype == "pe2se" | subtype == "xpres_tax" | subtype == "storageFactor" | subtype == "shareIndFE"  |
+     subtype == "pe2se" | subtype == "xpres_tax" | subtype == "storageFactor" |
      subtype == "residuesShare" | subtype=="ffPolyRent" | subtype == "earlyRetirementAdjFactor" ){
     # No weighting for spatial aggregation
     y <- toolAggregate(x, "regionmappingREMIND.csv", weight=NULL)

diff --git a/R/convertnonEnergyDemand.R b/R/convertnonEnergyDemand.R
diff --git a/R/fullREMIND.R b/R/fullREMIND.R
@@ -116,8 +116,6 @@ fullREMIND <- function() {
   calcOutput("IO",   subtype = "output",              round = 8,  file = "f04_IO_output.cs4r")
   calcOutput("IO",   subtype = "input",               round = 8,  file = "f04_IO_input.cs4r")
   calcOutput("IO",   subtype = "trade",               round = 8,  file = "f_IO_trade.cs4r")
-  calcOutput("ShareIndFE",                            round = 3,  file = "p37_shIndFE.cs3r")
-  calcOutput("nonEnergyIndFE",                        round = 8,  file = "f37_fedemand_NonEnergyIndst.cs4r")
   calcOutput("Clinker_to_cement_ratio",               round = 2,  file = "p37_clinker-to-cement-ratio.cs3r")
   # delete the 'dummy' line
   system(paste0('sed -i "/dummy/d" ', getConfig()$outputfolder, "/p37_clinker-to-cement-ratio.cs3r"))
@@ -130,7 +128,7 @@ fullREMIND <- function() {
   calcOutput("GridFactor",                                             round = 6,  file = "p32_grid_factor.cs4r")
   calcOutput("FEShares", subtype = "ind_coal",                         round = 5,  file = "p_share_ind_fesos.cs4r")
   calcOutput("FEShares", subtype = "ind_bio",                          round = 5,  file = "p_share_ind_fesos_bio.cs4r")
-  calcOutput("FEShares", subtype = "ind_liq",                          round = 5,  file = "p_share_ind_fehos.cs4r")
+  calcOutput("FEShares", subtype = "ind_liq",                          round = 5,  file = "p11_share_ind_fehos.cs4r")
   calcOutput("Solar",                                                  round = 5,  file = "f_dataRegiSolar.cs3r")
   calcOutput("CapacityNuclear",                                        round = 5,  file = "pm_NuclearConstraint.cs4r")
   calcOutput("CCScapacity", subtype = "pipeline",                      round = 8,  file = "p_boundCapCCS.cs4r")

diff --git a/R/readREMIND_11Regi.R b/R/readREMIND_11Regi.R
@@ -34,7 +34,6 @@ readREMIND_11Regi <- function(subtype) {
     "capacityFactorRules"  = read.csv("f_cf-rules_v1.1.csv", sep = ";")          %>% as.magpie(datacol = 4),
     "storageFactor"        = read.csv("storageFactor.csv", sep = ";")            %>% as.magpie(datacol = 2),
     "residuesShare"        = read.csv("residuesShare.csv", row.names = 1)        %>% as.magpie(datacol = 4),
-    "shareIndFE"           = read.csv("shareIndustyFE.csv", sep = ";", skip = 3) %>% as.magpie(datacol = 3),
     "taxConvergence"       = read.csv("tax_convergence.csv", sep = ";")          %>% as.magpie(datacol = 4),
     "maxFeSubsidy"         = read.csv("max_FE_subsidy.csv", sep = ";")           %>% as.magpie(datacol = 4),
     "maxPeSubsidy"         = read.csv("max_PE_subsidy.csv", sep = ";")           %>% as.magpie(datacol = 4),

diff --git a/README.md b/README.md
@@ -39,16 +39,17 @@ In case of questions / problems please contact Lavinia Baumstark <lavinia@pik-po
 
 To cite package **mrremind** in publications use:
 
-Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.204.1, <https://github.com/pik-piam/mrremind>.
+Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2025). "mrremind: MadRat REMIND Input Data Package." Version: 0.204.1, <https://github.com/pik-piam/mrremind>.
 
 A BibTeX entry for LaTeX users is
 
  ```latex
-@Manual{,
+@Misc{,
   title = {mrremind: MadRat REMIND Input Data Package},
   author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux and Johannes Koch},
-  year = {2024},
-  note = {R package version 0.204.1},
+  date = {2025-01-07},
+  year = {2025},
   url = {https://github.com/pik-piam/mrremind},
+  note = {Version: 0.204.1},
 }
 ```
diff --git a/man/calcFEdemand.Rd b/man/calcFEdemand.Rd
diff --git a/man/calcFeDemandTransport.Rd b/man/calcFeDemandTransport.Rd
diff --git a/man/convertnonEnergyDemand.Rd b/man/convertnonEnergyDemand.Rd
diff --git a/mrremind.Rproj b/mrremind.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: c3a83718-86c1-4aa9-b88e-3082df97bf0b
 
 RestoreWorkspace: No
 SaveWorkspace: No