Moved flood parameters into setttings page

tomorrowcities/backend/engine.py

@@ -8,8 +8,9 @@ from scipy.interpolate import interp1d
 import networkx as nx 
 
 def compute_road_infra(buildings, household, individual,
-                        nodes, edges, intensity, fragility, hazard, road_water_height_threshold):
-    threshold_flood_distance = 10
+                        nodes, edges, intensity, fragility, hazard, 
+                        road_water_height_threshold,
+                        threshold_flood_distance):
 
     DS_NO = 0
     DS_SLIGHT = 1
@@ -288,7 +289,8 @@ def compute_power_infra(buildings, household, nodes,edges,intensity,fragility,ha
     return gdf_nodes['ds'], gdf_nodes['is_damaged'], gdf_nodes['is_operational'], \
            gdf_buildings['has_power'], household_w_node_id['has_power'],hospitals['has_power'] 
 
-def compute(gdf_landuse, gdf_buildings, df_household, df_individual,gdf_intensity, df_hazard, hazard_type, policies=[]):
+def compute(gdf_landuse, gdf_buildings, df_household, df_individual,gdf_intensity, df_hazard, hazard_type, policies=[],
+            threshold_flood = 0.2, threshold_flood_distance = 10):
 
     if hazard_type != "landslide":
         np.random.seed(seed=0)
@@ -318,8 +320,6 @@ def compute(gdf_landuse, gdf_buildings, df_household, df_individual,gdf_intensit
     HAZARD_FLOOD = "flood"
     HAZARD_DEBRIS = "debris"
 
-    threshold_flood = 0.2
-    threshold_flood_distance = 10
     epsg = 3857 
 
     # Replace strange TypeX LRS with RCi

tomorrowcities/pages/engine.py

@@ -22,6 +22,7 @@ import logging, sys
 import pickle
 import datetime
 from .settings import storage, landslide_max_trials, revive_storage
+from .settings import threshold_flood, threshold_flood_distance, threshold_road_water_height
 from ..backend.engine import compute, compute_power_infra, compute_road_infra, calculate_metrics
 from ..backend.utils import building_preprocess, identity_preprocess
 from .utilities import S3FileBrowser, extension_list, extension_list_w_dots
@@ -32,7 +33,6 @@ layers = solara.reactive({
     'hazard': solara.reactive("flood"),
     'hazard_list': ["earthquake","flood","landslide"],
     'datetime_analysis': datetime.datetime.utcnow(),
-    'road_water_height_threshold': solara.reactive(0.3),
     'landslide_trigger_level': solara.reactive('moderate'),
     'landslide_trigger_level_list': ['minor','moderate','severe'],
     'dialog_message_to_be_shown': solara.reactive(None),
@@ -1048,7 +1048,6 @@ def ExecutePanel():
             intensity = layers.value['layers']['intensity']['data'].value
             fragility = layers.value['layers']['road fragility']['data'].value
             hazard = layers.value['hazard'].value
-            road_water_height_threshold = layers.value['road_water_height_threshold'].value
 
             edges['ds'] = 0
             edges['is_damaged'] = False
@@ -1060,7 +1059,7 @@ def ExecutePanel():
             ds, is_damaged, building_node_id, building_hospital_acess, household_node_id, \
                     household_hospital_access, individual_facility_access  = \
                 compute_road_infra(buildings, household, individual, nodes, edges, intensity, 
-                fragility, hazard,road_water_height_threshold)
+                fragility, hazard, threshold_road_water_height.value, threshold_flood_distance.value)
             
             edges['ds'] = list(ds)
             edges['is_damaged'] = list(is_damaged)
@@ -1135,7 +1134,9 @@ def ExecutePanel():
                     intensity,
                     fragility[['expstr','susceptibility',trigger_level]].rename(columns={trigger_level:'collapse_probability'}),
                     layers.value['hazard'].value,
-                    policies=policies)
+                    policies=policies,
+                    threshold_flood = threshold_flood.value,
+                    threshold_flood_distance = threshold_flood_distance.value)
             else:
                 df_bld_hazard = compute(
                     landuse,
@@ -1144,7 +1145,9 @@ def ExecutePanel():
                     individual,
                     intensity,
                     fragility if layers.value['hazard'].value == "earthquake" else vulnerability,
-                    layers.value['hazard'].value, policies=policies)
+                    layers.value['hazard'].value, policies=policies,
+                    threshold_flood = threshold_flood.value,
+                    threshold_flood_distance = threshold_flood_distance.value)
             buildings['ds'] = list(df_bld_hazard['ds'])
 
             return buildings
@@ -1179,7 +1182,7 @@ def ExecutePanel():
                 raise Exception(f'Missing {missing}')
             max_trials = landslide_max_trials.value  if layers.value['hazard'].value == "landslide" else 1
             for trial in range(1,max_trials+1):
-                set_progress_message(f'Monte-Carlo trial {trial}/{max_trials}...')
+                set_progress_message('Running...')
                 if 'power' in layers.value['infra'].value:
                     nodes, buildings, household = execute_power()
                     layers.value['layers']['power nodes']['data'].set(nodes)

tomorrowcities/pages/settings.py

@@ -87,6 +87,10 @@ def revive_storage():
 storage = solara.reactive(revive_storage())  
 landslide_max_trials = solara.reactive(5)
 
+threshold_flood = solara.reactive(0.2) 
+threshold_flood_distance = solara.reactive(10)
+threshold_road_water_height = solara.reactive(0.3) 
+
 def storage_control(aws_access_key_id: str, aws_secret_access_key: str, region_name: str, bucket_name: str):
     storage.value = S3Storage(aws_access_key_id, aws_secret_access_key, region_name, bucket_name)
 
@@ -167,4 +171,22 @@ def Page(name: Optional[str] = None, page: int = 0, page_size=100):
         solara.Error(err_message)
 
     with solara.Card(title='Landslide Parameters',subtitle='Choose the parameters for the landslide simulation'):
-        solara.SliderInt(label='Number of Monte-Carlo Trials', value=landslide_max_trials, min=1,max=100)
+        solara.SliderInt(label='Number of Monte-Carlo Trials', value=landslide_max_trials, min=1,max=100)
+
+    with solara.Card(title='Flood Parameters',subtitle='Choose the parameters for the flood simulations'):
+        solara.Markdown(md_text='''
+                        If the relative damage obtained from the vulnerability curve is beyond 
+                        the flood threshold, the structure is assumed to flooded.
+                        After resetting the value, please execute the simulation again to see its effect.''')
+        solara.SliderFloat(label='Flood Threshold (relative damage)', value=threshold_flood, min=0,max=1, step=0.1)
+        solara.Markdown(md_text='''
+                        If the distance from a structure to the nearest flood intensity measure
+                        is greater than Flood Distance, then the structure is assumed to be
+                        intact from flood.
+                        After resetting the value, please execute the simulation again to see its effect.''')
+        solara.SliderInt(label='Minimum Flood Distance Threshold (meters)', value=threshold_flood_distance, min=0,max=100)
+
+        solara.Markdown(md_text='''
+                        If the water level is beyond this threshold then the road 
+                        is assumed to be flooded.''')
+        solara.SliderFloat(label='Minimum Water Level Threshold for Roads (meters)', value=threshold_road_water_height, min=0,max=1)