Skip to content

Commit

Permalink
# This is a combination of 11 commits.
Browse files Browse the repository at this point in the history 
# This is the 1st commit message:

Remove unused files from master.

# This is the commit message #2:

Version comparison (#178)

* Define public CEDS release versions

- add object to common_data.R

* Fix RCP mapping

- delete second line for sector 6A, as RCP is not defined for this row
- retain first line for sector 6A, as RCP is defined here

# This is the commit message #3:

Fixing coal heat content for CO2

- output coal heat content column for 2014 data as X2014

# This is the commit message #4:

Update usa emissions and min pathways (#183)

Update US pollutant emissions Inventory to latest version and also update the minimum emission factor pathways for transportation. Generalize treatment of inventory and system end years.
# This is the commit message #5:

Waste minor update (#182)

Calculate domestic waste burning emissions from user-defined burning parameters. Lower assumption for fraction assumed burned. Increase India per-capita waste generation to newer literature value.

# This is the commit message #6:

Consistent units (#181)

Improve consistency of unit conversions across the system. Update some unit conversion values.
# This is the commit message #7:

India gains fix po (#148)

Use GAINS India data (activity, emissions, sulfur content for fuels, ash sulfur retention for coal) instead of scaling to REAS and EDGAR. Updated some European default sulfur data calcs.
# This is the commit message #8:

Remove industrial seasonality and fix speciated VOC gridding (#185)

Change industrial seasonality to flat, and update makefile for sub-VOC gridding
# This is the commit message #9:

fix linefeed

# This is the commit message #10:

Fix combustion activity order (#180)

Re-structure so that user-added energy data is added and all activity is calculated before emissions calcs. 
# This is the commit message #11:

Update readme and version number
  • Loading branch information
@ssmithClimate
ssmithClimate committed Aug 25, 2019
1 parent 83cf120 commit 5111055
Show file tree
Hide file tree
Showing 86 changed files with 26,478 additions and 24,146 deletions.
137 changes: 87 additions & 50 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ SC_MAPPINGS = input/mappings/scaling
ACTIV = input/activity
INV_DATA = input/emissions-inventories
MED_OUT = intermediate-output
ENERGY_IN = input/energy
DIAG_OUT = diagnostic-output
FINAL_OUT = final-emissions
EXT_IN = input/extension
Expand Down Expand Up @@ -69,14 +70,10 @@ export EM = NONE
@printf '%*s\n' "$${COLUMNS:-$$(tput cols)}" '' | tr ' ' =
@$(MAKE) gridded-emissions

activity: $(MED_OUT)/A.total_activity.csv \
activity: $(MED_OUT)/A.total_activity_extended.csv \
$(EXT_DATA)/A.Pig_Iron_Production.csv \
$(MED_OUT)/A.IEA_CEDS_natural_gas_difference.csv \
$(MED_OUT)/A.coal_heat_content.csv

extended-activity: $(MED_OUT)/A.total_activity_extended.csv \
$(EXT_DATA)/A.Pig_Iron_Production.csv

else

# This target is only visible to the Makefile during the
Expand Down Expand Up @@ -114,8 +111,8 @@ endif
# If a multi-processor machine is available, CEDS should be instead run in parellel for multiple species
all: SO2-emissions BC-emissions OC-emissions NOx-emissions CO-emissions NMVOC-emissions CO2-emissions NH3-emissions
part1: SO2-emissions NOx-emissions NH3-emissions
part2: CO-emissions NMVOC-emissions
part3: BC-emissions OC-emissions CO2-emissions
part2: BC-emissions OC-emissions CO2-emissions
part3: CO-emissions NMVOC-emissions CH4-emissions

# --------------------------------------------------------------

Expand Down Expand Up @@ -409,21 +406,16 @@ $(MED_OUT)/A.intl_shipping_en.csv: \
# aa3-2
# Write out difference between IEA and CEDS coal
$(MED_OUT)/A.IEA_CEDS_coal_difference.csv: \
$(MOD_A)/A3.3.write_IEA_diff.R \
$(MED_OUT)/A.IEA_BP_energy_ext.csv
$(MOD_A)/A2.3.write_IEA_diff.R \
$(MED_OUT)/A.IEA_en_stat_ctry_hist.csv \
$(MED_OUT)/A.en_biomass_fsu_fix.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.IEA_CEDS_natural_gas_difference.csv: \
$(MED_OUT)/A.IEA_CEDS_coal_difference.csv

# Write out difference between IEA and CEDS coal
#$(MED_OUT)/A.IEA_CEDS_coal_difference.csv: \
$(MED_OUT)/A.IEA_BP_energy_ext.csv
# Rscript $< $(EM) --nosave --no-restore

#$(MED_OUT)/A.IEA_CEDS_natural_gas_difference.csv: \
$(MED_OUT)/A.IEA_CEDS_coal_difference.csv

# aa3-3
# Process pig iron production
$(EXT_DATA)/A.Pig_Iron_Production.csv: \
Expand All @@ -438,20 +430,20 @@ $(EXT_DATA)/A.Pig_Iron_Production.csv: \
# naming note: includes both module A3 and A4
# Expands energy data to include all possible id combinations
# Splits energy combustion data and energy activity data
$(MED_OUT)/A.comb_activity.csv: \
$(MOD_A)/A4.1.complete_energy_data.R \
$(MED_OUT)/A.default_comb_activity_with_other.csv: \
$(MOD_A)/A4.1.default_modern_energy_data.R \
$(MED_OUT)/A.IEA_BP_energy_ext.csv \
$(MAPPINGS)/Master_Fuel_Sector_List.xlsx
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.NC_activity_energy.csv: \
$(MED_OUT)/A.comb_activity.csv
$(MED_OUT)/A.default_comb_activity_with_other.csv

$(MED_OUT)/A.other_IEA_energy_values.csv : \
$(MED_OUT)/A.comb_activity.csv
$(MED_OUT)/A.default_comb_activity_with_other.csv

$(MED_OUT)/A.Other_transformation_fuel.csv: \
$(MED_OUT)/A.comb_activity.csv
$(MED_OUT)/A.default_comb_activity_with_other.csv

# aa5-1
# BRANCH BLOCK
Expand Down Expand Up @@ -490,83 +482,77 @@ $(MED_OUT)/A.pulp_paper_consumption_full.csv: \
$(MED_OUT)/A.NC_activity_db.csv

# aa5-2a
# Converts activity database into CEDS Standard and combines
# with combustion activity data
$(MED_OUT)/A.total_activity.csv: \
# Make non-combustion activity data
$(MED_OUT)/A.NC_activity.csv: \
$(MOD_A)/A5.3.proc_activity.R \
$(MAPPINGS)/Master_Country_List.csv \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.NC_activity_db.csv
Rscript $< $(EM) --nosave --no-restore

# aa5-2b
$(MED_OUT)/A.NC_activity.csv: \
$(MED_OUT)/A.total_activity.csv

# aa6- Historical Energy extension
# Combustion data
$(MED_OUT)/A.final_sector_shares.csv: \
$(MED_OUT)/A.full_default_sector_shares.csv: \
$(MOD_A)/A6.1.extended_comb_sector_shares.R \
$(EXT_IN)/CD.Bond_sector_percentages.csv \
$(MED_OUT)/A.Other_transformation_fuel.csv \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.default_comb_activity_with_other.csv \
$(EXT_IN)/ext_sector_breakdown_assumptions.csv \
$(EXT_IN)/ext_sector_percents_start_assumptions.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.comb_activity_extended_coal.csv: \
$(MOD_A)/A6.2.extended_default_activity_coal.R \
$(MED_OUT)/A.final_sector_shares.csv \
$(MED_OUT)/A.full_default_sector_shares.csv \
$(MED_OUT)/A.Other_transformation_fuel.csv \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.default_comb_activity_with_other.csv \
$(MED_OUT)/E.CO2_CDIAC_inventory.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.comb_activity_extended_natural_gas.csv: \
$(MOD_A)/A6.2.extended_default_activity_natural_gas.R \
$(MED_OUT)/A.final_sector_shares.csv \
$(MED_OUT)/A.full_default_sector_shares.csv \
$(MED_OUT)/A.Other_transformation_fuel.csv \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.default_comb_activity_with_other.csv \
$(MED_OUT)/E.CO2_CDIAC_inventory.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.comb_activity_extended_oil.csv: \
$(MOD_A)/A6.2.extended_default_activity_oil.R \
$(MED_OUT)/A.final_sector_shares.csv \
$(MED_OUT)/A.full_default_sector_shares.csv \
$(MED_OUT)/A.Other_transformation_fuel.csv \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.default_comb_activity_with_other.csv \
$(MED_OUT)/E.CO2_CDIAC_inventory.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.industrial_biomass_extended.csv: \
$(MOD_A)/A6.3.extend_industrial_biomass.R \
$(MED_OUT)/A.comb_activity.csv
$(EXT_IN)/CD.Bond_country_industrial_biomass.csv \
$(MED_OUT)/A.default_comb_activity_with_other.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.other_biomass_extended.csv: \
$(MOD_A)/A6.3.extend_other_biomass.R \
$(EXT_IN)/CD.Bond_country_industrial_biomass.csv \
$(MED_OUT)/A.comb_activity.csv
$(MED_OUT)/A.default_comb_activity_with_other.csv
Rscript $< $(EM) --nosave --no-restore

# combine all combustion extension data
$(MED_OUT)/A.comb_default_activity_extended.csv: \
$(MOD_A)/A6.4.extended_default_comb_activity.R \
$(MED_OUT)/A.comb_activity_extended_coal.csv \
$(MED_OUT)/A.comb_activity_extended_natural_gas.csv \
$(MED_OUT)/A.comb_activity_extended_oil.csv \
$(MED_OUT)/A.total_activity.csv \
$(MED_OUT)/A.intl_shipping_en.csv \
$(MED_OUT)/A.residential_biomass_full.csv \
$(MED_OUT)/A.comb_activity_extended_natural_gas.csv \
$(MED_OUT)/A.other_biomass_extended.csv \
$(MED_OUT)/A.industrial_biomass_extended.csv \
$(MED_OUT)/A.other_biomass_extended.csv
$(MED_OUT)/A.residential_biomass_full.csv \
#$(MED_OUT)/A.intl_shipping_en.csv \
$(MED_OUT)/A.default_comb_activity_with_other.csv \
$(ENERGY_IN)/IEA_iso_start_data.csv
Rscript $< $(EM) --nosave --no-restore

# Non Combustion activity data
$(MED_OUT)/A.NC_activity_extended_db.csv: \
$(MOD_A)/A7.1.base_activity.R \
$(MOD_A)/A7.2.add_activity.R \
$(MOD_A)/A7.3.proc_activity.R \
$(MOD_A)/A7.2.add_activity_CDIAC.R \
$(MOD_A)/A7.2.add_activity_population.R \
$(MOD_A)/A7.2.add_activity_pulp_paper_consumption.R \
Expand Down Expand Up @@ -595,6 +581,12 @@ $(MED_OUT)/A.total_activity_extended.csv: \
$(MED_OUT)/A.comb_user_added.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.final_comb_activity_modern.csv: \
$(MOD_A)/A8.2.combine_extended_activity.R \
$(MED_OUT)/A.NC_default_activity_extended.csv \
$(MED_OUT)/A.comb_user_added.csv
Rscript $< $(EM) --nosave --no-restore

$(MED_OUT)/A.total_activity_extended_coal.csv: \
$(MED_OUT)/A.total_activity_extended.csv

Expand Down Expand Up @@ -644,12 +636,11 @@ $(MED_OUT)/B.$(EM)_comb_EF_db.csv: \
$(PARAMS)/analysis_functions.R \
$(PARAMS)/interpolation_extension_functions.R \
$(EF_DATA)/SO2_base_EF.csv \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.final_comb_activity_modern.csv \
$(MAPPINGS)/Bond/Bond_country_map.csv \
$(MAPPINGS)/Bond/Bond_fuel_map.csv \
$(MAPPINGS)/Bond/Bond_sector_map.csv \
$(EXT_IN)/CD.Bond_country_industrial_biomass.csv \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.coal_heat_content.csv \
$(EF_DATA)/CO2_base_EF.xlsx
Rscript $< $(EM) --nosave --no-restore
Expand Down Expand Up @@ -731,7 +722,7 @@ $(MED_OUT)/C.$(EM)_NC_EF.csv: \

$(MED_OUT)/D.$(EM)_default_total_emissions.csv: \
$(MOD_D)/D1.1.default_emissions.R \
$(MED_OUT)/A.comb_activity.csv \
$(MED_OUT)/A.final_comb_activity_modern.csv \
$(MED_OUT)/A.NC_activity.csv \
$(MED_OUT)/B.$(EM)_comb_EF_db.csv \
$(MED_OUT)/C.$(EM)_NC_EF.csv
Expand Down Expand Up @@ -942,17 +933,63 @@ $(MED_OUT)/gridded-emissions/CEDS_$(EM)_anthro_%.csv: \
$(PARAMS)/nc_generation_functions.R \
$(FINAL_OUT)/current-versions/CEDS_$(EM)_emissions_by_country_CEDS_sector_*.csv
Rscript $< $(EM) --nosave --no-restore

ifeq ($(EM),NMVOC)
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R NMVOC --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC01 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC02 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC03 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC04 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC05 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC06 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC07 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC08 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC09 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC12 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC13 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC14 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC15 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC16 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC17 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC18 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC19 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC20 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC21 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC22 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC23 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC24 --nosave --no-restore
Rscript $(MOD_G)/G1.2.grid_subVOC_emissions.R VOC25 --nosave --no-restore
endif

$(FINAL_OUT)/gridded-emissions/$(EM)-em-anthro*: \
$(MOD_G)/G2.1.chunk_bulk_emissions.R \
$(MED_OUT)/gridded-emissions/CEDS_$(EM)_anthro_*.csv
rm -fv $(FINAL_OUT)/gridded-emissions/$(EM)-em-anthro*
Rscript $< $(EM) --nosave --no-restore

ifeq ($(EM),NMVOC)
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R NMVOC --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC01 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC02 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC03 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC04 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC05 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC06 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC07 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC08 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC09 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC12 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC13 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC14 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC15 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC16 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC17 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC18 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC19 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC20 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC21 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC22 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC23 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC24 --nosave --no-restore
Rscript $(MOD_G)/G2.2.chunk_subVOC_emissions.R VOC25 --nosave --no-restore
endif


Expand Down
13 changes: 6 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
The Community Emissions Data System (CEDS) produces consistent estimates of global air emissions species over the industrial era (1750 - present). The system is written in R and uses open-source data (with the exception of the IEA energy statistics which must be purchased from IEA). CEDS is publicly available through an [Open Source License](#license-section).

***
**Pre-release Version:** July 17, 2019. The current code and data in the repository is a pre-release version. Please feel free to explore, comment on this version and send us any questions. Note that we will be pushing several updates to the system over the few weeks leading up to the first public release. These will include updates to:
**Pre-release Version:** August 25, 2019. The current code and data in the repository is a pre-release version. Please feel free to explore, comment on this version and send us any questions. Note that we will be pushing several updates to the system leading up to the first public release.

* SO2, CO2, and CH4 emissions will be updated to better match the results from CMIP6 data release from Hoesly et al. (2018a). There will likely be some changes to other emission species as well.
* Updates to waste burning emissions.
* Several other updates to code and data files, including resolution of some current [open Issues](https://github.com/JGCRI/CEDS/issues).
* Additional fixes to improve consistency of historical calcuations and user options
* Resolution of some current [open Issues](https://github.com/JGCRI/CEDS/issues).
* User guide additions.
* Description and graphs of emission differences with the CMIP6 data release

See [release notes](https://github.com/JGCRI/CEDS/wiki/Release-Notes) for change notes.
See [release notes](https://github.com/JGCRI/CEDS/wiki/Release-Notes) for a summary of changes.

***

Expand All @@ -20,9 +19,9 @@ Current issues with the data or system are documented in the [CEDS Issues](https

Further information can also be found at the [project web site](http://www.globalchange.umd.edu/ceds/), including a [CMIP6 page](http://www.globalchange.umd.edu/ceds/ceds-cmip6-data/) that provides details for obtaining gridded emission datasets produced by this project.

Over the summer 2019 we will be working on a major update which will extending the time series to 2019 and update historical assumptions.
Over the summer and fall of 2019 we will be working on a major update which will extending the time series to 2018 and update historical assumptions.

If you plan to use the CEDS data system for a research project you are encouraged to contact [Steve Smith](mailto:ssmith@pnnl.gov) so that we can coordinate with any on-going work on the CEDS system.
If you plan to use the CEDS data system for a research project you are encouraged to contact [Steve Smith](mailto:ssmith@pnnl.gov) so that we can coordinate with any on-going work on the CEDS system. CEDS is research software, and we will be happy to help you make sure and make the best possible use of this system.

# Journal Papers
[Hoesly et al, Historical (1750–2014) anthropogenic emissions of reactive gases and aerosols from the Community Emissions Data System (CEDS). Geosci. Model Dev. 11, 369-408, 2018a.](https://www.geosci-model-dev.net/11/369/2018/gmd-11-369-2018.html)
Expand Down
Loading

0 comments on commit 5111055

Please sign in to comment.