Merge form ForDev in a hard way. From this commit, the ForDev branch …

…becomes the main one !!!!
KTH-UrbanT · Apr 19, 2022 · f821eec · f821eec
1 parent 632ab15
commit f821eec
Show file tree

Hide file tree

Showing 33 changed files with 4,195 additions and 1,892 deletions.
diff --git a/BuildObject/BuildingObject.py b/BuildObject/BuildingObject.py
diff --git a/BuildObject/DB_Building.py b/BuildObject/DB_Building.py
diff --git a/BuildObject/DB_Data.py b/BuildObject/DB_Data.py
diff --git a/BuildObject/DB_Filter4Simulations.py → BuildObject/Filter4BldProcess.py b/BuildObject/DB_Filter4Simulations.py → BuildObject/Filter4BldProcess.py
@@ -1,16 +1,23 @@
 # @Author  : Xavier Faure
 # @Email   : [email protected]
+import CoreFiles.GeneralFunctions as GrlFct
 
-
-def checkBldFilter(building):
+def checkBldFilter(building,LogFile = [],DebugMode = False):
     CaseOk = len(building.BlocHeight) if building.Multipolygon else building.height
+    msg =''
     # if the building have bloc with no Height or if the hiegh is below 1m (shouldn't be as corrected in the Building class now)
     if len(building.BlocHeight) > 0 and min(building.BlocHeight) < 1:
         CaseOk = 0
+        msg = '[Error] The building has a given height below 1m...\n'
+        if DebugMode: GrlFct.Write2LogFile(msg, LogFile)
     # is heated area is below 50m2, we just drop the building
     if building.EPHeatedArea < 50:
         CaseOk = 0
+        msg = '[Error] The building has a given heated area below 50m2...\n'
+        if DebugMode: GrlFct.Write2LogFile(msg, LogFile)
     # is no floor is present...(shouldn't be as corrected in the Building class now)
     if 0 in building.BlocNbFloor:
         CaseOk = 0
-    return CaseOk
+        msg = '[Error] The building has a given number of floor equal to 0...\n'
+        if DebugMode: GrlFct.Write2LogFile(msg, LogFile)
+    return CaseOk,msg