Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Aug 4, 2023
2 parents f8466c0 + ffacdc8 commit 6b58c2d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion premise/fuels.py
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ def generate_biogas_activities(self):
name=activity,
ref_prod=" ",
delete_original_dataset=False,
empty_original_activity=False
empty_original_activity=False,
)

for co2_type in [
Expand Down
2 changes: 2 additions & 0 deletions premise/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ def clean_up(exc):

return exc


def reset_all_codes(data):
"""
Re-generate all codes in each dataset of a database
Expand All @@ -317,6 +318,7 @@ def reset_all_codes(data):

return data


def write_brightway2_database(data, name, reset_codes=False):
# Restore parameters to Brightway2 format
# which allows for uncertainty and comments
Expand Down

0 comments on commit 6b58c2d

Please sign in to comment.