earth 0.12.0 → 0.12.1

data/lib/earth/automobile/automobile_type_fuel_year_control.rb

@@ -5,11 +5,11 @@ class AutomobileTypeFuelYearControl < ActiveRecord::Base
   belongs_to :type_fuel_control, :foreign_key => :type_fuel_control_name, :class_name => 'AutomobileTypeFuelControl'
   
   # Used by AutomobileTypeFuelYear
-  def self.find_all_by_type_name_and_fuel_common_name_and_closest_year(type_name, fuel_common_name, year)
+  def self.find_all_by_type_name_and_fuel_group_and_closest_year(type_name, fuel_group, year)
     if year > maximum(:year)
-      where(:type_name => type_name, :fuel_common_name => fuel_common_name, :year => maximum(:year))
+      where(:type_name => type_name, :fuel_group => fuel_group, :year => maximum(:year))
     else
-      where(:type_name => type_name, :fuel_common_name => fuel_common_name, :year => [year, minimum(:year)].max)
+      where(:type_name => type_name, :fuel_group => fuel_group, :year => [year, minimum(:year)].max)
     end
   end
   
@@ -26,7 +26,7 @@ class AutomobileTypeFuelYearControl < ActiveRecord::Base
   
   col :name
   col :type_name
-  col :fuel_common_name
+  col :fuel_group
   col :year, :type => :integer
   col :control_name
   col :type_fuel_control_name

data/lib/earth/automobile/automobile_type_fuel_year_control/data_miner.rb

@@ -8,10 +8,10 @@ AutomobileTypeFuelYearControl.class_eval do
            :url => "file://#{Earth::DATA_DIR}/automobile/annual_emission_controls.csv" do
       key   'name'
       store 'type_name'
-      store 'fuel_common_name'
+      store 'fuel_group'
       store 'year'
       store 'control_name'
-      store 'type_fuel_control_name', :synthesize => proc { |row| [row['type_name'], row['fuel_common_name'], row['control_name']].join(' ') }
+      store 'type_fuel_control_name', :synthesize => proc { |row| [row['type_name'], row['fuel_group'], row['control_name']].join(' ') }
       store 'total_travel_percent'
     end
   end

data/lib/earth/conversions_ext.rb

@@ -59,6 +59,8 @@ Conversions.register :megajoules_per_room_night,            :kbtus_per_room_nigh
 Conversions.register :million_btu_per_barrel,               :megajoules_per_litre,                    (1_000_000.btus.to(:megajoules) / 1.barrels.to(:litres)) # Fuel
 Conversions.register :btus_per_cubic_foot,                  :megajoules_per_cubic_metre,              (1.btus.to(:megajoules) / 1.cubic_feet.to(:cubic_metres)) # Fuel
 Conversions.register :teragrams_per_quadrillion_btu,        :grams_per_megajoule,                     (1_000_000_000_000 / 1_000_000_000_000_000.btus.to(:megajoules)) # Fuel
+Conversions.register :kilometres_per_hour,                  :miles_per_hour,                          1.kilometres.to(:miles)
+
 
 # Odd units for EPA fuel economy guide
 # Conversions.register :epa_gallon_gasoline_equivalents,          :kilowatt_hours,                        33.705

data/lib/earth/industry/industry.rb

@@ -1,5 +1,3 @@
-require 'earth/locality'
-
 # TODO replace this with NAICS 2002?
 class Industry < ActiveRecord::Base
   self.primary_key = "naics_code"

data/lib/earth/industry/industry/data_miner.rb

@@ -1,8 +1,11 @@
-require 'earth/locality/data_miner'
 Industry.class_eval do
   data_miner do
+    process "Start from scratch" do
+      delete_all
+    end
+    
     import "the U.S. Census 2002 NAICS code list",
-           :url => 'http://www.census.gov/epcd/naics02/naicod02.txt',
+           :url => 'http://www.census.gov/eos/www/naics/reference_files_tools/2002/naics_2_6_02.txt',
            :skip => 4,
            :headers => false,
            :delimiter => '	' do

