meeting 0.0.5 → 0.0.6

data/features/meeting_committees.feature

@@ -27,6 +27,12 @@ Feature: Meeting Committee Calculations
     Then the committee should have used quorum "from state"
     And the conclusion of the committee should have "number" of "9"
 
+  Scenario: eGRID subregion committee from default
+    Given a meeting emitter
+    When the "egrid_subregion" committee is calculated
+    Then the committee should have used quorum "default"
+    And the conclusion of the committee should have "abbreviation" of "US"
+
   Scenario: eGRID subregion committee from zip code
     Given a meeting emitter
     And a characteristic "zip_code.name" of "94122"
@@ -34,6 +40,13 @@ Feature: Meeting Committee Calculations
     Then the committee should have used quorum "from zip code"
     And the conclusion of the committee should have "abbreviation" of "CAMX"
 
+  Scenario: eGRID region committee from nothing
+    Given a meeting emitter
+    When the "egrid_subregion" committee is calculated
+    And the "egrid_region" committee is calculated
+    Then the committee should have used quorum "from eGRID subregion"
+    And the conclusion of the committee should have "name" of "US"
+
   Scenario: eGRID region committee from eGRID subregion
     Given a meeting emitter
     And a characteristic "egrid_subregion.abbreviation" of "CAMX"
@@ -56,25 +69,21 @@ Feature: Meeting Committee Calculations
 
   Scenario: Electricity intensity committee from default
     Given a meeting emitter
-    When the "electricity_intensity" committee is calculated
-    Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "0.072444"
-
-  Scenario: Electricity intensity committee from eGRID region
-    Given a meeting emitter
-    And a characteristic "zip_code.name" of "94122"
     When the "egrid_subregion" committee is calculated
     And the "egrid_region" committee is calculated
     And the "electricity_intensity" committee is calculated
     Then the committee should have used quorum "from eGRID region"
-    And the conclusion of the committee should be "0.080493"
+    And the conclusion of the committee should be "0.07626"
 
-  Scenario: Electricity intensity committee from census division
+  Scenario: Electricity intensity committee from state
     Given a meeting emitter
-    And a characteristic "census_division.number" of "9"
-    When the "electricity_intensity" committee is calculated
-    Then the committee should have used quorum "from census division"
-    And the conclusion of the committee should be "3"
+    And a characteristic "state.postal_abbreviation" of "CA"
+    When the "census_division" committee is calculated
+    And the "egrid_subregion" committee is calculated
+    And the "egrid_region" committee is calculated
+    And the "electricity_intensity" committee is calculated
+    Then the committee should have used quorum "from eGRID region and census division"
+    And the conclusion of the committee should be "3.15789"
 
   Scenario: Electricity intensity committee from eGRID region and census division
     Given a meeting emitter
@@ -115,29 +124,21 @@ Feature: Meeting Committee Calculations
 
   Scenario: Emission factor committee from nothing
     Given a meeting emitter
-    When the "natural_gas_intensity" committee is calculated
-    And the "fuel_oil_intensity" committee is calculated
-    And the "electricity_intensity" committee is calculated
-    And the "district_heat_intensity" committee is calculated
-    And the "emission_factor" committee is calculated
-    Then the committee should have used quorum "from fuel intensities"
-    And the conclusion of the committee should be "0.15470"
-
-  Scenario: Emission factor committee from census division
-    Given a meeting emitter
-    And a characteristic "census_division.number" of "9"
-    When the "natural_gas_intensity" committee is calculated
+    When the "egrid_subregion" committee is calculated
+    And the "egrid_region" committee is calculated
+    And the "natural_gas_intensity" committee is calculated
     And the "fuel_oil_intensity" committee is calculated
     And the "electricity_intensity" committee is calculated
     And the "district_heat_intensity" committee is calculated
     And the "emission_factor" committee is calculated
-    Then the committee should have used quorum "from fuel intensities"
-    And the conclusion of the committee should be "8.50002"
+    Then the committee should have used quorum "from eGRID subregion and fuel intensities"
+    And the conclusion of the committee should be "0.16232"
 
-  Scenario: Emission factor committee from eGRID subregion
+  Scenario: Emission factor committee from state
     Given a meeting emitter
-    And a characteristic "zip_code.name" of "94122"
-    When the "egrid_subregion" committee is calculated
+    And a characteristic "state.postal_abbreviation" of "CA"
+    When the "census_division" committee is calculated
+    And the "egrid_subregion" committee is calculated
     And the "egrid_region" committee is calculated
     And the "natural_gas_intensity" committee is calculated
     And the "fuel_oil_intensity" committee is calculated
@@ -145,9 +146,9 @@ Feature: Meeting Committee Calculations
     And the "district_heat_intensity" committee is calculated
     And the "emission_factor" committee is calculated
     Then the committee should have used quorum "from eGRID subregion and fuel intensities"
