Merge branch 'dev_newstructure' into dev

bc3LC · Jul 30, 2024 · 87a0661 · 87a0661
2 parents 6dfce92 + f0c3ee7
commit 87a0661
Show file tree

Hide file tree

Showing 219 changed files with 10,748 additions and 9,905 deletions.
diff --git a/R/data.R b/R/data.R
diff --git a/R/functions.R b/R/functions.R
diff --git a/data/CO2_equivalent.rda b/data/CO2_equivalent.rda
diff --git a/data/CO2_market_v7.0.rda b/data/CO2_market_v7.0.rda
diff --git a/data/GCAM_years.rda b/data/GCAM_years.rda
diff --git a/data/GCAM_years_v7.0.rda b/data/GCAM_years_v7.0.rda
diff --git a/data/GWP_adjuster_v7.0.rda b/data/GWP_adjuster_v7.0.rda
diff --git a/data/ag_demand_map.rda b/data/ag_demand_map.rda
diff --git a/data/ag_demand_map_v7.0.rda b/data/ag_demand_map_v7.0.rda
diff --git a/data/ag_prices_map_v7.0.rda b/data/ag_prices_map_v7.0.rda
diff --git a/data/buildings_en_service.rda b/data/buildings_en_service.rda
diff --git a/data/buildings_en_service_v7.0.rda b/data/buildings_en_service_v7.0.rda
diff --git a/data/capacity_map.rda b/data/capacity_map.rda
diff --git a/data/capacity_map_v7.0.rda b/data/capacity_map_v7.0.rda
diff --git a/data/capital_gcam.rda b/data/capital_gcam.rda
diff --git a/data/capital_gcam_v7.0.rda b/data/capital_gcam_v7.0.rda
diff --git a/data/carbon_content.rda b/data/carbon_content.rda
diff --git a/data/carbon_content_v7.0.rda b/data/carbon_content_v7.0.rda
diff --git a/data/carbon_seq_tech_map.rda b/data/carbon_seq_tech_map.rda
diff --git a/data/carbon_seq_tech_map_v7.0.rda b/data/carbon_seq_tech_map_v7.0.rda
diff --git a/data/cf_gcam.rda b/data/cf_gcam.rda
diff --git a/data/cf_gcam_v7.0.rda b/data/cf_gcam_v7.0.rda
diff --git a/data/cf_rgn.rda b/data/cf_rgn.rda
diff --git a/data/cf_rgn_v7.0.rda b/data/cf_rgn_v7.0.rda
diff --git a/data/co2_ets_sector_map_v7.0.rda b/data/co2_ets_sector_map_v7.0.rda
diff --git a/data/co2_market_frag_map_v7.0.rda b/data/co2_market_frag_map_v7.0.rda
diff --git a/data/co2_sector_map_v7.0.rda b/data/co2_sector_map_v7.0.rda
diff --git a/data/co2_tech_map.rda b/data/co2_tech_map.rda
diff --git a/data/co2_tech_map_v7.0.rda b/data/co2_tech_map_v7.0.rda
diff --git a/data/elec_gen_map.rda b/data/elec_gen_map.rda
diff --git a/data/elec_gen_map_v7.0.rda b/data/elec_gen_map_v7.0.rda
diff --git a/data/energy_prices_map_v7.0.rda b/data/energy_prices_map_v7.0.rda
diff --git a/data/final_energy_map.rda b/data/final_energy_map.rda
diff --git a/data/final_energy_map_v7.0.rda b/data/final_energy_map_v7.0.rda
diff --git a/data/iea_capacity.rda b/data/iea_capacity.rda
diff --git a/data/iea_capacity_v7.0.rda b/data/iea_capacity_v7.0.rda
diff --git a/data/investment.rda b/data/investment.rda
diff --git a/data/investment_v7.0.rda b/data/investment_v7.0.rda
diff --git a/data/kyoto_sector_map_v7.0.rda b/data/kyoto_sector_map_v7.0.rda
diff --git a/data/land_use_map.rda b/data/land_use_map.rda
diff --git a/data/land_use_map_v7.0.rda b/data/land_use_map_v7.0.rda
diff --git a/data/last_historical_year.rda b/data/last_historical_year.rda
diff --git a/data/last_historical_year_v7.0.rda b/data/last_historical_year_v7.0.rda
diff --git a/data/nonCO2_content.rda b/data/nonCO2_content.rda
diff --git a/data/nonCO2_content_v7.0.rda b/data/nonCO2_content_v7.0.rda
diff --git a/data/nonco2_emis_resource_map.rda b/data/nonco2_emis_resource_map.rda
diff --git a/data/nonco2_emis_resource_map_v7.0.rda b/data/nonco2_emis_resource_map_v7.0.rda
diff --git a/data/nonco2_emis_sector_map.rda b/data/nonco2_emis_sector_map.rda
diff --git a/data/nonco2_emis_sector_map_v7.0.rda b/data/nonco2_emis_sector_map_v7.0.rda
diff --git a/data/primary_energy_map.rda b/data/primary_energy_map.rda
diff --git a/data/primary_energy_map_v7.0.rda b/data/primary_energy_map_v7.0.rda
diff --git a/data/production_map.rda b/data/production_map.rda
diff --git a/data/production_map_v7.0.rda b/data/production_map_v7.0.rda
diff --git a/data/queries_general_v7.0.rda b/data/queries_general_v7.0.rda
diff --git a/data/queries_nonCO2.rda b/data/queries_nonCO2.rda
diff --git a/data/queries_nonCO2_v7.0.rda b/data/queries_nonCO2_v7.0.rda
diff --git a/data/reg_cont_v7.0.rda b/data/reg_cont_v7.0.rda
diff --git a/data/reporting_years.rda b/data/reporting_years.rda
diff --git a/data/reporting_years_v7.0.rda b/data/reporting_years_v7.0.rda
diff --git a/data/se_gen_map.rda b/data/se_gen_map.rda
diff --git a/data/se_gen_map_v7.0.rda b/data/se_gen_map_v7.0.rda
diff --git a/data/template_v7.0.rda b/data/template_v7.0.rda
diff --git a/data/transport_en_service.rda b/data/transport_en_service.rda
diff --git a/data/transport_en_service_v7.0.rda b/data/transport_en_service_v7.0.rda
diff --git a/data/transport_final_en_map_v7.0.rda b/data/transport_final_en_map_v7.0.rda
diff --git a/data/var_fun_map_v7.0.rda b/data/var_fun_map_v7.0.rda
diff --git a/debugging.R b/debugging.R
@@ -0,0 +1,113 @@
+# rename template items
+db_path = NULL
+db_name = NULL
+# prj_name = 'database_basexdb_2100_prj_study1_rep.dat'
+prj_name = 'database_basexdb_2100_prj_renamevar3.dat'
+scenarios = NULL
+final_year = 2100
+desired_variables = "All"
+desired_regions = "All"
+desired_continents = "All"
+save_output = TRUE
+output_file = NULL
+launch_ui = TRUE
+queries_general_file = gcamreport::queries_general
+queries_nonCO2_file = gcamreport::queries_nonCO2
+verbose = FALSE
+
+generate_report(
+  prj_name = 'database_basexdb_2100_prj_renamevar3.dat',
+  desired_regions = "China"
+)
+
+
+
+
+prjname = 'C:/Users/claudia.rodes/Documents/gcam-v7.0-Windows-Release-Package/output/database_basexdb_policy_debug1.dat'
+generate_report(prj_name=prjname,launch_ui=FALSE,
+                desired_variables = c('Price|Carbon'))
+
+
+
+
+##############################################################################
+generate_report(db_path = "examples",
+                db_name = 'database_basexdb_ref',
+                scenarios = 'Reference',
+                prj_name = 'dev2.dat',
+                final_year = 2050,
+                desired_variables = c('Price|Carbon*'),
+                save_output = TRUE,
+                launch_ui = F)
+db_path = NULL
+db_name = NULL
+prj_name
+scenarios = NULL
+final_year = 2100
+desired_variables = "All"
+desired_regions = "All"
+desired_continents = "All"
+save_output = TRUE
+output_file = NULL
+launch_ui = TRUE
+queries_general_file = gcamreport::queries_general
+queries_nonCO2_file = gcamreport::queries_nonCO2
+
+
+## -- load gcamreport library.
+devtools::load_all()
+
+## -- store the project path and name in a variable.
+datapath <- "examples/example3.RData"
+
+## -- launch the user interface
+launch_gcamreport_ui(data_path = datapath)
+
+
+
+
+
+
+## -- generate the reporting dataset until 2050 for EU-12 and EU-15 for all the
+## -- Agricultural variables, save the output in .RData, .csv and .xlsx format,
+## -- and lunch the user interface
+generate_report(db_path = dbpath, db_name = dbname, scenarios = scen,
+                prj_name = prjname, final_year = 2050,
+                desired_regions = c('EU-12', 'EU-15', 'Canada', 'Brazil', 'USA'),
+                desired_variables = c('Final*'),
+                save_output = TRUE, launch_ui = TRUE)
+
+
+
+
+## -- load gcamreport library.
+devtools::load_all()
+# library(gcamreport)
+
+## -- store the database path, name, and scenarios in a variable.
+dbpath <- "examples"
+dbname <- "database_basexdb_ref"
+scen <- "Reference"
+
+## -- choose a project name
+prjname <- "example1.dat"
+
+## -- generate the reporting dataset until 2050 for EU-12 and EU-15 for all the
+## -- Agricultural variables, save the output in .RData, .csv and .xlsx format,
+## -- and lunch the user interface
+generate_report(db_path = dbpath, db_name = dbname, scenarios = scen,
+                prj_name = prjname, final_year = 2050,
+                desired_regions = c('EU-12', 'EU-15'),
+                desired_variables = c('Agricultural*'),
+                save_output = TRUE, launch_ui = TRUE)
+
+
+
+
+launch_gcamreport_ui("examples/example3.RData")
+
+datapath <- "examples/example3.RData"
+
+## -- launch the user interface
+launch_gcamreport_ui(data_path = datapath)
+
diff --git a/examples/demo.R b/examples/demo.R
@@ -0,0 +1,82 @@
+
+################################################################################
+## -- example 1 - generate project
+
+rm(list = ls())
+devtools::load_all()
+
+## -- store the database path and name
+dbpath <- "C:/Users/claudia.rodes/Documents/gcam-v7.0-Windows-Release-Package/output"
+dbname <- "database_basexdb_ssp"
+
+## -- choose a project name
+prjname <- "example1.dat"
+
+## -- generate the reporting dataset
+generate_report(db_path = dbpath, db_name = dbname, prj_name = prjname,
+                final_year = 2050,
+                scenarios = c('GCAM_SSP4', 'GCAM_SSP5', 'GCAM_SSP1'),
+                desired_regions = c('USA', 'Brazil', 'EU-15'),
+                desired_variables = c('Agricultural*'))
+
+
+available_regions()
+available_variables()
+
+
+
+
+################################################################################
+## -- example 2 - vetting
+
+rm(list = ls())
+devtools::load_all()
+
+## -- choose the project name
+prjname <- "examples/prj_example_vetting.dat"
+
+## -- generate the reporting dataset
+generate_report(prj_name = prjname, final_year = 2050)
+
+
+
+
+################################################################################
+## -- example 3 - launch UI
+
+
+## A) if "report" variable is in the environment
+launch_gcamreport_ui(data = report)
+
+
+## B) from an RData dataset
+rm(list = ls())
+devtools::load_all()
+
+## -- set the Rproj path
+RDataName <- "examples/prj_example_vetting_standardized.RData"
+
+## -- generate the reporting dataset
+launch_gcamreport_ui(data_path = RDataName)
+
+
+
+
+################################################################################
+## -- example 4 - saving options - launching UI options - error messages
+
+rm(list = ls())
+devtools::load_all()
+
+## -- set the project name
+prjname <- "examples/example2.dat"
+
+## -- generate the reporting dataset
+generate_report(prj_name = prjname,
+                final_year = 2050,
+                desired_regions = c('Argentina'),
+                desired_variables = c('Agricultral*'),
+                save_output = FALSE,
+                launch_ui = FALSE)
+
+
diff --git a/examples/example2_standardized.RData b/examples/example2_standardized.RData
diff --git a/inst/extdata/figure/vetting.tiff b/inst/extdata/figure/vetting.tiff
diff --git a/...ppings/A23.globaltech_capacity_factor.csv → ...CAM7.0/A23.globaltech_capacity_factor.csv b/...ppings/A23.globaltech_capacity_factor.csv → ...CAM7.0/A23.globaltech_capacity_factor.csv
@@ -1,34 +1,34 @@
-# File: A23.globaltech_capacity_factor.csv,,,,
-# Title: Electricity technology capacity factors,,,,
-# Units: Unitless; ratio of generation to capacity,,,,
-# Source: Assumption,,,,
-# Electricity technology capacity factors currently just used to levelize costs,,,,
-# Assumed to stay constant,,,,
-# Changes to future capacity factors are allow and are interpolated,,,,
-# Column types: cccnn ,,,,
-# ----------,,,,
-supplysector,subsector,technology,1971,2100
-electricity,coal,coal (conv pul),0.85,0.85
-electricity,coal,coal (conv pul CCS),0.8,0.8
-electricity,coal,coal (IGCC),0.8,0.8
-electricity,coal,coal (IGCC CCS),0.8,0.8
-electricity,gas,gas (steam/CT),0.8,0.8
-electricity,gas,gas (CC),0.85,0.85
-electricity,gas,gas (CC CCS),0.8,0.8
-electricity,refined liquids,refined liquids (steam/CT),0.8,0.8
-electricity,refined liquids,refined liquids (CC),0.85,0.85
-electricity,refined liquids,refined liquids (CC CCS),0.8,0.8
-electricity,biomass,biomass (conv),0.85,0.85
-electricity,biomass,biomass (conv CCS),0.85,0.85
-electricity,biomass,biomass (IGCC),0.8,0.8
-electricity,biomass,biomass (IGCC CCS),0.8,0.8
-electricity,nuclear,Gen_II_LWR,0.9,0.9
-electricity,nuclear,Gen_III,0.9,0.9
-electricity,wind,wind,0.37,0.37
-electricity,wind,wind_storage,0.37,0.37
-electricity,solar,PV,0.2,0.2
-electricity,solar,PV_storage,0.2,0.2
-electricity,solar,CSP,0.25,0.25
-electricity,solar,CSP_storage,0.5,0.5
-electricity,geothermal,geothermal,0.9,0.9
-elect_td_bld,rooftop_pv,rooftop_pv,0.17,0.17
+# File: A23.globaltech_capacity_factor.csv,,,,
+# Title: Electricity technology capacity factors,,,,
+# Units: Unitless; ratio of generation to capacity,,,,
+# Source: Assumption,,,,
+# Electricity technology capacity factors currently just used to levelize costs,,,,
+# Assumed to stay constant,,,,
+# Changes to future capacity factors are allow and are interpolated,,,,
+# Column types: cccnn ,,,,
+# ----------,,,,
+supplysector,subsector,technology,1971,2100
+electricity,coal,coal (conv pul),0.85,0.85
+electricity,coal,coal (conv pul CCS),0.8,0.8
+electricity,coal,coal (IGCC),0.8,0.8
+electricity,coal,coal (IGCC CCS),0.8,0.8
+electricity,gas,gas (steam/CT),0.8,0.8
+electricity,gas,gas (CC),0.85,0.85
+electricity,gas,gas (CC CCS),0.8,0.8
+electricity,refined liquids,refined liquids (steam/CT),0.8,0.8
+electricity,refined liquids,refined liquids (CC),0.85,0.85
+electricity,refined liquids,refined liquids (CC CCS),0.8,0.8
+electricity,biomass,biomass (conv),0.85,0.85
+electricity,biomass,biomass (conv CCS),0.85,0.85
+electricity,biomass,biomass (IGCC),0.8,0.8
+electricity,biomass,biomass (IGCC CCS),0.8,0.8
+electricity,nuclear,Gen_II_LWR,0.9,0.9
+electricity,nuclear,Gen_III,0.9,0.9
+electricity,wind,wind,0.37,0.37
+electricity,wind,wind_storage,0.37,0.37
+electricity,solar,PV,0.2,0.2
+electricity,solar,PV_storage,0.2,0.2
+electricity,solar,CSP,0.25,0.25
+electricity,solar,CSP_storage,0.5,0.5
+electricity,geothermal,geothermal,0.9,0.9
+elect_td_bld,rooftop_pv,rooftop_pv,0.17,0.17