data/lib/earth/locality/census_division.rb

@@ -9,7 +9,8 @@ class CensusDivision < ActiveRecord::Base
   has_many :residential_energy_consumption_survey_responses, :foreign_key => 'census_division_number'
   
   # https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdFJ3U3VaSG1oQW1yclY3M3FsRzRDNFE&hl=en&output=html
-  falls_back_on :meeting_building_natural_gas_intensity => 0.0004353615 * 100.cubic_feet.to(:cubic_metres) / 1.square_feet.to(:square_metres),
+  falls_back_on :name => 'fallback',
+                :meeting_building_natural_gas_intensity => 0.0004353615 * 100.cubic_feet.to(:cubic_metres) / 1.square_feet.to(:square_metres),
                 :meeting_building_fuel_oil_intensity => 0.0000925593.gallons.to(:litres) / 1.square_feet.to(:square_metres),
                 :meeting_building_electricity_intensity => 0.0084323684 / 1.square_feet.to(:square_metres),
                 :meeting_building_district_heat_intensity => 0.0004776370.kbtus.to(:megajoules) / 1.square_feet.to(:square_metres)

data/lib/earth/locality/country.rb

@@ -1,4 +1,5 @@
 require 'earth/automobile'
+require 'earth/fuel'
 require 'earth/hospitality'
 require 'earth/rail'
 
@@ -46,10 +47,6 @@ class Country < ActiveRecord::Base
     find_by_iso_3166_code('US')
   end
   
-  def united_states?
-    iso_3166_code == 'US'
-  end
-  
   col :iso_3166_code                            # alpha-2 2-letter like GB
   col :iso_3166_numeric_code, :type => :integer # numeric like 826; aka UN M49 code
   col :iso_3166_alpha_3_code                    # 3-letter like GBR
@@ -91,8 +88,7 @@ class Country < ActiveRecord::Base
   col :rail_trip_diesel_intensity_units
   col :rail_trip_co2_emission_factor, :type => :float
   col :rail_trip_co2_emission_factor_units
-
-  warn_if_nulls_except /heating/, /cooling/
-
+  
   warn_unless_size 249
+  warn_if_nulls_except /heating/, /cooling/
 end

data/lib/earth/locality/country/data_miner.rb

@@ -1,4 +1,5 @@
 require 'earth/automobile/data_miner'
+require 'earth/fuel/data_miner'
 require 'earth/hospitality/data_miner'
 require 'earth/rail/data_miner'
 
@@ -19,7 +20,7 @@ Country.class_eval do
     end
     
     import "heating and cooling degree day data from WRI CAIT",
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDN4MkRTSWtWRjdfazhRdWllTkVSMkE&output=csv',
+           :url => "file://#{Earth::DATA_DIR}/locality/wri_hdd_cdd_data.csv",
            :select => proc { |record| record['country'] != 'European Union (27)' },
            :errata => { :url => "file://#{Earth::ERRATA_DIR}/country/wri_errata.csv" } do
       key 'name', :field_name => 'country'
@@ -28,61 +29,38 @@ Country.class_eval do
     end
     
     process "set Montenegro's heating and cooling degree days to the same as Serbia's" do
-      montenegro = Country.find 'ME'
       serbia = Country.find 'RS'
-      montenegro.heating_degree_days = serbia.heating_degree_days
-      montenegro.heating_degree_days_units = serbia.heating_degree_days_units
-      montenegro.cooling_degree_days = serbia.cooling_degree_days
-      montenegro.cooling_degree_days_units = serbia.cooling_degree_days_units
-      montenegro.save!
+      Country.find('ME').update_attributes!(
+        :heating_degree_days => serbia.heating_degree_days,
+        :heating_degree_days_units => serbia.heating_degree_days_units,
+        :cooling_degree_days => serbia.cooling_degree_days,
+        :cooling_degree_days_units => serbia.cooling_degree_days_units
+      )
     end
     
     # AUTOMOBILE
     import "automobile-related data for the US",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDdZRm1tNjY0c2dYNG00bXJ3TXRqUVE&gid=0&output=csv' do
