MMBTUs, flow characterization depends on context, tweaks

AntelopeLCA · Dec 24, 2024 · d4adcc0 · d4adcc0
1 parent 97d49ab
commit d4adcc0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/antelope_core/archives/data/elcd_reference_quantities.json b/antelope_core/archives/data/elcd_reference_quantities.json
@@ -570,7 +570,9 @@
         "MWh": 0.0002777777777777778,
         "TCE": 3.412084237535657e-05,
         "TOE": 2.3884589662749594e-05,
-        "btu": 947.8169879134379,
+        "Btu": 947.8169879134379,
+        "MMBtu": 9.478169879134379e-04,
+        "mmBtu": 9.478169879134379e-04,
         "kWh": 0.2777777777777778,
         "kcal": 238.85160149998808
       },
@@ -671,7 +673,9 @@
         "MWh": 0.0002777777777777778,
         "TCE": 3.412084237535657e-05,
         "TOE": 2.3884589662749594e-05,
-        "btu": 947.8169879134379,
+        "Btu": 947.8169879134379,
+        "MMBtu": 9.478169879134379e-04,
+        "mmBtu": 9.478169879134379e-04,
         "kWh": 0.2777777777777778,
         "kcal": 238.85160149998808
       },

diff --git a/antelope_core/contexts.py b/antelope_core/contexts.py
@@ -113,6 +113,9 @@ def __iter__(self):
         for k in self.as_list():
             yield k
 
+    def __bool__(self):
+        return not self.is_null
+
     def __hash__(self):
         return hash(self._id)  # don't mess with the hash
 

diff --git a/antelope_core/entities/flows.py b/antelope_core/entities/flows.py
@@ -81,8 +81,13 @@ def __str__(self):
 
     def characterize(self, quantity, value, context=None, origin=None, location='GLO', **kwargs):
         if context is None:
-            context = self.context
-        flowable = self.name
+            if bool(self.context):
+                context = self.context
+                flowable = self.name
+            else:
+                flowable = self.link
+        else:
+            flowable = self.name
         if origin is None:
             origin = self.origin
         self.pop_char(quantity, context, location)

diff --git a/antelope_core/fragment_flows.py b/antelope_core/fragment_flows.py
@@ -105,14 +105,14 @@ def from_process_inventory(cls, query, process, ref_flow, elementary=False, exte
                           exchange_value=1.0, observe=True)
         node = parent.observe_anchor(None, process, anchor_flow=rx.flow)
         ff = [cls(parent, 1.0, 1.0, node, False)]
-        for ex in process.ad(ref_flow):  # returns exchangevalues
+        for ex in process.dependencies(ref_flow):  # returns exchangevalues
             n = query.get(ex.termination)
             cf = Fragment(n.external_ref, ex.flow, ex.direction, exchange_value=ex.value, observe=True,
                           parent=parent, anchor=n, anchor_flow=ex.flow)
 
             ff.append(cls(cf, ex.value, ex.value, cf.anch, False))
         if exterior:
-            for ex in process.bf(ref_flow=ref_flow):
+            for ex in process.emissions(ref_flow=ref_flow):
                 if ex.termination.elementary and not elementary:
                     continue
                 # still include non-elementary cutoffs

diff --git a/antelope_core/lcia_engine/clookup.py b/antelope_core/lcia_engine/clookup.py
@@ -219,5 +219,7 @@ def add(self, value, key=None):
             print('Collision with context: %s' % repr(key))
             print(repr(value))
             print('%s current' % repr(existing))
+            print(existing.value)
+            print(value.value)
             raise FactorCollision('This context already has a CF defined!')
         super(SCLookup, self).add(value, key)