Changeset 4324 for anuga_core/source/anuga/damage_modelling

Timestamp:

Mar 26, 2007, 10:42:12 AM (18 years ago)

Author:

duncan

Message:

exposure file label change

Location:

anuga_core/source/anuga/damage_modelling

Files:

• inundation_damage.py (modified) (2 diffs)
• test_inundation_damage.py (modified) (2 diffs)

anuga_core/source/anuga/damage_modelling/inundation_damage.py

@@ -34 +34 @@
 from anuga_config import epsilon
 depth_epsilon = epsilon
+SHORE_DIST_LABEL = 'SHORE_DIST'
+WALL_TYPE_LABEL = 'WALL_TYPE'
+STR_VALUE_LABEL = 'STR_VALUE'
+CONT_VALUE_LABEL = 'CONT_VALUE'
 
 def inundation_damage(sww_file, exposure_file_in,
@@ -61 +65 @@
                                     use_cache=use_cache)
     edm = EventDamageModel(max_depths,
-                           csv.get_column('SHORE_DIST'),
-                           csv.get_column('WALLS'),
-                           csv.get_column('STR_VALUE'),
-                           csv.get_column('C_VALUE')
+                           csv.get_column(SHORE_DIST_LABEL),
+                           csv.get_column(WALL_TYPE_LABEL),
+                           csv.get_column(STR_VALUE_LABEL),
+                           csv.get_column(CONT_VALUE_LABEL)
                            )
     results_dic = edm.calc_damage_and_costs(verbose_csv=True, verbose=verbose)

anuga_core/source/anuga/damage_modelling/test_inundation_damage.py

@@ -131 +131 @@
         fd = open(self.csv_file,'wb')
         writer = csv.writer(fd)
-        writer.writerow(['LONGITUDE','LATITUDE','STR_VALUE','C_VALUE','ROOF_TYPE','WALLS', 'SHORE_DIST'])
+        writer.writerow(['LONGITUDE','LATITUDE',STR_VALUE_LABEL,CONT_VALUE_LABEL,'ROOF_TYPE',WALL_TYPE_LABEL, SHORE_DIST_LABEL])
         writer.writerow(['151.5','-34','199770','130000','Metal','Timber',20.])
         writer.writerow(['151','-34.5','150000','76000','Metal','Double Brick',200.])
@@ -211 +211 @@
         fd = open(csv_file,'wb')
         writer = csv.writer(fd)
-        writer.writerow(['x','y','STR_VALUE','C_VALUE','ROOF_TYPE','WALLS', 'SHORE_DIST'])
+        writer.writerow(['x','y',STR_VALUE_LABEL,CONT_VALUE_LABEL,'ROOF_TYPE',WALL_TYPE_LABEL, SHORE_DIST_LABEL])
         writer.writerow([5.5,0.5,'10','130000','Metal','Timber',20])
         writer.writerow([4.5,1.0,'150','76000','Metal','Double Brick',20])