+           :url => "file://#{Earth::DATA_DIR}/locality/us_auto_data.csv" do
       key 'iso_3166_code'
       store 'automobile_urbanity'
-      store 'automobile_city_speed',    :units_field_name => 'automobile_city_speed_units'
-      store 'automobile_highway_speed', :units_field_name => 'automobile_highway_speed_units'
-      store 'automobile_trip_distance', :units_field_name => 'automobile_trip_distance_units'
+      store 'automobile_city_speed',    :from_units => :miles_per_hour, :to_units => :kilometres_per_hour
+      store 'automobile_highway_speed', :from_units => :miles_per_hour, :to_units => :kilometres_per_hour
+      store 'automobile_trip_distance', :from_units => :miles, :to_units => :kilometres
     end
     
-    process "Ensure AutomobileTypeFuelYear is populated" do
-      AutomobileTypeFuelYear.run_data_miner!
+    process "Ensure AutomobileActivityYearTypeFuel is populated" do
+      AutomobileActivityYearTypeFuel.run_data_miner!
     end
     
-    process "Derive US average automobile fuel efficiency from AutomobileTypeFuelYear" do
-      fuel_years = AutomobileTypeFuelYear.where(:year => AutomobileTypeFuelYear.maximum(:year))
+    process "Derive US average automobile fuel efficiency from AutomobileActivityYearTypeFuel" do
+      max_year = AutomobileActivityYearTypeFuel.maximum(:activity_year)
+      fuel_years = AutomobileActivityYearTypeFuel.where("activity_year = #{max_year} AND fuel_consumption IS NOT NULL")
       where(:iso_3166_code => 'US').update_all(
-        :automobile_fuel_efficiency => (fuel_years.sum(:total_travel).to_f / fuel_years.sum(:fuel_consumption)),
-        :automobile_fuel_efficiency_units => (fuel_years.first.total_travel_units + '_per_' + fuel_years.first.fuel_consumption_units.singularize)
+        :automobile_fuel_efficiency => (fuel_years.sum(:distance).to_f / fuel_years.sum(:fuel_consumption)),
+        :automobile_fuel_efficiency_units => (fuel_years.first.distance_units + '_per_' + fuel_years.first.fuel_consumption_units.singularize)
       )
     end
     
-    process "Convert automobile city speed from miles per hour to kilometres per hour" do
-      conversion_factor = 1.miles.to(:kilometres)
-      where(:automobile_city_speed_units => 'miles_per_hour').update_all(%{
-        automobile_city_speed = 1.0 * automobile_city_speed * #{conversion_factor},
-        automobile_city_speed_units = 'kilometres_per_hour'
-      })
-    end
-    
-    process "Convert automobile highway speed from miles per hour to kilometres per hour" do
-      conversion_factor = 1.miles.to(:kilometres)
-      where(:automobile_highway_speed_units => 'miles_per_hour').update_all(%{
-        automobile_highway_speed = 1.0 * automobile_highway_speed * #{conversion_factor},
-        automobile_highway_speed_units = 'kilometres_per_hour'
-      })
-    end
-    
-    process "Convert automobile trip distance from miles to kilometres" do
-      conversion_factor = 1.miles.to(:kilometres)
-      where(:automobile_trip_distance_units => 'miles').update_all(%{
-        automobile_trip_distance = 1.0 * automobile_trip_distance * #{conversion_factor},
-        automobile_trip_distance_units = 'kilometres'
-      })
-    end
-    
     # ELECTRICITY
     process "Ensure GreehouseGas is populated" do
       GreenhouseGas.run_data_miner!
@@ -106,25 +84,23 @@ Country.class_eval do
     end
     
     process "Derive average US electricity emission factor and loss factor from eGRID" do
