Skip to content

Commit

Permalink
Pull request JGCRI#199: Sha/feature/detailed industry byu
Browse files Browse the repository at this point in the history 
Merge in JGCRI/gcam-core from sha/feature/detailed-industry-byu to master

* commit '8c5cd23104dcb1555ee17a1e057f53c25a788276': (88 commits)
  Update logit exponent for chemical feedstocks
  Update other industry energy use and feedstocks terminal_coef
  Copy NONENUSE bitumen usage to NECONSTRUC
  Update PREBUILT_DATA.rda
  Update chemical and construction sector income elasticity
  fix small bug in query from 04aaad4
  revise cogeneration queries for Rapid XML change (from output-secondary to secondary-output)
  Update query
  Delete files and comments
  Update nomenclature of the constants
  Update aluminum income elasticity for Africa_Southern
  Update GCAM_DATA_MAP.rda
  Update Main_queries.xml
  Revise BLASTFUR shareweight and interpolation rule assumptions
  Delete EAF with scrap CCS
  Add missing precursors
  Revise hard-wired iron and steel supply sector
  Remove hard coding
  Remove trailing spaces from "electricity " and "delivered coal "
  Revert back hydrogen and nuclear share weights
  ...
  • Loading branch information
@pralitp
pralitp committed Apr 26, 2022
2 parents c2bc384 + 8c5cd23 commit 952b050
Show file tree
Hide file tree
Showing 160 changed files with 22,630 additions and 3,347 deletions.
28 changes: 28 additions & 0 deletions exe/batch_SSP_REF.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down Expand Up @@ -80,6 +88,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp4.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp4.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp4.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp4.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp4.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp4.xml</Value>

<!-- TRANSPORTATION -->
Expand Down Expand Up @@ -132,6 +144,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp5.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp5.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp5.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp5.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp5.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp5.xml</Value>

<!-- TRANSPORTATION -->
Expand Down Expand Up @@ -168,6 +184,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp1.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp1.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp1.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp1.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp1.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp1.xml</Value>

<!-- TRANSPORTATION -->
Expand Down Expand Up @@ -222,6 +242,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp2.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp2.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp2.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp2.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp2.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp2.xml</Value>

<!-- TRANSPORTATION -->
Expand Down Expand Up @@ -256,6 +280,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp3.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp3.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp3.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp3.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp3.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp3.xml</Value>

<!-- TRANSPORTATION -->
Expand Down
12 changes: 12 additions & 0 deletions exe/batch_SSP_SPA1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down Expand Up @@ -81,6 +89,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp1.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp1.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp1.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp1.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp1.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp1.xml</Value>

<!-- TRANSPORTATION -->
Expand Down
16 changes: 16 additions & 0 deletions exe/batch_SSP_SPA23.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down Expand Up @@ -81,6 +89,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp2.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp2.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp2.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp2.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp2.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp2.xml</Value>

<!-- TRANSPORTATION -->
Expand Down Expand Up @@ -119,6 +131,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp3.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp3.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp3.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp3.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp3.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp3.xml</Value>

<!-- TRANSPORTATION -->
Expand Down
12 changes: 12 additions & 0 deletions exe/batch_SSP_SPA4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down Expand Up @@ -84,6 +92,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp4.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp4.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp4.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp4.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp4.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp4.xml</Value>

<!-- TRANSPORTATION -->
Expand Down
12 changes: 12 additions & 0 deletions exe/batch_SSP_SPA5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down Expand Up @@ -81,6 +89,10 @@

<!-- INDUSTRY -->
<Value name="ind">../input/gcamdata/xml/industry_incelas_ssp5.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_ssp5.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_ssp5.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_ssp5.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_ssp5.xml</Value>
<Value name="cement">../input/gcamdata/xml/cement_incelas_ssp5.xml</Value>

<!-- TRANSPORTATION -->
Expand Down
8 changes: 8 additions & 0 deletions exe/configuration_policy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down
8 changes: 8 additions & 0 deletions exe/configuration_ref.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down
8 changes: 8 additions & 0 deletions exe/configuration_usa.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
<Value name = "energy_distribution">../input/gcamdata/xml/en_distribution.xml</Value>
<Value name = "industry">../input/gcamdata/xml/industry.xml</Value>
<Value name = "industry_income_elas">../input/gcamdata/xml/industry_incelas_gssp2.xml</Value>
<Value name = "iron_steel">../input/gcamdata/xml/iron_steel.xml</Value>
<Value name = "iron_steel_income_elas">../input/gcamdata/xml/iron_steel_incelas_gssp2.xml</Value>
<Value name = "Off_road">../input/gcamdata/xml/Off_road.xml</Value>
<Value name = "Off_road_income_elas">../input/gcamdata/xml/Off_road_incelas_gssp2.xml</Value>
<Value name = "chemical">../input/gcamdata/xml/chemical.xml</Value>
<Value name = "chemical_income_elas">../input/gcamdata/xml/chemical_incelas_gssp2.xml</Value>
<Value name = "aluminum">../input/gcamdata/xml/aluminum.xml</Value>
<Value name = "aluminum_income_elas">../input/gcamdata/xml/aluminum_incelas_gssp2.xml</Value>
<Value name = "cement">../input/gcamdata/xml/cement.xml</Value>
<Value name = "cement_income_elas">../input/gcamdata/xml/cement_incelas_gssp2.xml</Value>
<Value name = "fertilizer_energy">../input/gcamdata/xml/en_Fert.xml</Value>
Expand Down
6 changes: 5 additions & 1 deletion input/gcamdata/R/constants.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,10 @@ land.density.param.usa<-0
b.param.usa<-3.49026
income.param.usa<-0.4875

# Constants for global detailed industry
energy.OFF_ROAD.BIOMASS_GROWTH <- c("Africa_Eastern","Africa_Southern","Africa_Western") #limit fast growth of biomass in agriculture energy use
energy.IRON_STEEL.DEFAULT_COEF <- c("Biomass-based","scrap","H2 enduse") #assign iron & steel global technology coefficients

# Socioeconomics constants ======================================================================

# Population years - note that these sequences shouldn't have any overlap,
Expand Down Expand Up @@ -800,7 +804,7 @@ gcamusa.REGIONAL_FUEL_MARKETS <- c("regional coal", "delivered coal", "wholesale

# Resources that will be modeled at the state level
gcamusa.STATE_RENEWABLE_RESOURCES <- c("distributed_solar", "geothermal", "onshore wind resource", "offshore wind resource")
gcamusa.STATE_UNLIMITED_RESOURCES <- c("global solar resource", "limestone")
gcamusa.STATE_UNLIMITED_RESOURCES <- c("global solar resource", "limestone", "scrap")

# Define sector(s) used in L222.en_transformation_USA
# The supplysector and subsector structure in these sectors are retained
Expand Down
Binary file modified input/gcamdata/R/sysdata.rda
View file
Binary file not shown.
Loading

0 comments on commit 952b050

Please sign in to comment.