From f155725e7b52f4546e46398e8e1325ef5c3fe869 Mon Sep 17 00:00:00 2001 From: Alireza Adli Date: Fri, 2 Aug 2024 12:05:34 -0400 Subject: [PATCH] Replace workload with endOfLife emission for each layer --- lca_carbon_workflow.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lca_carbon_workflow.py b/lca_carbon_workflow.py index f804757..8d9349d 100644 --- a/lca_carbon_workflow.py +++ b/lca_carbon_workflow.py @@ -18,6 +18,8 @@ from city_model_structure.life_cycle_assessment.opening_emission \ import OpeningEmission from city_model_structure.life_cycle_assessment.envelope_emission \ import EnvelopeEmission +from city_model_structure.life_cycle_assessment.lca_end_of_life_carbon \ + import EndOfLifeEmission class LCACarbonWorkflow: @@ -74,7 +76,7 @@ class LCACarbonWorkflow: for surface in building.surfaces: boundary_envelope_emission = [] boundary_opening_emission = [] - boundary_envelope_workload =[] + boundary_envelope_workload = [] boundary_opening_workload = [] for boundary in surface.associated_thermal_boundaries: @@ -111,7 +113,7 @@ class LCACarbonWorkflow: def _calculate_envelope_emission(self, boundary): layer_emission = [] - boundary_workload = [] + boundary_emission = [] for layer in boundary.layers: if not layer.no_mass: layer_material = \ @@ -120,9 +122,13 @@ class LCACarbonWorkflow: layer_material['embodied_carbon'], boundary.opaque_area, layer.thickness, layer.density).calculate_envelope_emission()) - boundary_workload.append( - boundary.opaque_area * layer.thickness * layer.density) - return layer_emission, boundary_workload + boundary_workload = boundary.opaque_area * layer.thickness * layer.density + boundary_emission.append(EndOfLifeEmission( + layer_material['recycling_ratio'], + layer_material['onsite_recycling_ratio'], + layer_material['company_recycling_ratio'], + layer_material['landfilling_ratio'], boundary_workload)) + return layer_emission, boundary_emission def _calculate_opening_emission( self,