-      us = united_states
-      us.electricity_emission_factor = EgridSubregion.fallback.electricity_emission_factor
-      us.electricity_emission_factor_units = EgridSubregion.fallback.electricity_emission_factor_units
-      us.electricity_loss_factor = EgridRegion.fallback.loss_factor
-      us.save!
+      united_states.update_attributes!(
+        :electricity_emission_factor =>       EgridSubregion.fallback.electricity_emission_factor,
+        :electricity_emission_factor_units => EgridSubregion.fallback.electricity_emission_factor_units,
+        :electricity_loss_factor =>           EgridRegion.fallback.loss_factor
+      )
     end
     
     # FLIGHT
     import "country-specific flight route inefficiency factors derived from Kettunen et al. (2005)",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdEJoRVBZaGhnUmlhX240VXE3X0F3WkE&output=csv' do
+           :url => "file://#{Earth::DATA_DIR}/locality/country_flight_data.csv" do
       key   'iso_3166_code'
       store 'flight_route_inefficiency_factor'
     end
     
     # HOSPITALITY
     process "Define US average lodging occupancy rate" do
-      country = united_states
-      country.lodging_occupancy_rate = 0.601 # per http://www.pwc.com/us/en/press-releases/2012/pwc-us-lodging-industry-forecast.jhtml
-      country.save!
+      united_states.update_attributes! :lodging_occupancy_rate => 0.601 # per http://www.pwc.com/us/en/press-releases/2012/pwc-us-lodging-industry-forecast.jhtml
     end
     
     process "Ensure CountryLodgingClass is populated" do
@@ -133,16 +109,17 @@ Country.class_eval do
     
     process "Derive average hotel characteristics from CountryLodgingClass" do
       find_each do |country|
-        if country.lodging_classes.any?
-          country.lodging_natural_gas_intensity = country.lodging_classes.weighted_average(:natural_gas_intensity)
-          country.lodging_natural_gas_intensity_units = 'cubic_metres_per_occupied_room_night' # FIXME TODO derive this
-          country.lodging_fuel_oil_intensity = country.lodging_classes.weighted_average(:fuel_oil_intensity)
-          country.lodging_fuel_oil_intensity_units = 'gallons_per_occupied_room_night' # FIXME TODO derive this
-          country.lodging_electricity_intensity = country.lodging_classes.weighted_average(:electricity_intensity)
-          country.lodging_electricity_intensity_units = 'kilowatt_hours_per_occupied_room_night' # FIXME TODO derive this
-          country.lodging_district_heat_intensity = country.lodging_classes.weighted_average(:district_heat_intensity)
-          country.lodging_district_heat_intensity_units = 'megajoules_per_occupied_room_night' # FIXME TODO derive this
-          country.save!
+        if (lodging_classes = country.lodging_classes).any?
+          country.update_attributes!(
+            :lodging_natural_gas_intensity         => lodging_classes.weighted_average(:natural_gas_intensity),
+            :lodging_fuel_oil_intensity            => lodging_classes.weighted_average(:fuel_oil_intensity),
+            :lodging_electricity_intensity         => lodging_classes.weighted_average(:electricity_intensity),
+            :lodging_district_heat_intensity       => lodging_classes.weighted_average(:district_heat_intensity),
+            :lodging_natural_gas_intensity_units   => 'cubic_metres_per_occupied_room_night', # FIXME TODO derive this
+            :lodging_fuel_oil_intensity_units      => 'litres_per_occupied_room_night', # FIXME TODO derive this
+            :lodging_electricity_intensity_units   => 'kilowatt_hours_per_occupied_room_night', # FIXME TODO derive this
+            :lodging_district_heat_intensity_units => 'megajoules_per_occupied_room_night' # FIXME TODO derive this
+          )
         end
       end
     end
@@ -155,13 +132,14 @@ Country.class_eval do
     
     process "Calculate rail passengers, trip distance, and speed from RailCompany" do
       find_each do |country|
