Merge branch 'dev_co2price' into gcam-v7.0

.github/workflows/build.yaml

@@ -5,6 +5,7 @@ on:
     branches:
       - gcam-v7.0
       - dev
+      - dev_co2price
 
 jobs:
   R-CMD:

.gitignore

@@ -53,3 +53,59 @@ tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.0_test_specify_queri
 tests/testthat/testInputs/v_7.0/gcamv7.0_test_specify_queries_standardized.csv
 tests/testthat/testInputs/v_7.0/gcamv7.0_test_specify_queries_standardized.RData
 tests/testthat/testInputs/v_7.0/gcamv7.0_test_specify_queries_standardized.xlsx
+debug.R
+tests/testthat/testInputs/v_7.0/database_basexdb_CO2price_test_standardized.csv
+tests/testthat/testInputs/v_7.0/database_basexdb_CO2price_test_standardized.RData
+tests/testthat/testInputs/v_7.0/database_basexdb_CO2price_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/database_basexdb_policy_standardized.csv
+tests/testthat/testInputs/v_7.0/database_basexdb_policy_standardized.RData
+tests/testthat/testInputs/v_7.0/database_basexdb_policy_standardized.xlsx
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.10.1_test.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.10.2_test.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.10.3_test.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.11.3_test_scenarios.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.11.6_test_scenarios.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.11.7_test_scenarios.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.1_test.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.2_test.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.3_test.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_ref_gcamv7.4_test.dat
+tests/testthat/testInputs/v_7.0/database_basexdb_test_scenarios7_standardized.csv
+tests/testthat/testInputs/v_7.0/database_basexdb_test_scenarios7_standardized.RData
+tests/testthat/testInputs/v_7.0/database_basexdb_test_scenarios7_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.10.1_test_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.10.1_test_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.10.1_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.10.2_test_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.10.2_test_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.10.2_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.10.3_test_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.10.3_test_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.10.3_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.11.3_test_scenarios_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.11.3_test_scenarios_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.11.3_test_scenarios_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.11.6_test_scenarios_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.11.6_test_scenarios_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.11.6_test_scenarios_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.11.7_test_scenarios_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.11.7_test_scenarios_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.11.7_test_scenarios_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.1_test_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.1_test_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.1_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.2_test_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.2_test_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.2_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.3_test_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.3_test_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.3_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/gcamv7.4_test_standardized.csv
+tests/testthat/testInputs/v_7.0/gcamv7.4_test_standardized.RData
+tests/testthat/testInputs/v_7.0/gcamv7.4_test_standardized.xlsx
+tests/testthat/testInputs/v_7.0/test7_standardized.csv
+tests/testthat/testInputs/v_7.0/test7_standardized.RData
+tests/testthat/testInputs/v_7.0/test7_standardized.xlsx
+tests/testthat/testOutputs/v_7.0/test7_output.csv
+tests/testthat/testOutputs/v_7.0/test7_output.RData
+tests/testthat/testOutputs/v_7.0/test7_output.xlsx

NAMESPACE

@@ -33,7 +33,6 @@ export(get_cf_iea_tmp)
 export(get_co2)
 export(get_co2_concentration)
 export(get_co2_emissions)
-export(get_co2_ets)
 export(get_co2_iron_steel)
 export(get_co2_price)
 export(get_co2_price_fragmented_tmp)
@@ -69,6 +68,9 @@ export(get_ghg_sector)
 export(get_gov_revenue)
 export(get_gov_revenue_sector)
 export(get_industry_production)
+export(get_iron_steel_clean)
+export(get_iron_steel_exports)
+export(get_iron_steel_imports)
 export(get_iron_steel_map)
 export(get_land)
 export(get_lu_co2)
@@ -132,6 +134,7 @@ importFrom(stats,complete.cases)
 importFrom(stringr,str_extract)
 importFrom(stringr,str_locate)
 importFrom(stringr,str_replace)
+importFrom(stringr,str_replace_all)
 importFrom(stringr,str_sub)
 importFrom(tibble,as_tibble)
 importFrom(tibble,tibble)

R/data.R

@@ -108,18 +108,6 @@
 #' }
 "co2_sector_map"
 
-#' co2_ets_sector_map
-#'
-#' @source github
-#' @format .csv
-#' @description emissions maps
-#' @examples
-#' \dontrun{
-#' library(gcamreport)
-#' gcamreport::co2_ets_sector_map
-#' }
-"co2_ets_sector_map"
-
 #' co2_tech_map
 #'
 #' @source github
@@ -444,6 +432,18 @@
 #' }
 "co2_market_frag_map"
 
+#' iron_steel_trade_map
+#'
+#' @source github
+#' @format .csv
+#' @description iron steel imports and exports map
+#' @examples
+#' \dontrun{
+#' library(gcamreport)
+#' gcamreport::iron_steel_trade_map
+#' }
+"iron_steel_trade_map"
+
 #' convert
 #'
 #' @description units conversion list