cleaned up structure and finished renewables production

6 files changed, 28 insertions, 28 deletions

diff --git a/data/calc/co2_emissions.ods b/data/calc/co2_emissions.ods
index 935add6..76785ec 100644
--- a/data/calc/co2_emissions.ods
+++ b/data/calc/co2_emissions.ods
diff --git a/data/calc/electricity_production.ods b/data/calc/electricity_production.ods
new file mode 100644
index 0000000..1a528af
--- /dev/null
+++ b/data/calc/electricity_production.ods
diff --git a/data/exportable/co2_emissions_exportable.ods b/data/exportable/co2_emissions_exportable.ods
index e3abb62..6d67479 100644
--- a/data/exportable/co2_emissions_exportable.ods
+++ b/data/exportable/co2_emissions_exportable.ods
diff --git a/data/raw/electricity/electricity_by_producer_class_2015.csv b/data/raw/electricity/electricity_by_producer_class_2015.csv
deleted file mode 100644
index 66ef7fe..0000000
--- a/data/raw/electricity/electricity_by_producer_class_2015.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-"Table 127-0002 Electric power generation, by class of electricity producer, monthly (megawatt hour)(1)"

-Survey or program details:

-Monthly Electricity Supply and Disposition Survey - 2151

-Geography,Class of electricity producer,Type of electricity generation,Jan-2015,Feb-2015,Mar-2015,Apr-2015,May-2015,Jun-2015,Jul-2015,Aug-2015,Sep-2015,Oct-2015,Nov-2015,Dec-2015

-Canada,Total all classes of electricity producer,Hydraulic turbine (4),40195617,36302652,35359010,30735746,28167590,27571908,28516331,28039038,27391364,28494616,30435090,34412802

-Canada,Total all classes of electricity producer,Conventional steam turbine (5),8099151,7688097,7474327,6543750,5812561,6222765,6872434,7211695,6909205,7024832,7245120,7871582

-Canada,Total all classes of electricity producer,Nuclear steam turbine (6),9180622,8307371,9230529,7737381,7985257,8084872,8900017,8678391,6965168,6323797,8448485,8533084

-Canada,Total all classes of electricity producer,Internal combustion turbine (7),121085,113245,113278,101245,92131,89368,90648,94366,88477,100683,99868,111582

-Canada,Total all classes of electricity producer,Combustion turbine (8),2312858,2130816,2159237,1759070,1858365,1870017,1917378,2021475,1650844,1857346,1850733,2053897

-Canada,Total all classes of electricity producer,Tidal power turbine (9),-124,-164,-13,1538,1615,1951,870,22,1791,1524,1979,1831

-Canada,Total all classes of electricity producer,Wind power turbine (10),1056298,749825,926052,833916,613052,470573,436665,478760,618761,909475,886835,873648

-Canada,Total all classes of electricity producer,Solar (11),11257,14463,12140,25538,29134,28737,31620,31496,27584,21070,17278,8498

-Canada,Total all classes of electricity producer,Other types of electricity generation,..,..,..,..,..,..,..,..,..,..,..,..

-Legend:

-..,Not available

-Footnotes:

-1,"For monthly data prior to January 2008, please see CANSIM table 127-0001 (terminated). For current monthly data on electric power generation, see also CANSIM table 127-0003."

-4,"Electric power generated from a plant in which the turbine generators are driven by flowing water. Prior to January 2008, hydro included wind and tidal generation. From January 2008 on, wind and tidal generation are reported separately."

-5,A power plant in which the prime mover is a steam turbine. The steam used to drive the turbine is produced in a boiler where fossil fuels or other combustible materials are burned.

-6,Electricity generated at an electric power plant whose turbines are driven by steam generated in a reactor by heat from the fission of nuclear fuel.

-7,A power plant in which the prime mover is an internal combustion turbine. Electric power is generated by the rapid burning of a fuel-air mixture into mechanical energy.

-8,A power plant in which the prime mover is a combustion turbine. Electric power is generated by the burning of a fuel into mechanical energy.

-9,Electric power generated from a plant in which the turbine generators are driven by rushing water.

-10,A power plant in which the prime mover is a wind turbine. Electric power is generated by the conversion of wind power into mechanical energy.

-11,Electricity created by using Photovoltaic (PV) technology by converting solar energy into solar electricity from sunlight.

-Source:

-"Statistics Canada. Table 127-0002 - Electric power generation, by class of electricity producer, monthly (megawatt hour)"

-"(accessed: January 05, 2017)"

diff --git a/data/raw/electricity/electricity_by_producer_class_all.csv b/data/raw/electricity/electricity_production_by_class_all.csv
index fbc7f64..fbc7f64 100644
--- a/data/raw/electricity/electricity_by_producer_class_all.csv
+++ b/data/raw/electricity/electricity_production_by_class_all.csv
diff --git a/data/raw/electricity/electricity_production_by_class_reduced.csv b/data/raw/electricity/electricity_production_by_class_reduced.csv
new file mode 100644
index 0000000..3924f87
--- /dev/null
+++ b/data/raw/electricity/electricity_production_by_class_reduced.csv
@@ -0,0 +1,28 @@
+"Table 127-0007 Electric power generation, by class of electricity producer, annual (megawatt hour)"

+Survey or program details:

+Annual Electricity Supply and Disposition Survey - 2194

+Geography,Class of electricity producer,Type of electricity generation,2011,2012,2013,2014,2015

+Canada,Total all classes of electricity producer,Hydraulic turbine (3),372076377,376574355,387980873,378786255,373844826

+Canada,Total all classes of electricity producer,Tidal power turbine (4),26095,27128,14830,15483,12820

+Canada,Total all classes of electricity producer,Wind power turbine (5),10086688,11198373,11033989,12688899,17112276

+Canada,Total all classes of electricity producer,Solar (10),256935,315843,360478,325184,344172

+Canada,Total all classes of electricity producer,Other types of electricity generation,2509521,2723937,2441392,2238903,5222312

+Canada,Total all classes of electricity producer,Conventional steam turbine (6),99411207,89871261,90388012,..,..

+Canada,Total all classes of electricity producer,Nuclear steam turbine (7),88291216,89492389,97584431,101207807,95682425

+Canada,Total all classes of electricity producer,Internal combustion turbine (8),1609096,1555195,1645827,..,..

+Canada,Total all classes of electricity producer,Combustion turbine (9),44283027,45330296,43756123,..,..

+Canada,Total all classes of electricity producer,Total electricity production from combustible fuels,,,,134318871,139463190

+Legend:

+..,Not available

+Footnotes:

+3,Electric power generated from a plant in which the turbine generators are driven by flowing water.

+4,Electric power generated from a plant in which the turbine generators are driven by rushing water.

+5,A power plant in which the prime mover is a wind turbine. Electric power is generated by the conversion of wind power into mechanical energy.

+6,A power plant in which the prime mover is a steam turbine. The steam used to drive the turbine is produced in a boiler where fossil fuels or other combustible materials are burned.

+7,Electricity generated at an electric power plant whose turbines are driven by steam generated in a reactor by heat from the fission of nuclear fuel.

+8,A power plant in which the prime mover is an internal combustion turbine. Electric power is generated by the rapid burning of a fuel-air mixture into mechanical energy.

+9,A power plant in which the prime mover is a combustion turbine. Electric power is generated by the burning of a fuel into mechanical energy.

+10,Electricity created by using Photovoltaic (PV) technology by converting solar energy into solar electricity from sunlight.

+Source:

+"Statistics Canada. Table 127-0007 - Electric power generation, by class of electricity producer, annual (megawatt hour)"

+"(accessed: January 06, 2017)"