Skip to content

Commit

Permalink
Removing plastic_waste_disposal
Browse files Browse the repository at this point in the history
  • Loading branch information
lilyclements committed Oct 15, 2024
1 parent 4ef005d commit 8ab284a
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 14 deletions.
3 changes: 1 addition & 2 deletions R/clinical_emissions.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ clinical_theatre_emissions <- function(wet_clinical_waste, wet_clinical_waste_un
paper_waste_disposal = c("Closed-loop", "Combustion", "Composting", "Landfill"),
average_WD = 0, average_film_WD = 0, average_rigid_WD = 0, HDPE_WD = 0,
LDPE_WD = 0, LLDPE_WD = 0, PET_WD = 0, PP_WD = 0, PS_WD = 0, PVC_WD = 0,
plastic_waste_disposal = c("Closed-loop", "Combustion", "Landfill", "Open-loop"),
glass_units = c("kg", "tonnes"), paper_units = c("kg", "tonnes"), plastic_units = c("kg", "tonnes")){

checkmate::assert_numeric(wet_clinical_waste, lower = 0)
Expand All @@ -51,7 +50,7 @@ clinical_theatre_emissions <- function(wet_clinical_waste, wet_clinical_waste_un
HDPE = HDPE, LDPE = LDPE, LLDPE = LLDPE, PET = PET, PP = PP, PS = PS, PVC = PVC,
average_WD = average_WD, average_film_WD = average_film_WD, average_rigid_WD = average_rigid_WD,
HDPE_WD = HDPE_WD, LDPE_WD = LDPE_WD, LLDPE_WD = LLDPE_WD, PET_WD = PET_WD, PP_WD = PP_WD,
PS_WD = PS_WD, PVC_WD = PVC_WD, plastic_waste_disposal = plastic_waste_disposal, plastic_units = plastic_units,
PS_WD = PS_WD, PVC_WD = PVC_WD, plastic_units = plastic_units,
fridges = fridges, freezers = freezers,
electric_waste_disposal = electric_waste_disposal, electrical_units = electrical_units) # in tonnes

Expand Down
4 changes: 1 addition & 3 deletions R/material_emissions.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#' @param metal_waste_disposal Character vector specifying the waste disposal method to use for metal for calculating emissions. Possible values: `"Closed-loop"`, `"Combustion"`, `"Landfill"`, `"Open-loop"`. Default is "Closed-loop". See `details` for more information.
#' @param glass_waste_disposal Character vector specifying the waste disposal method to use for metal for calculating emissions. Possible values: `"Closed-loop"`, `"Combustion"`, `"Landfill"`, `"Open-loop"`. Default is "Closed-loop". See `details` for more information.
#' @param paper_waste_disposal Character vector specifying the waste disposal method for paper to use for calculating emissions. Possible values: `"Closed-loop"`, `"Combustion"`, `"Composting"`, `"Landfill"`. Default is `"Closed-loop"`. See `details` for more information.
#' @param plastic_waste_disposal Character vector specifying the waste disposal method for plastic to use for calculating emissions. Possible values: `"Closed-loop"`, `"Combustion"`, `"Landfill"`, `"Open-loop"`. Default is `"Closed-loop"`. See `details` for more information.
#' @param electric_waste_disposal Character vector specifying the waste disposal method for electrical items to use for calculating emissions. Possible values: `"Landfill"`, `"Open-loop"`. Default is `"Landfill"`. See `details` for more information.
#' @param construction_waste_disposal Character vector specifying the waste disposal method for electrical items to use for calculating emissions. Options are, `"Closed-loop"`, `"Combustion"`, `"Composting"`, `"Landfill"`,
#' `"Open-loop"`. Default is `"Closed-loop"`.
Expand Down Expand Up @@ -66,7 +65,6 @@ material_emissions <- function(glass = 0, board = 0, mixed = 0, paper = 0,
paper_waste_disposal = c("Closed-loop", "Combustion", "Composting", "Landfill"),
average_WD = 0, average_film_WD = 0, average_rigid_WD = 0, HDPE_WD = 0,
LDPE_WD = 0, LLDPE_WD = 0, PET_WD = 0, PP_WD = 0, PS_WD = 0, PVC_WD = 0,
plastic_waste_disposal = c("Closed-loop", "Combustion", "Landfill", "Open-loop"),
fridges_WD = 0, freezers_WD = 0, large_electrical_WD = 0, IT_WD = 0,
small_electrical_WD = 0, alkaline_batteries_WD = 0, LiIon_batteries_WD = 0,
NiMh_batteries_WD = 0, electric_waste_disposal = c("Landfill", "Open-loop"),
Expand Down Expand Up @@ -100,7 +98,7 @@ material_emissions <- function(glass = 0, board = 0, mixed = 0, paper = 0,
HDPE = HDPE, LDPE = LDPE, LLDPE = LLDPE, PET = PET, PP = PP, PS = PS, PVC = PVC,
average_WD = average_WD, average_film_WD = average_film_WD, average_rigid_WD = average_rigid_WD,
HDPE_WD = HDPE_WD, LDPE_WD = LDPE_WD, LLDPE_WD = LLDPE_WD, PET_WD = PET_WD, PP_WD = PP_WD,
PS_WD = PS_WD, PVC_WD = PVC_WD, waste_disposal = plastic_waste_disposal, units = plastic_units)
PS_WD = PS_WD, PVC_WD = PVC_WD, units = plastic_units)
electrical_emissions <- electrical_emissions(fridges = fridges, freezers = freezers, large = large_electrical, IT = IT,
small = small_electrical, alkaline_batteries = alkaline_batteries,
LiIon_batteries = LiIon_batteries, NiMh_batteries = NiMh_batteries,
Expand Down
2 changes: 1 addition & 1 deletion R/office_emissions.R
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ office_emissions <- function(specify = FALSE, office_num = 1, WFH_num = 0, WFH_h
}
office_emissions <- office_emissions + WFH_emissions
return(office_emissions * 0.001)
}
}
2 changes: 0 additions & 2 deletions man/clinical_theatre_data.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/clinical_theatre_emissions.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/material_emissions.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8ab284a

Please sign in to comment.