Changeset 3355

Timestamp:

Jul 18, 2006, 3:52:01 PM (18 years ago)

Author:

duncan

Message:

Adding more info to the csv file

File:

• inundation/damage/inundation_damage.py (modified) (8 diffs)

inundation/damage/inundation_damage.py

@@ -62 +62 @@
                            csv.get_column('C_VALUE')
                            )
-    results_dic = edm.calc_damage_and_costs(verbose_csv=True)
+    results_dic = edm.calc_damage_and_costs(verbose_csv=True, verbose=verbose)
     for title, value in results_dic.iteritems():
         csv.set_column(title, value, overwrite=overwrite)
@@ -142 +142 @@
     COLLAPSE_CSV_INFO_TITLE = "Calculation notes"
     MAX_DEPTH_TITLE = "Inundation height above ground floor (m)"
+    STRUCT_COLLAPSED_TITLE = "1 if structure collapsed"
+    STRUCT_INUNDATED_TITLE = "1 if structure is inundated"
     double_brick_damage_array = array([[-kinds.default_float_kind.MAX, 0.0],
                                        [0.0-depth_epsilon, 0.0],
@@ -222 +224 @@
         #assert  self.structure_count == len(self.)
         
-    def calc_damage_and_costs(self, verbose_csv=False):
+    def calc_damage_and_costs(self, verbose_csv=False, verbose=False):
         self.calc_damage_percentages()
         collapse_probability = self.calc_collapse_probability()
@@ -233 +235 @@
                         ,self.CONTENTS_DAMAGE_TITLE:self.contents_damage
                         ,self.MAX_DEPTH_TITLE:self.max_depths
-                        #,self.:self.
-                        #,self.:self.
+                        ,self.STRUCT_COLLAPSED_TITLE:self.struct_collapsed
+                        ,self.STRUCT_INUNDATED_TITLE:self.struct_inundated
                         }
         if verbose_csv:
@@ -245 +247 @@
         struct_damage = zeros(self.structure_count,Float)
         contents_damage = zeros(self.structure_count,Float)
-        #for i_building,
+        self.struct_inundated = ['']* self.structure_count
 
         for i,max_depth,shore_distance,wall in map(None,
@@ -259 +261 @@
             if 0.0 > max_depth:
                 continue
+            
+            # The definition of inundated is if the max_depth is > 0.0
+            self.struct_inundated[i] = 1.0
+            
             #calc structural damage %
             damage_curve = self.struct_damage_curve.get(wall,
@@ -330 +336 @@
         and collapse some houses
         """
+        
+        self.struct_collapsed = ['']* self.structure_count
         if verbose_csv:
             self.collapse_csv_info = ['']* self.structure_count
@@ -347 +355 @@
                 self.contents_damage[house_index] = 1.0
                 house_indexes.remove(house_index)
+                self.struct_collapsed[house_index] = 1
+                
             # Warning, the collapse_probability list now lists 
             # houses that did not collapse, (though not all of them)