Skip to content

Commit

Permalink
Merge pull request #581 from JakobBD/delete_industry
Browse files Browse the repository at this point in the history
remove files that are moved to the industry package
  • Loading branch information
fbenke-pik authored Nov 4, 2024
2 parents 252efed + 8bbb1a9 commit bdf2841
Show file tree
Hide file tree
Showing 71 changed files with 21 additions and 8,251 deletions.
4 changes: 3 additions & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
ValidationKey: '38858820'
ValidationKey: '39260760'
AcceptedWarnings:
- Invalid URL: .*
- 'Warning: package ''.*'' was built under R version'
AcceptedNotes:
- Imports includes .* non-default packages.
- All declared Imports should be used.
- unable to verify current time
AutocreateReadme: yes
allowLinterWarnings: yes
enforceVersionUpdate: yes
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ 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.194.1
date-released: '2024-10-24'
version: 0.196.0
date-released: '2024-11-04'
abstract: The mrremind packages contains data preprocessing for the REMIND model.
authors:
- family-names: Baumstark
Expand Down
9 changes: 3 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: mrremind
Title: MadRat REMIND Input Data Package
Version: 0.194.1
Date: 2024-10-24
Version: 0.196.0
Date: 2024-11-04
Authors@R: c(
person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")),
person("Renato", "Rodrigues", role = "aut"),
Expand Down Expand Up @@ -41,26 +41,23 @@ Depends:
R (>= 2.10.0)
Imports:
assertr,
broom,
car,
countrycode,
data.table,
dplyr,
edgeTransport (>= 1.5.5),
GDPuc (>= 1.3.0),
ggplot2,
Hmisc,
luscale,
madrat (>= 3.7.1),
magclass (>= 6.16.1),
magrittr,
mrcommons (>= 1.44.12),
mrdrivers (>= 2.0.0),
mrindustry (>= 0.3.0),
nnls,
purrr,
quitte (>= 0.3105.0),
R.utils,
readODS,
readr,
readxl,
reshape2,
Expand Down
82 changes: 0 additions & 82 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,31 @@
export(calcAGEB)
export(calcBP)
export(calcCCScapacity)
export(calcCement)
export(calcCementShare)
export(calcChemicalFeedstocksShare)
export(calcClinker_to_cement_ratio)
export(calcEDGAR7Fgases)
export(calcEEAGHGProjections)
export(calcEmber)
export(calcEmissionFactorsFeedstocks)
export(calcExpertGuess)
export(calcFloorspace)
export(calcGlobalEnergyMonitor)
export(calcHRE)
export(calcIEA_ETP)
export(calcIEA_EVOutlook)
export(calcIEA_WorldEnergyOutlook)
export(calcIndustry_CCS_limits)
export(calcIndustry_EEK)
export(calcIndustry_Value_Added)
export(calcODYM_RECC)
export(calcOtherFossilInElectricity)
export(calcPlasticsEoL)
export(calcProjectPipelines)
export(calcShareIndFE)
export(calcSteelStock)
export(calcSteel_Projections)
export(calcUBA)
export(calcUNFCCC)
export(calcUNIDO)
export(calcindustry_max_secondary_steel_share)
export(calcindustry_specific_FE_limits)
export(calcindustry_subsectors_specific)
export(convertADVANCE_WP2)
export(convertAGEB)
export(convertEDGAR7Fgases)
export(convertEmber)
export(convertGlobalCCSinstitute)
export(convertGlobalEnergyMonitor)
export(convertHRE)
export(convertIEA_CCUS)
export(convertMueller)
export(convertUBA)
export(convertUNFCCC)
export(convertUNIDO)
export(convertUSGS)
export(fullTHRESHOLDS)
export(readADVANCE_WP2)
export(readAGEB)
export(readAR6GWP)
export(readEDGAR7Fgases)
Expand All @@ -60,31 +39,19 @@ export(readIAEA_PRIS)
export(readIEA_CCUS)
export(readIEA_HSMR)
export(readIEA_WEIO_2014)
export(readMueller)
export(readODYM_RECC)
export(readPauliuk)
export(readUBA)
export(readUNFCCC)
export(readUNIDO)
export(readUSGS)
export(readindustry_subsectors_specific)
export(readvanRuijven2016)
export(readworldsteel)
export(toolAggregateTimeSteps)
export(toolBiomassSupplyAggregate)
export(toolCubicFunctionAggregate)
export(toolCubicFunctionDisaggregate)
export(toolFillEU34Countries)
export(toolSolarFunctionAggregate)
export(tool_expand_tibble)
import(madrat)
import(magclass)
importFrom(GDPuc,convertGDP)
importFrom(assertr,assert)
importFrom(assertr,in_set)
importFrom(assertr,not_na)
importFrom(assertr,verify)
importFrom(assertr,within_bounds)
importFrom(data.table,":=")
importFrom(data.table,data.table)
importFrom(data.table,rbindlist)
Expand All @@ -94,22 +61,16 @@ importFrom(data.table,setnames)
importFrom(dplyr,across)
importFrom(dplyr,anti_join)
importFrom(dplyr,arrange)
importFrom(dplyr,as_tibble)
importFrom(dplyr,between)
importFrom(dplyr,bind_cols)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,desc)
importFrom(dplyr,distinct)
importFrom(dplyr,everything)
importFrom(dplyr,filter)
importFrom(dplyr,first)
importFrom(dplyr,full_join)
importFrom(dplyr,group_by)
importFrom(dplyr,inner_join)
importFrom(dplyr,lag)
importFrom(dplyr,last)
importFrom(dplyr,lead)
importFrom(dplyr,left_join)
importFrom(dplyr,matches)
importFrom(dplyr,min_rank)
Expand All @@ -121,35 +82,13 @@ importFrom(dplyr,relocate)
importFrom(dplyr,rename)
importFrom(dplyr,rename_all)
importFrom(dplyr,right_join)
importFrom(dplyr,row_number)
importFrom(dplyr,select)
importFrom(dplyr,semi_join)
importFrom(dplyr,starts_with)
importFrom(dplyr,summarise)
importFrom(dplyr,summarize)
importFrom(dplyr,tibble)
importFrom(dplyr,tribble)
importFrom(dplyr,ungroup)
importFrom(dplyr,vars)
importFrom(ggplot2,aes)
importFrom(ggplot2,coord_cartesian)
importFrom(ggplot2,expand_limits)
importFrom(ggplot2,facet_wrap)
importFrom(ggplot2,geom_area)
importFrom(ggplot2,geom_line)
importFrom(ggplot2,geom_path)
importFrom(ggplot2,geom_point)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,ggsave)
importFrom(ggplot2,guide_legend)
importFrom(ggplot2,labs)
importFrom(ggplot2,scale_colour_manual)
importFrom(ggplot2,scale_fill_discrete)
importFrom(ggplot2,scale_fill_manual)
importFrom(ggplot2,scale_linetype_manual)
importFrom(ggplot2,scale_shape_manual)
importFrom(ggplot2,theme)
importFrom(ggplot2,theme_minimal)
importFrom(madrat,madratAttach)
importFrom(madrat,toolAggregate)
importFrom(magclass,matchDim)
Expand All @@ -159,69 +98,51 @@ importFrom(quitte,as.quitte)
importFrom(quitte,calc_addVariable)
importFrom(quitte,cartesian)
importFrom(quitte,character.data.frame)
importFrom(quitte,df_populate_range)
importFrom(quitte,duplicate)
importFrom(quitte,inline.data.frame)
importFrom(quitte,interpolate_missing_periods)
importFrom(quitte,interpolate_missing_periods_)
importFrom(quitte,list_to_data_frame)
importFrom(quitte,madrat_mule)
importFrom(quitte,magclass_to_tibble)
importFrom(quitte,order.levels)
importFrom(quitte,overwrite)
importFrom(quitte,removeColNa)
importFrom(quitte,seq_range)
importFrom(quitte,sum_total_)
importFrom(readr,col_character)
importFrom(readr,col_skip)
importFrom(readr,cols)
importFrom(readr,read_csv)
importFrom(readr,read_delim)
importFrom(readr,read_rds)
importFrom(readr,write_rds)
importFrom(readxl,excel_sheets)
importFrom(readxl,read_excel)
importFrom(readxl,read_xlsx)
importFrom(rlang,"!!!")
importFrom(rlang,"!!")
importFrom(rlang,.data)
importFrom(rlang,.env)
importFrom(rlang,is_empty)
importFrom(rlang,sym)
importFrom(rlang,syms)
importFrom(stats,SSlogis)
importFrom(stats,aggregate)
importFrom(stats,coef)
importFrom(stats,complete.cases)
importFrom(stats,lm)
importFrom(stats,na.exclude)
importFrom(stats,na.omit)
importFrom(stats,na.pass)
importFrom(stats,nls)
importFrom(stats,sd)
importFrom(stats,weighted.mean)
importFrom(tibble,as_tibble)
importFrom(tibble,tibble)
importFrom(tibble,tribble)
importFrom(tidyr,complete)
importFrom(tidyr,crossing)
importFrom(tidyr,drop_na)
importFrom(tidyr,everything)
importFrom(tidyr,expand_grid)
importFrom(tidyr,extract)
importFrom(tidyr,fill)
importFrom(tidyr,gather)
importFrom(tidyr,nest)
importFrom(tidyr,nesting)
importFrom(tidyr,pivot_longer)
importFrom(tidyr,pivot_wider)
importFrom(tidyr,replace_na)
importFrom(tidyr,separate)
importFrom(tidyr,spread)
importFrom(tidyr,unite)
importFrom(tidyr,unnest)
importFrom(tidyselect,all_of)
importFrom(tidyselect,everything)
importFrom(utils,download.file)
importFrom(utils,head)
importFrom(utils,packageVersion)
Expand All @@ -230,6 +151,3 @@ importFrom(utils,read.csv2)
importFrom(utils,read.table)
importFrom(utils,tail)
importFrom(utils,unzip)
importFrom(zoo,na.approx)
importFrom(zoo,na.fill)
importFrom(zoo,rollmean)
Loading

0 comments on commit bdf2841

Please sign in to comment.