Changeset 280

Timestamp:

Sep 7, 2004, 5:33:10 PM (21 years ago)

Author:

ole

Message:

fiddle fiddle

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (1 diff)
• shallow_water.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -766 +766 @@
 
 
-
-#Mappings from format to reader (FIXME: Soon Obsoleted)
-def get_variable_reader(format):
-    
-    func = eval('%s_variable_reader' %format)
-    return func
-
-
-def get_variable_writer(format):
-    
-    func = eval('%s_variable_writer' %format)
-    return func    
-
-def get_constant_reader(format):
-    
-    func = eval('%s_constant_reader' %format)
-    return func
-
-def get_constant_writer(format):
-    
-    func = eval('%s_constant_writer' %format)
-    return func    
-

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -110 +110 @@
         #Store model data, e.g. for visualisation    
         if self.store is True and self.time == 0.0:
-            self.store_bathymetry()        
-            ###self.store_conserved_quantities()        
+            #FIXME: Could be wrapped into local store_bathymetry and store_timestep
+            self.intialise_storage()
+            self.store_quantity('elevation')        
 
         #Call basic machinery from parent class
@@ -121 +122 @@
             #Store model data, e.g. for subsequent visualisation    
             if self.store is True:
-                self.store_conserved_quantities()
+                self.store_timestep() #FIXME: An idea                
+                self.store_quantity('level')
+
 
             #Pass control on to outer loop for more specific actions    
@@ -127 +130 @@
         
 
+
+    def store_quantity(self, name):
+        """Store named quantity to file using foormat and filename
+        """
+
+        Q = self.quantities[name]
+        Q.store(self.filename, self.format)
+        
+        #FIXME: Use data_manager
+        #FIXME:
+        #  Initialisation
+        #  Storing of vertices (static)
+        #
+        #  Storing of elevation (typically static, but...)
+        #
+        #  Storing of level (dynamic)
+        #  Storing of time (dynamic)        
+        #
+        pass    
+
+    
 
 #Rotation of momentum vector