Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds regionalized eutrophication factors for TRACI 2.2 #123

Open
wants to merge 30 commits into
base: develop
Choose a base branch
from
Open

Adds regionalized eutrophication factors for TRACI 2.2 #123

wants to merge 30 commits into from

Commits on Feb 2, 2024

  1. test

    @juliechenerg
    juliechenerg committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    369d268 View commit details
    Browse the repository at this point in the history

  2. test 2/2/24

    @juliechenerg
    juliechenerg committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    5892c65 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. test 2/8, adding notes

    @juliechenerg
    juliechenerg committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    938ca8d View commit details
    Browse the repository at this point in the history

  2. test

    @juliechenerg
    juliechenerg committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    ff191e3 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. 1) Adding Eutrophication update. 2) change "from .util import..." to … 

    …"from lciafmt.util import..." Note: for the new update, an excel file with raw eutrophication data "traci_raw.xlsx" need to be included in the data folder
    @juliechenerg
    juliechenerg committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    166a795 View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @juliechenerg
    juliechenerg authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    cfee635 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. add eutro url to methods.json, read and cache file

    @bl-young
    bl-young committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    e7400dd View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. add function to extract geocoordinates from ecoinvent source (used by… 

    … openLCA)
    @bl-young
    bl-young committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    44781b6 View commit details
    Browse the repository at this point in the history

  2. add temporary funciton to map state names

    @bl-young
    bl-young committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    eec0d1c View commit details
    Browse the repository at this point in the history

  3. write location objects to jsonld

    @bl-young
    bl-young committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    7d54f1d View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. integrate TRACI2.2 as new method

    @bl-young
    bl-young committed Apr 18, 2024
    1 Configuration menu
    Copy the full SHA
    658b2f7 View commit details
    Browse the repository at this point in the history

  2. drop raw dataset, grabbing remote

    @bl-young
    bl-young committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    465639f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge branch 'develop' into traci_eutr 

    # Conflicts:
#	lciafmt/jsonld.py
    @bl-young
    bl-young committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    fc3559b View commit details
    Browse the repository at this point in the history

  2. add location to duplicate assessment

    @bl-young
    bl-young committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    5658248 View commit details
    Browse the repository at this point in the history

  3. use only ref for assigning location to factor

    @bl-young
    bl-young committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    9645124 View commit details
    Browse the repository at this point in the history

  4. fix error in maintaining factors with no location from US national

    @bl-young
    bl-young committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    74d2392 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. move more objects to location.py

    @bl-young
    bl-young committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    13cdd47 View commit details
    Browse the repository at this point in the history

  2. add traci2.2 test

    @bl-young
    bl-young committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    f12c1f7 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Merge branch 'develop' into traci_eutr 

    # Conflicts:
#	lciafmt/jsonld.py
#	tests/test_generate_methods.py
    @bl-young
    bl-young committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    01f07a2 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. fix indicator units

    @bl-young
    bl-young committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    c540f76 View commit details
    Browse the repository at this point in the history

  2. incorporate data for countries

    @bl-young
    bl-young committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    5bf6b4a View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. pass region to Writer.write()

    @bl-young
    bl-young committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    ca18836 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. resolve issue of duplicate locations

    @bl-young
    bl-young committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bf15535 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. improve clarity of the logic for processing factors, make "World" the… 

    … default CF; align Agric and NonAg with rural and urban
    @bl-young
    bl-young committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    fbecefc View commit details
    Browse the repository at this point in the history

  2. create jsons for US and for international data

    @bl-young
    bl-young committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    2cf5c76 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. move location objects to esupy USEPA/esupy@82d57fc

    @bl-young
    bl-young committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d1945c6 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. allow lists of multiple regions for location writing

    @bl-young
    bl-young committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    f594b2a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into traci_eutr

    @bl-young
    bl-young committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5974953 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. add example script for traci 2.2

    @bl-young
    bl-young committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    a9294c6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into traci_eutr 

    # Conflicts:
#	lciafmt/traci.py
    @bl-young
    bl-young committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    4209f43 View commit details
    Browse the repository at this point in the history