Skip to content

Commit

Permalink
Merge pull request #125 from USEPA/issue_124
Browse files Browse the repository at this point in the history
Fix recipe typos
  • Loading branch information
bl-young authored Dec 3, 2024
2 parents 6bb2ad3 + 7dad16e commit 7cdc854
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions lciafmt/data/ReCiPe2016_endpoint_to_midpoint.csv
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
,Toxicity - Human health (non-cancer),Human noncarcinogenic toxicity,Human health
,Water consumption - human health,Water consumption,Human health
,Global Warming - Terrestrial ecosystems,Global Warming,Terrestrial ecosystems
,Photochemical ozone formation - Terrestrial ecosystems,Ecosyste damage ozone formation,Terrestrial ecosystems
,Photochemical ozone formation - Terrestrial ecosystems,Ecosystem damage ozone formation,Terrestrial ecosystems
,Acidification - Terrestrial ecosystems,Terrestrial acidification,Terrestrial ecosystems
,Toxicity - Terrestrial ecosystems,Terrestrial ecotoxicity,Terrestrial ecosystems
,Water consumption - terrestrial ecosystems,Water consumption,Terrestrial ecosystems
,Land use - occupation and transformation,Land occupation,Terrestrial ecosystems
,Global Warming - Freshwater ecosystems,Global Warming,Freshwater ecosystems
,Eutrophication - Freshwater ecosystems,Freshwater eutrophication,Freshwater ecosystems
,Toxicity - Freshwater ecosystems,Freshwater ecotoxicity,Freshwater ecosystems
,Water consumption -aquatic ecosystems,Water consumption,Freshwater ecosystems
,Water consumption - aquatic ecosystems,Water consumption,Freshwater ecosystems
,Toxicity - Marine ecosystems,Marine ecotoxicity,Marine ecosystems
,Eutrophication - Marine ecosystems,Marine eutrophication,Marine ecosystems
,Mineral resource scarcity,Mineral resource scarcity,Resources
Expand Down
7 changes: 4 additions & 3 deletions lciafmt/recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def _read_endpoints(file: str) -> pd.DataFrame:
continue
endpoints['Method'] = "ReCiPe 2016 - Midpoint/" + perspectives[i]
endpoints['EndpointMethod'] = "ReCiPe 2016 - Endpoint/" + perspectives[i]
endpoints['EndpointIndicator'] = indicator
endpoints['EndpointIndicator'] = indicator.replace(' -a', ' - a') # fix missing space
endpoints['EndpointUnit'] = indicator_unit
endpoints['EndpointConversion'] = val
endpoint = pd.concat(
Expand Down Expand Up @@ -221,6 +221,7 @@ def _read_mid_points(sheet: openpyxl.worksheet.worksheet.Worksheet,
cas_col = _find_cas_column(sheet)
indicator_unit, flow_unit, unit_col = _determine_units(sheet)
compartment, compartment_col = _determine_compartments(sheet)
sheet_title = sheet.title.replace('Ecosyste damage', 'Ecosystem damage')

perspectives = ["I", "H", "E"]
factor_count = 0
Expand All @@ -244,7 +245,7 @@ def _read_mid_points(sheet: openpyxl.worksheet.worksheet.Worksheet,
continue
dfutil.record(records,
method="ReCiPe 2016 - Midpoint/" + perspectives[i],
indicator=sheet.title,
indicator=sheet_title,
indicator_unit=indicator_unit,
flow=xls.cell_str(row[flow_col]),
flow_category=compartment,
Expand All @@ -259,7 +260,7 @@ def _read_mid_points(sheet: openpyxl.worksheet.worksheet.Worksheet,
for p in perspectives:
dfutil.record(records,
method="ReCiPe 2016 - Midpoint/" + p,
indicator=sheet.title,
indicator=sheet_title,
indicator_unit=indicator_unit,
flow=xls.cell_str(row[flow_col]),
flow_category=compartment,
Expand Down

0 comments on commit 7cdc854

Please sign in to comment.