k_wells/dynamic_building_simulation
1
0
Fork 0
mirror of https://rs-loy-gitlab.concordia.ca/PMAU/DynamicBuildingSimulation.git synced 2024-11-14 23:10:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.idea/DynamicBuildingSimulation.iml
#	.idea/modules.xml
This commit is contained in:
Guille Gutierrez 2020-05-19 11:58:35 -04:00
commit aabcb55092
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/vcs.xml
View File

@ -4,5 +4,6 @@
<mapping directory="$PROJECT_DIR$/../Concordia/libs" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/CityModelStructure" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../Proof2" vcs="Git" />
</component>
</project>

2
main.py
View File

@ -2,7 +2,9 @@ from pathlib import Path
from init import Init
from simplified_radiosity_algorithm.simplified_radiosity_algorithm import SimplifiedRadiosityAlgorithm as Sra
from weather.weather import Weather as Wt
import proof
aa = proof.Aa(2)
name_gml = '2050 bp_20buildings'
name_cli = 'inseldb_New_York_City.cli'
name_weather = 'inseldb_New_York_City.dat'