Changeset 5466 for anuga_core/source/anuga/shallow_water

Timestamp:

Jul 4, 2008, 2:51:12 PM (15 years ago)

Author:

ole

Message:

Changed file name conventions for mux files.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (6 diffs)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4121 +4121 @@
 
     Specify only basename_in and read files of the form
-    basefilename_velocity-z-mux, basefilename_velocity-e-mux and
-    basefilename_waveheight-n-mux containing relative height,
+    basefilename-z-mux2, basefilename-e-mux2 and
+    basefilename-n-mux2 containing relative height,
     x-velocity and y-velocity, respectively.
 
@@ -4173 +4173 @@
 
     The name of the urs file names must be;
-    [basename_in]_velocity-z-mux
-    [basename_in]_velocity-e-mux
-    [basename_in]_waveheight-n-mux
+    [basename_in]-z-mux
+    [basename_in]-e-mux
+    [basename_in]-n-mux
     
     """
@@ -4646 +4646 @@
     #### CONVERTING UNGRIDDED URS DATA TO AN SWW FILE ####
    
-WAVEHEIGHT_MUX_LABEL = '_waveheight-z-mux'
-EAST_VELOCITY_LABEL =  '_velocity-e-mux'
-NORTH_VELOCITY_LABEL =  '_velocity-n-mux' 
+WAVEHEIGHT_MUX_LABEL = '-z-mux'
+EAST_VELOCITY_LABEL =  '-e-mux'
+NORTH_VELOCITY_LABEL =  '-n-mux' 
 def urs_ungridded2sww(basename_in='o', basename_out=None, verbose=False,
                       mint=None, maxt=None,
@@ -4661 +4661 @@
 
     Specify only basename_in and read files of the form
-    basefilename_velocity-z-mux, basefilename_velocity-e-mux and
-    basefilename_waveheight-n-mux containing relative height,
+    basefilename-z-mux, basefilename-e-mux and
+    basefilename-n-mux containing relative height,
     x-velocity and y-velocity, respectively.
 
@@ -4834 +4834 @@
     ##################################
 
-WAVEHEIGHT_MUX2_LABEL = '_waveheight-z-mux2'
-EAST_VELOCITY_MUX2_LABEL =  '_velocity-e-mux2'
-NORTH_VELOCITY_MUX2_LABEL =  '_velocity-n-mux2'    
+WAVEHEIGHT_MUX2_LABEL = '-z-mux2'
+EAST_VELOCITY_MUX2_LABEL =  '-e-mux2'
+NORTH_VELOCITY_MUX2_LABEL =  '-n-mux2'    
 
 def read_mux2_py(filenames,weights):
@@ -4919 +4919 @@
     
     These are combined with the extensions:
-    WAVEHEIGHT_MUX2_LABEL = '_waveheight-z-mux2' for stage
-    EAST_VELOCITY_MUX2_LABEL =  '_velocity-e-mux2' xmomentum
-    NORTH_VELOCITY_MUX2_LABEL =  '_velocity-n-mux2' and ymomentum
+    WAVEHEIGHT_MUX2_LABEL = '-z-mux2' for stage
+    EAST_VELOCITY_MUX2_LABEL =  '-e-mux2' xmomentum
+    NORTH_VELOCITY_MUX2_LABEL =  '-n-mux2' and ymomentum
     
     to create a 2D list of mux2 file. The rows are associated with each quantity and must have the above extensions

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -7018 +7018 @@
 
         assert allclose(temp_fbound,temp_drchlt)
-        os.remove(sts_file+'.sts')
+
+        try:
+            os.remove(sts_file+'.sts')
+        except:
+            # Windoze can't remove this file for some reason 
+            pass
+        
         os.remove(meshname)