Changeset 8749

Timestamp:

Mar 9, 2013, 11:12:23 PM (12 years ago)

Author:

steve

Message:

Change sww_merge to save friction

File:

• trunk/anuga_core/source/anuga/utilities/sww_merge.py (modified) (1 diff)

trunk/anuga_core/source/anuga/utilities/sww_merge.py

@@ -240 +240 @@
             g_points = num.zeros((number_of_global_nodes,2),num.float32)
 
-            quantities = ['elevation', 'stage', 'xmomentum', 'ymomentum']
+            quantities = set(['elevation', 'friction', 'stage', 'xmomentum',
+                              'ymomentum', 'xvelocity', 'yvelocity', 'height'])
+            variables = set(fid.variables.keys())
+
+            quantities = list(quantities & variables)
+            
             static_quantities = []
             dynamic_quantities = []