-        if country.rail_companies.any?
-          country.rail_passengers = country.rail_companies.sum(:passengers)
-          country.rail_trip_distance = country.rail_companies.weighted_average(:trip_distance, :weighted_by => :passengers)
-          country.rail_trip_distance_units = 'kilometres' if country.rail_trip_distance.present?
-          country.rail_speed = country.rail_companies.weighted_average(:speed, :weighted_by => :passengers)
-          country.rail_speed_units = 'kilometres_per_hour' if country.rail_speed.present?
-          country.save!
+        if (rail_companies = country.rail_companies).any?
+          country.update_attributes!(
+            :rail_passengers          => rail_companies.sum(:passengers),
+            :rail_trip_distance       => rail_companies.weighted_average(:trip_distance, :weighted_by => :passengers),
+            :rail_speed               => rail_companies.weighted_average(:speed, :weighted_by => :passengers),
+            :rail_trip_distance_units => ('kilometres' if country.rail_trip_distance.present?),
+            :rail_speed_units         => ('kilometres_per_hour' if country.rail_speed.present?)
+          )
         end
       end
     end
@@ -190,14 +168,15 @@ Country.class_eval do
     end
     
     process "Derive US rail fuel and emission data from RailCompany" do
-      country = united_states
-      country.rail_trip_electricity_intensity = country.rail_companies.weighted_average(:electricity_intensity, :weighted_by => :passengers)
-      country.rail_trip_electricity_intensity_units = 'kilowatt_hours_per_passenger_kilometre'
-      country.rail_trip_diesel_intensity = country.rail_companies.weighted_average(:diesel_intensity, :weighted_by => :passengers)
-      country.rail_trip_diesel_intensity_units = 'litres_per_passenger_kilometre'
-      country.rail_trip_co2_emission_factor = country.rail_companies.weighted_average(:co2_emission_factor, :weighted_by => :passengers)
-      country.rail_trip_co2_emission_factor_units = 'kilograms_per_passenger_kilometre'
-      country.save!
+      rail_companies = united_states.rail_companies
+      united_states.update_attributes!(
+        :rail_trip_electricity_intensity       => rail_companies.weighted_average(:electricity_intensity, :weighted_by => :passengers),
+        :rail_trip_diesel_intensity            => rail_companies.weighted_average(:diesel_intensity, :weighted_by => :passengers),
+        :rail_trip_co2_emission_factor         => rail_companies.weighted_average(:co2_emission_factor, :weighted_by => :passengers),
+        :rail_trip_electricity_intensity_units => 'kilowatt_hours_per_passenger_kilometre',
+        :rail_trip_diesel_intensity_units      => 'litres_per_passenger_kilometre',
+        :rail_trip_co2_emission_factor_units   => 'kilograms_per_passenger_kilometre'
+      )
     end
   end
 end

data/lib/earth/locality/egrid_country.rb

@@ -3,15 +3,21 @@ class EgridCountry < ActiveRecord::Base
   
   class << self
     def us
-      find_by_name 'US'
+      find_by_name 'U.S.'
     end
   end
   
   col :name
   col :generation, :type => :float
   col :generation_units
-  col :imports, :type => :float
-  col :imports_units
+  col :foreign_interchange, :type => :float
+  col :foreign_interchange_units
+  col :domestic_interchange, :type => :float
+  col :domestic_interchange_units
   col :consumption, :type => :float
   col :consumption_units
+  col :loss_factor, :type => :float
+  
+  warn_unless_size 1
+  warn_if_any_nulls
 end

data/lib/earth/locality/egrid_country/data_miner.rb

@@ -1,13 +1,19 @@
 EgridCountry.class_eval do
   data_miner do
