Changeset 1075

Timestamp:

Mar 14, 2005, 2:13:50 PM (19 years ago)

Author:

prow

Message:

Fixed some bugs (a recursion crash if a single save exceeds max_size)

File:

• inundation/ga/storm_surge/pyvolution/data_manager.py (modified) (9 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -208 +208 @@
 
 
-    def __init__(self, domain, mode = 'w', filename_ext = ''):
+    def __init__(self, domain, mode = 'w',\
+                 max_size = 2000000000,recursion=False):
         from Scientific.IO.NetCDF import NetCDFFile
         from Numeric import Int, Float, Float32
 
         self.precision = Float32 #Use single precision
-        self.max_size = 2000000000#file size max is 2Gig
+        if hasattr(domain,'max_size'):
+            self.max_size = domain.max_size#file size max is 2Gig
+        else:
+            self.max_size = max_size
+        self.recursion = recursion
         self.mode = mode
 
@@ -327 +332 @@
         #Close
         fid.close()
-
 
     def store_timestep(self, names):
@@ -367 +371 @@
         file_size = stat(self.filename)[6]
         file_size_increase =  file_size/i
-        if file_size + file_size_increase > self.max_size:
+        if file_size + file_size_increase > self.max_size*(2**self.recursion):
             #in order to get the file name and start time correct,
             #I change the domian.filename and domain.starttime.
@@ -373 +377 @@
             #other modules (I think).
 
-            #write a filename addon that won't bread swollen
+            #write a filename addon that won't break swollens reader 
+            #(10.sww is bad)
             filename_ext = '_time_%s'%self.domain.time            
             filename_ext = filename_ext.replace('.', '_')
@@ -379 +384 @@
             #name with the extension
             old_domain_filename = self.domain.filename
-            self.domain.filename = self.domain.filename+filename_ext
+            if not self.recursion:
+                self.domain.filename = self.domain.filename+filename_ext
 
             #change the domain starttime to the current time
@@ -387 +393 @@
             #build a new data_structure.
             next_data_structure=\
-                Data_format_sww(self.domain, mode=self.mode\
-                                ,filename_ext=filename_ext)
-            print '    file_size = %s'%file_size
-            print '    saving file to %s'%self.next_data_structure.filename
-
+                Data_format_sww(self.domain, mode=self.mode,\
+                                max_size = self.max_size,\
+                                recursion = self.recursion+1)
+            if not self.recursion:
+                print '    file_size = %s'%file_size
+                print '    saving file to %s'%next_data_structure.filename
             #set up the new data_structure
             self.domain.writer = next_data_structure
@@ -405 +412 @@
             self.domain.filename = old_domain_filename
         else:
+            self.recursion = False
             domain = self.domain
 
@@ -444 +452 @@
             fid.sync()
             fid.close()
+
 
 
@@ -591 +600 @@
         fid.sync()
         fid.close()
-
-