Compare commits

..

No commits in common. "a474a7d97e124c62d729a62915c89dd87b92eb8e" and "af988e28ed643647510ca3e2ddb90e1a4cccfe56" have entirely different histories.

2 changed files with 9 additions and 7 deletions

View File

@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="C:\Users\marie.proville\miniconda3\envs\Hub" jdkType="Python SDK" />
<orderEntry type="jdk" jdkName="hub" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -15,8 +15,8 @@ from hub.city_model_structure.building import Building
energy_systems_format = 'montreal_custom'
# parameters:
residential_systems_percentage = {'system 1 gas': 15,
'system 1 electricity': 35,
residential_systems_percentage = {'system 1 gas': 100,
'system 1 electricity': 0,
'system 2 gas': 0,
'system 2 electricity': 0,
'system 3 and 4 gas': 0,
@ -25,11 +25,13 @@ residential_systems_percentage = {'system 1 gas': 15,
'system 5 electricity': 0,
'system 6 gas': 0,
'system 6 electricity': 0,
'system 8 gas': 15,
'system 8 electricity': 35}
'system 8 gas': 0,
'system 8 electricity': 0}
residential_new_systems_percentage = {'PV+ASHP+GasBoiler+TES': 100,
'PV+4Pipe+DHW': 0,
residential_new_systems_percentage = {'PV+ASHP+GasBoiler+TES': 0,
'PV+4Pipe+DHW': 100,
'Central Heating+Unitary Cooling+Unitary DHW': 0,
'Central Heating+Unitary Cooling+Unitary DHW+PV': 0,
'PV+ASHP+ElectricBoiler+TES': 0,
'PV+GSHP+GasBoiler+TES': 0,
'PV+GSHP+ElectricBoiler+TES': 0,