-    import "the US average grid loss factor derived eGRID 2007 data",
-           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2010V1_1_STIE_USGC.xls',
-           :sheet => 'USGC',
-           :skip => 5 do
-      key 'name', :static => 'US'
-      store 'generation',  :field_name => 'USTNGN07', :units => :gigawatt_hours
-      store 'imports',     :field_name => 'USTNFI07', :units => :gigawatt_hours
-      store 'consumption', :field_name => 'USTCON07', :units => :gigawatt_hours
+    import "eGRID 2012 national-level data",
+           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2012V1_0_year09_DATA.xls',
+           :sheet => 'GGL09',
+           :skip => 4,
+           :select => proc { |row| row['REGION'] == 'U.S.' } do
+      key 'name',                   :field_name => 'REGION'
+      store 'generation',           :field_name => 'GENERAT',  :units => :megawatt_hours
+      store 'foreign_interchange',  :field_name => 'FRGNINTC', :units => :megawatt_hours
+      store 'domestic_interchange', :field_name => 'INTRCHNG', :units => :megawatt_hours
+      store 'consumption',          :field_name => 'CONSUMP',  :units => :megawatt_hours
+    end
+    
+    process "Calculate loss factor" do
+      update_all "loss_factor = (1.0 * generation + foreign_interchange + domestic_interchange - consumption) / generation"
     end
   end
 end

data/lib/earth/locality/egrid_region.rb

@@ -1,17 +1,26 @@
+require 'earth/locality/egrid_country'
+
 class EgridRegion < ActiveRecord::Base
   self.primary_key = "name"
   
-  # make EgridCountry a parent so that it automatically gets data_mined (need it for fallback calculation)
+  # EgridCountry must be a parent so that it automatically gets data_mined (needed for fallback calculation)
   belongs_to :egrid_country, :foreign_key => 'country_name'
   has_many :egrid_subregions, :foreign_key => 'egrid_region_name'
   
   falls_back_on :name => 'fallback',
-                :loss_factor => lambda { (EgridCountry.us.generation + EgridCountry.us.imports - EgridCountry.us.consumption) / EgridCountry.us.generation }
+                :loss_factor => lambda { EgridCountry.us.loss_factor }
   
   col :name
-  col :country_name
+  col :generation, :type => :float
+  col :generation_units
+  col :foreign_interchange, :type => :float
+  col :foreign_interchange_units
+  col :domestic_interchange, :type => :float
+  col :domestic_interchange_units
+  col :consumption, :type => :float
+  col :consumption_units
   col :loss_factor, :type => :float
-
-  warn_unless_size 6
-  warn_if_blanks_except :country_name, :conditions => { :name => 'US' }
+  
+  warn_unless_size 5
+  warn_if_any_nulls
 end

data/lib/earth/locality/egrid_region/data_miner.rb

@@ -1,27 +1,23 @@
 EgridRegion.class_eval do
   data_miner do
-    import "eGRID 2010 regions and loss factors",
-           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2010V1_1_STIE_USGC.xls',
-           :sheet => 'STIE07',
-           :skip => 4,
-           :select => proc { |row| row['eGRID2010 year 2007 file state sequence number'].to_i.between?(1, 51) } do
-      key   'name', :field_name => 'Grid region (E=Eastern grid, W=Western grid, AK=Alaska, HI=Hawaii, TX=Texas)'
-      store 'country_name', :static => 'US'
-      store 'loss_factor', :field_name => 'Year 2007 grid gross loss factor'
+    process "Start from scratch" do
+      delete_all
     end
     
-    # DEPRECATED but don't remove until confirmed that all emitters use EgridRegion.fallback rather than EgridRegion.find_by_abbreviation 'US'
-    # (ElectricityUse and Meeting)
-    process "Ensure EgridCountry is populated" do
-      EgridCountry.run_data_miner!
+    import "eGRID 2012 region data",
+           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2012V1_0_year09_DATA.xls',
+           :sheet => 'GGL09',
+           :skip => 4,
+           :select => proc { |row| row['REGION'] != 'U.S.' } do
+      key   'name',                 :field_name => 'REGION'
+      store 'generation',           :field_name => 'GENERAT',  :units => :megawatt_hours
+      store 'foreign_interchange',  :field_name => 'FRGNINTC', :units => :megawatt_hours
+      store 'domestic_interchange', :field_name => 'INTRCHNG', :units => :megawatt_hours
+      store 'consumption',          :field_name => 'CONSUMP',  :units => :megawatt_hours
     end
     