-    And the conclusion of the committee should be "0.09030"
+    And the conclusion of the committee should be "8.81581"
 
-  Scenario: Emission factor committee from eGRID subregion and census division
+  Scenario: Emission factor committee from zip code
     Given a meeting emitter
     And a characteristic "zip_code.name" of "94122"
     When the "state" committee is calculated

data/features/meeting_emissions.feature

@@ -4,22 +4,22 @@ Feature: Meeting Emissions Calculations
   Scenario: Calculations starting from nothing
     Given a meeting has nothing
     When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "1465.9"
+    Then the emission value should be within "0.1" kgs of "1538.2"
 
   Scenario: Calculations starting from duration
     Given a meeting has "duration" of "1"
     When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "183.2"
+    Then the emission value should be within "0.1" kgs of "192.3"
 
   Scenario: Calculations starting from area
     Given a meeting has "area" of "1000"
     When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "1237.6"
+    Then the emission value should be within "0.1" kgs of "1298.6"
 
   Scenario: Calculations starting from state
     Given a meeting has "state.postal_abbreviation" of "CA"
     When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "80547.2"
+    Then the emission value should be within "0.1" kgs of "83539.6"
 
   Scenario: Calculations starting from zip code
     Given a meeting has "zip_code.name" of "94122"

data/lib/meeting/carbon_model.rb

@@ -39,31 +39,6 @@ module BrighterPlanet
                 (characteristics[:electricity_intensity] * characteristics[:egrid_subregion].electricity_emission_factor) +
                 (characteristics[:district_heat_intensity] * district_heat_emission_factor)
             end
-            
-            quorum 'from fuel intensities', :needs => [:natural_gas_intensity, :fuel_oil_intensity, :electricity_intensity, :district_heat_intensity] do |characteristics|
-              natural_gas = FuelType.find_by_name "Commercial Natural Gas"
-              fuel_oil = FuelType.find_by_name "Distillate Fuel Oil 2"
-              electricity = ResidenceFuelType.find_by_name "electricity"
-              
-              # FIXME TODO won't need this once we convert emission factors to co2 / unit energy
-              #   kg / J                           kg / cubic m     J / cubic m
-              natural_gas_energy_ef = natural_gas.emission_factor / 38_339_000
-              
-              # FIXME TODO won't need this once we convert emission factors to co2 / unit energy
-              #   kg / J                        kg / l           J / l
-              fuel_oil_energy_ef = fuel_oil.emission_factor / 38_655_000
-              
-              # based on CA-CP calculator
-              # assume district heat is 50% natural gas 50% distillate fuel
-              # assume natural gas boilers 81.7% efficient; fuel oil boilers 84.6% efficient
-              # assume 5% transmission loss
-              district_heat_emission_factor = (((natural_gas_energy_ef / 0.817) / 2) + ((fuel_oil_energy_ef / 0.846) / 2)) / 0.95
-              
-              (characteristics[:natural_gas_intensity] * natural_gas.emission_factor) +
-                (characteristics[:fuel_oil_intensity] * fuel_oil.emission_factor) +
-                (characteristics[:electricity_intensity] * electricity.emission_factor) +
-                (characteristics[:district_heat_intensity] * district_heat_emission_factor)
-            end
           end
           
           committee :natural_gas_intensity do # returns cubic metres per square metre hour
@@ -91,17 +66,9 @@ module BrighterPlanet
               characteristics[:census_division].meeting_building_electricity_intensity / (1 - characteristics[:egrid_region].loss_factor)
             end
             
-            quorum 'from census division', :needs => :census_division do |characteristics|
-              characteristics[:census_division].meeting_building_electricity_intensity
-            end
-            
             quorum 'from eGRID region', :needs => :egrid_region do |characteristics|
               CensusDivision.fallback.meeting_building_electricity_intensity / (1 - characteristics[:egrid_region].loss_factor)
             end
-            
-            quorum 'default' do
-              CensusDivision.fallback.meeting_building_electricity_intensity
-            end
           end
           
           committee :district_heat_intensity do # returns joules per square metre hour
@@ -124,6 +91,10 @@ module BrighterPlanet
             quorum 'from zip code', :needs => :zip_code do |characteristics|
               characteristics[:zip_code].egrid_subregion
             end
+            
+            quorum 'default' do
+              EgridSubregion.find_by_abbreviation 'US'
+            end
           end
           
           committee :census_division do # returns census division

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meeting
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -164,6 +164,22 @@ dependencies:
         version: 0.1.4
   type: :runtime
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: earth
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  type: :runtime
+  version_requirements: *id010
 description: A software model in Ruby for the greenhouse gas emissions of a meeting
 email: andy@rossmeissl.net
 executables: []