From ed4ee36dbfedc2b93f6ddb101729b65dabfbf788 Mon Sep 17 00:00:00 2001 From: Alireza Adli Date: Fri, 2 Aug 2024 12:01:30 -0400 Subject: [PATCH] Replace all processes with the workload --- .../lca_end_of_life_carbon.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py b/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py index 397b10c1..c646526e 100644 --- a/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py +++ b/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py @@ -15,41 +15,37 @@ class EndOfLifeEmission: def __init__( self, recycling_ratio, onsite_recycling_ratio, company_recycling_ratio, landfilling_ratio, - demolition_work_load, onsite_work_load, - companies_recycling_work_load, landfilling_work_load, + material_workload, demolition_machine_emission=4.3577325, onsite_machine_emission=2.0576313, companies_recycling_machine_emission=0.6189555, landfilling_machine_emission=15.7364044): self.recycling_ratio = recycling_ratio self.onsite_recycling_ratio = onsite_recycling_ratio self.company_recycling_ratio = company_recycling_ratio self.landfilling_ratio = landfilling_ratio + self.material_workload = material_workload self.demolition_machine_emission = demolition_machine_emission self.onsite_machine_emission = onsite_machine_emission self.companies_recycling_machine_emission = \ companies_recycling_machine_emission self.landfilling_machine_emission = landfilling_machine_emission - self.demolition_work_load = demolition_work_load - self.onsite_work_load = onsite_work_load - self.companies_recycling_work_load = companies_recycling_work_load - self.landfilling_work_load = landfilling_work_load def demolition(self): - return self.demolition_machine_emission * self.demolition_work_load + return self.demolition_machine_emission * self.material_workload def onsite_recycling(self): return self.recycling_ratio * (self.onsite_recycling_ratio * self.onsite_machine_emission * - self.onsite_work_load) + self.material_workload) def companies_recycling(self): return self.recycling_ratio * (self.company_recycling_ratio * self.companies_recycling_machine_emission * - self.companies_recycling_work_load) + self.material_workload) def landfilling(self): return self.landfilling_ratio * \ self.landfilling_machine_emission * \ - self.landfilling_work_load + self.material_workload def calculate_end_of_life_emission(self): return self.demolition() + \