Skip to content

Commit

Permalink
Hotfix for databases
Browse files Browse the repository at this point in the history
  • Loading branch information
reyery committed Feb 24, 2020
1 parent 253fd59 commit 4b40828
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions cea/analysis/lca/operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ def lca_operation(locator):
factors_cooling = data_all_in_one_systems['COOLING']
factors_electricity = data_all_in_one_systems['ELECTRICITY']
factors_resources = pd.read_excel(locator.get_database_feedstocks(), sheet_name=None)
for sheet in factors_resources:
print(factors_resources[sheet])

# get the mean of all values for this
factors_resources_simple = [(name, values['GHG_kgCO2MJ'].mean()) for name, values in factors_resources.items()]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file modified cea/databases/SG/components/FEEDSTOCKS.xls
Binary file not shown.
Binary file modified cea/examples/reference-case-open.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion cea/inputlocator.py
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ def get_database_construction_standards(self):
def get_database_use_types_properties(self):
"""Returns the database of construction properties to be used by the archetypes-mapper. These are copied
to the scenario if they are not yet present, based on the configured region for the scenario."""
return os.path.join(self.get_database_use_types_folder(), 'use_types_properties.xlsx')
return os.path.join(self.get_database_use_types_folder(), 'USE_TYPE_PROPERTIES.xlsx')

def get_database_supply_assemblies(self):
"""Returns the database of supply components for cost analysis. These are copied
Expand Down

0 comments on commit 4b40828

Please sign in to comment.