diff --git a/lca_carbon_workflow.py b/lca_carbon_workflow.py index aee5baa..7e01603 100644 --- a/lca_carbon_workflow.py +++ b/lca_carbon_workflow.py @@ -72,7 +72,6 @@ class LCACarbonWorkflow: boundary_envelope_emission = [] boundary_opening_emission = [] - for boundary in surface.associated_thermal_boundaries: opening_emission = None layer_emission = self._calculate_envelope_emission(boundary) @@ -99,10 +98,12 @@ class LCACarbonWorkflow: layer_emission = [] for layer in boundary.layers: if not layer.no_mass: + layer_material = \ + self.nrcan_catalogs.search_materials(layer.material_name) layer_emission.append(EnvelopeEmission( - self.nrcan_catalogs.search_materials( - layer.material_name)['embodied_carbon'], + layer_material['embodied_carbon'], boundary.opaque_area, layer.thickness).calculate_envelope_emission()) + layer_workload = boundary.opaque_area * layer.thickness * layer_material['density'] return layer_emission def _calculate_opening_emission(