From b7605d9a20b1ac720c793642f02f8cc7c852f510 Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Mon, 2 Jan 2017 18:05:21 +0100 Subject: fixed tables and page layouts --- doc/res/data/co2_coeff.csv | 12 +++++++++++ doc/res/data/co2_emissions.csv | 13 +++++++++++ doc/res/data/heat_of_combustion.csv | 24 ++++++++++----------- doc/res/images/cam_cpt_logo.pdf | Bin 8546 -> 8932 bytes doc/res/images/canada_settlements.pdf | Bin 126072 -> 136741 bytes doc/res/images/canada_settlements_orig.pdf | Bin 125924 -> 131202 bytes ...fuel_consumed_for_electric_power_generation.png | Bin 0 -> 40831 bytes 7 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 doc/res/data/co2_coeff.csv create mode 100644 doc/res/data/co2_emissions.csv create mode 100644 doc/res/srcpics/fuel_consumed_for_electric_power_generation.png (limited to 'doc/res') diff --git a/doc/res/data/co2_coeff.csv b/doc/res/data/co2_coeff.csv new file mode 100644 index 0000000..e4548ba --- /dev/null +++ b/doc/res/data/co2_coeff.csv @@ -0,0 +1,12 @@ +fuel,co2coeffmm +Subbituminous Coal,2.77 +Natural Gas,2.40 +Lignite,2.04 +Bituminous Coal,2.77 +Wood,1.63 +Heavy Fuel Oil,2.84 +Petroleum Coke,3.31 +Diesel,3.20 +Methane,2.80 +Light Fuel Oil,2.60 +Propane,2.77 diff --git a/doc/res/data/co2_emissions.csv b/doc/res/data/co2_emissions.csv new file mode 100644 index 0000000..303c9b5 --- /dev/null +++ b/doc/res/data/co2_emissions.csv @@ -0,0 +1,13 @@ +fuel,mass [kg],co2 mass [kg],Mass [1000 t],co2 mass [1000 t] +Subbituminous Coal,24.48E+09,67.76E+09,24'479.39,677'565.11 +Natural Gas,9.78E+09,23.47E+09,9'783.89,234'748.99 +Lignite,8.85E+09,18.02E+09,8'846.53,180'224.84 +Bituminous Coal,2.90E+09,8.02E+09,2'897.52,80'200.43 +Wood,2.68E+09,4.36E+09,2'680.91,43'564.81 +Heavy Fuel Oil,649.14E+06,1.85E+09,649.14,18'455.35 +Petroleum Coke,577.52E+06,1.91E+09,577.52,19'113.61 +Diesel,136.21E+06,435.86E+06,136.21,4'358.60 +Methane,131.15E+06,367.22E+06,131.15,3'672.18 +Light Fuel Oil,41.08E+06,106.80E+06,41.08,1'068.05 +Propane,98.60E+00,272.90E+00,0.0001,0.0027 +Total,50.22E+09,126.30E+09,50'223.33,1'262'971.97 diff --git a/doc/res/data/heat_of_combustion.csv b/doc/res/data/heat_of_combustion.csv index 309078d..d914722 100644 --- a/doc/res/data/heat_of_combustion.csv +++ b/doc/res/data/heat_of_combustion.csv @@ -1,12 +1,12 @@ -fuel,heat of combustion [MJ/kg] -petroleum coke,34.2 -diesel,43.3 -heavy fuel oil,41 -methane,50 -bituminous coal,31.3 -subbituminous coal,31.3 -propane,27.2 -light fuel oil,43.6 -natural gas,47.7 -lignite,22 -wood,15 +fuel,heatofcombustion +Petroleum Coke,34.2 +Diesel,43.3 +Heavy Fuel Oil,41.0 +Methane,50.0 +Bituminous Coal,31.3 +Subbituminous Coal,31.3 +Propane,27.2 +Light Fuel Oil,43.6 +Natural Gas,47.7 +Lignite,22.0 +Wood,15.0 diff --git a/doc/res/images/cam_cpt_logo.pdf b/doc/res/images/cam_cpt_logo.pdf index 91a12da..895bc0b 100644 Binary files a/doc/res/images/cam_cpt_logo.pdf and b/doc/res/images/cam_cpt_logo.pdf differ diff --git a/doc/res/images/canada_settlements.pdf b/doc/res/images/canada_settlements.pdf index 6fe09c5..b78995a 100644 Binary files a/doc/res/images/canada_settlements.pdf and b/doc/res/images/canada_settlements.pdf differ diff --git a/doc/res/images/canada_settlements_orig.pdf b/doc/res/images/canada_settlements_orig.pdf index 73aa1fb..779d26a 100644 Binary files a/doc/res/images/canada_settlements_orig.pdf and b/doc/res/images/canada_settlements_orig.pdf differ diff --git a/doc/res/srcpics/fuel_consumed_for_electric_power_generation.png b/doc/res/srcpics/fuel_consumed_for_electric_power_generation.png new file mode 100644 index 0000000..810b6ea Binary files /dev/null and b/doc/res/srcpics/fuel_consumed_for_electric_power_generation.png differ -- cgit v1.2.1