Skip to content

Commit

Permalink
remove tool_fix_IEA_data_for_Industry_subsectors
Browse files Browse the repository at this point in the history
  • Loading branch information
fbenke-pik committed Nov 4, 2024
1 parent bdf2841 commit 794b71d
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 748 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '39260760'
ValidationKey: '39461070'
AcceptedWarnings:
- Invalid URL: .*
- 'Warning: package ''.*'' was built under R version'
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cff-version: 1.2.0
message: If you use this software, please cite it using the metadata from this file.
type: software
title: 'mrremind: MadRat REMIND Input Data Package'
version: 0.196.0
version: 0.197.0
date-released: '2024-11-04'
abstract: The mrremind packages contains data preprocessing for the REMIND model.
authors:
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: mrremind
Title: MadRat REMIND Input Data Package
Version: 0.196.0
Version: 0.197.0
Date: 2024-11-04
Authors@R: c(
person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
Expand Down Expand Up @@ -53,7 +53,7 @@ Imports:
magrittr,
mrcommons (>= 1.44.12),
mrdrivers (>= 2.0.0),
mrindustry (>= 0.3.0),
mrindustry (>= 0.4.0),
nnls,
purrr,
quitte (>= 0.3105.0),
Expand Down
13 changes: 0 additions & 13 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ export(toolFillEU34Countries)
export(toolSolarFunctionAggregate)
import(madrat)
import(magclass)
importFrom(assertr,assert)
importFrom(assertr,not_na)
importFrom(assertr,verify)
importFrom(data.table,":=")
importFrom(data.table,data.table)
Expand All @@ -69,7 +67,6 @@ importFrom(dplyr,everything)
importFrom(dplyr,filter)
importFrom(dplyr,full_join)
importFrom(dplyr,group_by)
importFrom(dplyr,inner_join)
importFrom(dplyr,lag)
importFrom(dplyr,left_join)
importFrom(dplyr,matches)
Expand All @@ -81,9 +78,7 @@ importFrom(dplyr,recode)
importFrom(dplyr,relocate)
importFrom(dplyr,rename)
importFrom(dplyr,rename_all)
importFrom(dplyr,right_join)
importFrom(dplyr,select)
importFrom(dplyr,semi_join)
importFrom(dplyr,starts_with)
importFrom(dplyr,summarise)
importFrom(dplyr,summarize)
Expand All @@ -97,19 +92,11 @@ importFrom(quitte,add_countrycode_)
importFrom(quitte,as.quitte)
importFrom(quitte,calc_addVariable)
importFrom(quitte,cartesian)
importFrom(quitte,character.data.frame)
importFrom(quitte,inline.data.frame)
importFrom(quitte,interpolate_missing_periods)
importFrom(quitte,interpolate_missing_periods_)
importFrom(quitte,madrat_mule)
importFrom(quitte,overwrite)
importFrom(quitte,removeColNa)
importFrom(quitte,sum_total_)
importFrom(readr,col_character)
importFrom(readr,col_skip)
importFrom(readr,cols)
importFrom(readr,read_csv)
importFrom(readr,read_delim)
importFrom(readxl,excel_sheets)
importFrom(readxl,read_excel)
importFrom(readxl,read_xlsx)
Expand Down
2 changes: 1 addition & 1 deletion R/calcIO.R
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ calcIO <- function(subtype = c("input", "output", "output_biomass", "trade",
if (subtype == "output_Industry_subsectors") {
# apply corrections to IEA data to cope with fragmentary time series
names_data_before <- getNames(data)
data <- tool_fix_IEA_data_for_Industry_subsectors(data, ieamatch,
data <- mrindustry::tool_fix_IEA_data_for_Industry_subsectors(data, ieamatch,
threshold = 1e-2)
# warn if dimensions not present in the mapping have been added to the data
new_product_flows <- tibble(
Expand Down
Loading

0 comments on commit 794b71d

Please sign in to comment.