Changeset 281 for inundation/ga/storm_surge/pyvolution/shallow_water.py

Timestamp:

Sep 7, 2004, 10:29:42 PM (20 years ago)

Author:

ole

Message:

Got datamanager for sww smooth to work.
Non-smooth does not work yet and tests are unfinished

File:

• inundation/ga/storm_surge/pyvolution/shallow_water.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -42 +42 @@
         #Stored output
         self.store=False
-        self.format = 'dat'    
+        self.format = 'sww'    
         self.smooth = True
 
@@ -110 +110 @@
         #Store model data, e.g. for visualisation    
         if self.store is True and self.time == 0.0:
-            #FIXME: Could be wrapped into local store_bathymetry and store_timestep
-            self.intialise_storage()
-            self.store_quantity('elevation')        
+            self.initialise_storage()   
+            
 
         #Call basic machinery from parent class
@@ -122 +121 @@
             #Store model data, e.g. for subsequent visualisation    
             if self.store is True:
-                self.store_timestep() #FIXME: An idea                
-                self.store_quantity('level')
+                self.writer.store_timestep('level')
+                #FIXME: Could maybe be taken from specified list 
+                #of 'store every step' quantities       
 
 
@@ -130 +130 @@
         
 
+    def initialise_storage(self):       
+        """Save x,y and bed elevation
+        """
+
+        import data_manager
+        
+        #Initialise writer
+        self.writer = data_manager.get_dataobject(self, mode = 'w')
+
+        #Store vertices and connectivity
+        self.writer.store_connectivity()                    
+        
+        
 
     def store_quantity(self, name):
-        """Store named quantity to file using foormat and filename
+        """Store named quantity to file using format and filename
         """
 
+        #FIXME: NOT IN USE
+        
         Q = self.quantities[name]
         Q.store(self.filename, self.format)