diff --git a/cea/analysis/lca/operation.py b/cea/analysis/lca/operation.py index c2a04e591f..0f4044c419 100644 --- a/cea/analysis/lca/operation.py +++ b/cea/analysis/lca/operation.py @@ -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()] diff --git a/cea/databases/CH/archetypes/use_types/use_types_properties.xlsx b/cea/databases/CH/archetypes/use_types/USE_TYPE_PROPERTIES.xlsx similarity index 100% rename from cea/databases/CH/archetypes/use_types/use_types_properties.xlsx rename to cea/databases/CH/archetypes/use_types/USE_TYPE_PROPERTIES.xlsx diff --git a/cea/databases/CH/assemblies/supply.xls b/cea/databases/CH/assemblies/SUPPLY.xls similarity index 100% rename from cea/databases/CH/assemblies/supply.xls rename to cea/databases/CH/assemblies/SUPPLY.xls diff --git a/cea/databases/CH/components/conversion.xls b/cea/databases/CH/components/CONVERSION.xls similarity index 100% rename from cea/databases/CH/components/conversion.xls rename to cea/databases/CH/components/CONVERSION.xls diff --git a/cea/databases/CH/components/distribution.xls b/cea/databases/CH/components/DISTRIBUTION.xls similarity index 100% rename from cea/databases/CH/components/distribution.xls rename to cea/databases/CH/components/DISTRIBUTION.xls diff --git a/cea/databases/SG/archetypes/use_types/use_types_properties.xlsx b/cea/databases/SG/archetypes/use_types/USE_TYPE_PROPERTIES.xlsx similarity index 100% rename from cea/databases/SG/archetypes/use_types/use_types_properties.xlsx rename to cea/databases/SG/archetypes/use_types/USE_TYPE_PROPERTIES.xlsx diff --git a/cea/databases/SG/assemblies/supply.xls b/cea/databases/SG/assemblies/SUPPLY.xls similarity index 100% rename from cea/databases/SG/assemblies/supply.xls rename to cea/databases/SG/assemblies/SUPPLY.xls diff --git a/cea/databases/SG/components/conversion.xls b/cea/databases/SG/components/CONVERSION.xls similarity index 99% rename from cea/databases/SG/components/conversion.xls rename to cea/databases/SG/components/CONVERSION.xls index 77492fd476..d90d08a5a2 100644 Binary files a/cea/databases/SG/components/conversion.xls and b/cea/databases/SG/components/CONVERSION.xls differ diff --git a/cea/databases/SG/components/distribution.xls b/cea/databases/SG/components/DISTRIBUTION.xls similarity index 99% rename from cea/databases/SG/components/distribution.xls rename to cea/databases/SG/components/DISTRIBUTION.xls index 5b3b446687..6c1f34857b 100644 Binary files a/cea/databases/SG/components/distribution.xls and b/cea/databases/SG/components/DISTRIBUTION.xls differ diff --git a/cea/databases/SG/components/FEEDSTOCKS.xls b/cea/databases/SG/components/FEEDSTOCKS.xls index 2762fae650..906e09356a 100644 Binary files a/cea/databases/SG/components/FEEDSTOCKS.xls and b/cea/databases/SG/components/FEEDSTOCKS.xls differ diff --git a/cea/examples/reference-case-open.zip b/cea/examples/reference-case-open.zip index 7a8e75cc00..44bab01314 100644 Binary files a/cea/examples/reference-case-open.zip and b/cea/examples/reference-case-open.zip differ diff --git a/cea/inputlocator.py b/cea/inputlocator.py index 44529b4c17..6700ab5dc6 100644 --- a/cea/inputlocator.py +++ b/cea/inputlocator.py @@ -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