Changeset 4378

Timestamp:

Apr 16, 2007, 11:30:52 AM (18 years ago)

Author:

duncan

Message:

mux file name change

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (6 diffs)
• test_data_manager.py (modified) (5 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4116 +4116 @@
 
     Specify only basename_in and read files of the form
-    basefilename-z-mux, basefilename-e-mux and basefilename-n-mux containing
-    relative height, x-velocity and y-velocity, respectively.
+    basefilename_velocity-z-mux, basefilename_velocity-e-mux and
+    basefilename_waveheight-n-mux containing relative height,
+    x-velocity and y-velocity, respectively.
 
     Also convert latitude and longitude to UTM. All coordinates are
@@ -4171 +4172 @@
 
     The name of the urs file names must be;
-    [basename_in]-z-mux
-    [basename_in]-e-mux
-    [basename_in]-n-mux
-    
-    """
-    files_in = [basename_in+'-z-mux',
-                basename_in+'-e-mux',
-                basename_in+'-n-mux']
+    [basename_in]_velocity-z-mux
+    [basename_in]_velocity-e-mux
+    [basename_in]_waveheight-n-mux
+    
+    """
+    
+    files_in = [basename_in + WAVEHEIGHT_MUX_LABEL,
+                basename_in + EAST_VELOCITY_LABEL,
+                basename_in + NORTH_VELOCITY_LABEL]
     files_out = [basename_out+'_ha.nc',
                  basename_out+'_ua.nc',
@@ -4617 +4619 @@
     """
     pass
-    
+   
+WAVEHEIGHT_MUX_LABEL = '_velocity-z-mux'
+EAST_VELOCITY_LABEL =  '_velocity-e-mux'
+NORTH_VELOCITY_LABEL =  '_waveheight-n-mux' 
 def urs_ungridded2sww(basename_in='o', basename_out=None, verbose=False,
             mint=None, maxt=None,
@@ -4627 +4632 @@
     sww format native to abstract_2d_finite_volumes.
 
+
     Specify only basename_in and read files of the form
-    basefilename-z-mux, basefilename-e-mux and basefilename-n-mux containing
-    relative height, x-velocity and y-velocity, respectively.
+    basefilename_velocity-z-mux, basefilename_velocity-e-mux and
+    basefilename_waveheight-n-mux containing relative height,
+    x-velocity and y-velocity, respectively.
 
     Also convert latitude and longitude to UTM. All coordinates are
@@ -4678 +4685 @@
     from anuga.pmesh.mesh import Mesh
 
-    files_in = [basename_in+'-z-mux',
-                basename_in+'-e-mux',
-                basename_in+'-n-mux']
+    files_in = [basename_in + WAVEHEIGHT_MUX_LABEL,
+                basename_in + EAST_VELOCITY_LABEL,
+                basename_in + NORTH_VELOCITY_LABEL]
     quantities = ['HA','UA','VA']
 
@@ -4928 +4935 @@
     Not finished or tested
     """
-    files_in = [basename_in+'-z-mux',
-                basename_in+'-e-mux',
-                basename_in+'-n-mux']
+    
+    files_in = [basename_in + WAVEHEIGHT_MUX_LABEL,
+                basename_in + EAST_VELOCITY_LABEL,
+                basename_in + NORTH_VELOCITY_LABEL]
     quantities = ['HA','UA','VA']
 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -4722 +4722 @@
         lonlatdeps = []
         quantities = ['HA','UA','VA']
-        mux_names = ['-z-mux','-e-mux','-n-mux']
+        mux_names = [WAVEHEIGHT_MUX_LABEL,
+                     EAST_VELOCITY_LABEL,
+                     NORTH_VELOCITY_LABEL]
         quantities_init = [[],[],[]]
         # urs binary is latitude fastest
@@ -4786 +4788 @@
         lonlatdeps = []
         quantities = ['HA','UA','VA']
-        mux_names = ['-z-mux','-e-mux','-n-mux']
+        
+        mux_names = [WAVEHEIGHT_MUX_LABEL,
+                     EAST_VELOCITY_LABEL,
+                     NORTH_VELOCITY_LABEL]
         quantities_init = [[],[],[]]
         # urs binary is latitude fastest
@@ -4865 +4870 @@
         files = []
         quantities = ['HA','UA','VA']
-        mux_names = ['-z-mux','-e-mux','-n-mux']
+        
+        mux_names = [WAVEHEIGHT_MUX_LABEL,
+                     EAST_VELOCITY_LABEL,
+                     NORTH_VELOCITY_LABEL]
         for i,q in enumerate(quantities): 
             #Write C files
@@ -5348 +5356 @@
                     #print "quantity", quantity
                     #print "e", e
-                    #print "n", n 
-                    if file[-5:] == 'z-mux' or file[-5:] == 'n-mux' :
+                    #print "n", n
+                    if file[-5:] == WAVEHEIGHT_MUX_LABEL[-5:] or \
+                           file[-5:] == NORTH_VELOCITY_LABEL[-5:] :
                         assert allclose(e, quantity)
-                    if file[-5:] == 'e-mux':
+                    if file[-5:] == EAST_VELOCITY_LABEL[-5:]:
                         assert allclose(n, quantity)
             assert count == time_step_count
@@ -5917 +5926 @@
     #suite = unittest.makeSuite(Test_Data_Manager,'cache_test_URS_points_needed_and_urs_ungridded2sww')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sww_momentum')
-    suite = unittest.makeSuite(Test_Data_Manager,'test_sync')
-    runner = unittest.TextTestRunner(verbosity=2)
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
+    runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)