-    # DEPRECATED but don't remove until confirmed that all emitters use EgridRegion.fallback rather than EgridRegion.find_by_abbreviation 'US'
-    # (ElectricityUse and Meeting)
-    process "Calculate national averages" do
-      us_average = find_or_create_by_name 'US'
-      us_average.loss_factor = (EgridCountry.us.generation + EgridCountry.us.imports - EgridCountry.us.consumption) / EgridCountry.us.generation
-      us_average.save!
+    process "Calculate loss factor" do
+      update_all "loss_factor = (1.0 * generation + foreign_interchange + domestic_interchange - consumption) / generation"
     end
   end
 end

data/lib/earth/locality/egrid_subregion.rb

@@ -1,4 +1,5 @@
-require 'earth/fuel'
+require 'earth/locality/egrid_region'
+
 class EgridSubregion < ActiveRecord::Base
   self.primary_key = "abbreviation"
   
@@ -7,14 +8,14 @@ class EgridSubregion < ActiveRecord::Base
   
   falls_back_on :name => 'fallback',
                 :egrid_region => lambda { EgridRegion.fallback },
-                :electricity_co2_emission_factor => lambda { weighted_average(:electricity_co2_emission_factor, :weighted_by => :net_generation) },
-                :electricity_co2_emission_factor_units => 'kilograms_per_kilowatt_hour',
-                :electricity_co2_biogenic_emission_factor => lambda { weighted_average(:electricity_co2_biogenic_emission_factor, :weighted_by => :net_generation) },
-                :electricity_co2_biogenic_emission_factor_units => 'kilograms_per_kilowatt_hour',
-                :electricity_ch4_emission_factor => lambda { weighted_average(:electricity_ch4_emission_factor, :weighted_by => :net_generation) },
-                :electricity_ch4_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour',
-                :electricity_n2o_emission_factor => lambda { weighted_average(:electricity_n2o_emission_factor, :weighted_by => :net_generation) },
-                :electricity_n2o_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour',
+                :co2_emission_factor => lambda { weighted_average(:co2_emission_factor, :weighted_by => :net_generation) },
+                :co2_emission_factor_units => 'kilograms_per_kilowatt_hour',
+                :co2_biogenic_emission_factor => lambda { weighted_average(:co2_biogenic_emission_factor, :weighted_by => :net_generation) },
+                :co2_biogenic_emission_factor_units => 'kilograms_per_kilowatt_hour',
+                :ch4_emission_factor => lambda { weighted_average(:ch4_emission_factor, :weighted_by => :net_generation) },
+                :ch4_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour',
+                :n2o_emission_factor => lambda { weighted_average(:n2o_emission_factor, :weighted_by => :net_generation) },
+                :n2o_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour',
                 :electricity_emission_factor => lambda { weighted_average(:electricity_emission_factor, :weighted_by => :net_generation) },
                 :electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour'
   
@@ -24,16 +25,17 @@ class EgridSubregion < ActiveRecord::Base
   col :egrid_region_name
   col :net_generation, :type => :float
   col :net_generation_units
-  col :electricity_co2_emission_factor, :type => :float
-  col :electricity_co2_emission_factor_units
-  col :electricity_co2_biogenic_emission_factor, :type => :float
-  col :electricity_co2_biogenic_emission_factor_units
-  col :electricity_ch4_emission_factor, :type => :float
-  col :electricity_ch4_emission_factor_units
-  col :electricity_n2o_emission_factor, :type => :float
-  col :electricity_n2o_emission_factor_units
+  col :co2_emission_factor, :type => :float
+  col :co2_emission_factor_units
+  col :co2_biogenic_emission_factor, :type => :float
+  col :co2_biogenic_emission_factor_units
+  col :ch4_emission_factor, :type => :float
+  col :ch4_emission_factor_units
+  col :n2o_emission_factor, :type => :float
+  col :n2o_emission_factor_units
   col :electricity_emission_factor, :type => :float
   col :electricity_emission_factor_units
-
-  warn_unless_size 27
+  
+  warn_unless_size 26
+  warn_if_any_nulls
 end