Changeset 3846 for anuga_core/source/anuga/damage_modelling

Timestamp:

Oct 24, 2006, 12:59:08 PM (18 years ago)

Author:

ole

Message:

Refactored references to domain.filename away.
Use

domain.set_name()
domain.get_name()

instead.

File:

• anuga_core/source/anuga/damage_modelling/test_inundation_damage.py (modified) (5 diffs)

anuga_core/source/anuga/damage_modelling/test_inundation_damage.py

@@ -115 +115 @@
         
         #sww_file = tempfile.mktemp("")
-        self.domain.filename = 'datatest' + str(time.time())
-        #self.domain.filename = sww_file
-        #print "self.domain.filename",self.domain.filename 
+        self.domain.set_name('datatest' + str(time.time()))
         self.domain.format = 'sww'
         self.domain.smooth = True
@@ -158 +156 @@
         # Note, this isn't testing the results,
         # just that is all runs
-        sww_file = self.domain.filename + "." + self.domain.format
+        sww_file = self.domain.get_name() + "." + self.domain.format
         #print "sww_file",sww_file 
         inundation_damage(sww_file, self.csv_file, verbose=False)
@@ -197 +195 @@
 
         #sww_file = tempfile.mktemp("")
-        domain.filename = 'datatest' + str(time.time())
-        #domain.filename = sww_file
-        #print "domain.filename",domain.filename 
+        domain.set_name('datatest' + str(time.time()))
         domain.format = 'sww'
         domain.smooth = True
@@ -222 +218 @@
         fd.close()
 
-        sww_file = domain.filename + "." + domain.format
+        sww_file = domain.get_name() + "." + domain.format
         #print "sww_file",sww_file 
         inundation_damage(sww_file, csv_file, verbose=False)
@@ -239 +235 @@
         
     def ztest_add_depth_and_momentum2csv(self):
-        sww_file = self.domain.filename + "." + self.domain.format
+        sww_file = self.domain.get_name() + "." + self.domain.format
         #print "sww_file",sww_file