Changeset 5166

Timestamp:

Mar 12, 2008, 11:24:21 AM (16 years ago)

Author:

steve

Message:

Had a problem with test_util in abstract_2d_finite_volumes. Problem with seperators missing in filenames, and filenames generally in test_util.py

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py (modified) (4 diffs)
• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (6 diffs)
• anuga_work/development/attenuation_near_shore/create_mesh.py (modified) (1 diff)
• anuga_work/development/attenuation_near_shore/run_beach_structured.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -1349 +1349 @@
             fileName = temp_dir+sep+'time_series_3.csv'
             file = open(fileName,"w")
-            file.write("Time,Stage,Speed,Momentum,Elevation\n\
+            file.write("time,stage,speed,momentum,elevation\n\
 1.0, 0, 0, 0, 10 \n\
 2.0, 5, 2, 4, 10 \n\
@@ -1357 +1357 @@
             fileName1 = temp_dir+sep+'time_series_4.csv'
             file1 = open(fileName1,"w")
-            file1.write("Time,Stage,Speed,Momentum,Elevation\n\
+            file1.write("time,stage,speed,momentum,elevation\n\
 1.0, 0, 0, 0, 5 \n\
 2.0, -5, -2, -4, 5 \n\
@@ -1365 +1365 @@
             fileName2 = temp_dir+sep+'time_series_5.csv'
             file2 = open(fileName2,"w")
-            file2.write("Time,Stage,Speed,Momentum,Elevation\n\
+            file2.write("time,stage,speed,momentum,elevation\n\
 1.0, 0, 0, 0, 7 \n\
 2.0, 4, -0.45, 57, 7 \n\
@@ -1376 +1376 @@
                                 base_name='time_series_',
                                 plot_numbers=['3-5'],
-                                quantities=['Speed','Stage','Momentum'],
+                                quantities=['speed','stage','momentum'],
                                 assess_all_csv_files=True,
                                 extra_plot_name='test')
             
-    #        print 'stage+fileName[:-4]+test.png',dir+sep+'stage_'+name[:-4]+'_test.png'
-            assert(access(dir+sep+'stage_'+name[:-4]+'_test.png',F_OK)==True)
-            assert(access(dir+sep+'speed_'+name[:-4]+'_test.png',F_OK)==True)
-            assert(access(dir+sep+'momentum_'+name[:-4]+'_test.png',F_OK)==True)
+            #print dir+sep+name[:-4]+'_stage_test.png'
+            assert(access(dir+sep+name[:-4]+'_stage_test.png',F_OK)==True)
+            assert(access(dir+sep+name[:-4]+'_speed_test.png',F_OK)==True)
+            assert(access(dir+sep+name[:-4]+'_momentum_test.png',F_OK)==True)
     
             dir1, name1=os.path.split(fileName1)
-            assert(access(dir+sep+'stage_'+name1[:-4]+'_test.png',F_OK)==True)
-            assert(access(dir+sep+'speed_'+name1[:-4]+'_test.png',F_OK)==True)
-            assert(access(dir+sep+'momentum_'+name1[:-4]+'_test.png',F_OK)==True)
+            assert(access(dir+sep+name1[:-4]+'_stage_test.png',F_OK)==True)
+            assert(access(dir+sep+name1[:-4]+'_speed_test.png',F_OK)==True)
+            assert(access(dir+sep+name1[:-4]+'_momentum_test.png',F_OK)==True)
     
     
             dir2, name2=os.path.split(fileName2)
-            assert(access(dir+sep+'stage_'+name2[:-4]+'_test.png',F_OK)==True)
-            assert(access(dir+sep+'speed_'+name2[:-4]+'_test.png',F_OK)==True)
-            assert(access(dir+sep+'momentum_'+name2[:-4]+'_test.png',F_OK)==True)
+            assert(access(dir+sep+name2[:-4]+'_stage_test.png',F_OK)==True)
+            assert(access(dir+sep+name2[:-4]+'_speed_test.png',F_OK)==True)
+            assert(access(dir+sep+name2[:-4]+'_momentum_test.png',F_OK)==True)
     
             del_dir(temp_dir)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1509 +1509 @@
                                 base_name='',
                                 plot_numbers=['3-5'],
-                                quantities=['Speed','Stage','Momentum'],
+                                quantities=['speed','stage','momentum'],
                                 assess_all_csv_files=True,
                                 extra_plot_name='test' ):
     
     print 'make_plots_from_csv_file has been replaced by csv2timeseries_graphs ',
-    print 'Please use "from anuga.shallow_water.util import csv2timeseries_graphs"'
+    print 'Please use "from anuga.abstract_2d_finite_volumes.util import csv2timeseries_graphs"'
     
     return csv2timeseries_graphs(directories_dic,
@@ -1704 +1704 @@
     all_csv_filenames=[]
     if verbose: print 'Determining files to access for axes ranges \n'
-#    print directories_dic.keys, base_name
+    
+    #print directories_dic.keys(), base_name
  
     for i,directory in enumerate(directories_dic.keys()):
@@ -1723 +1724 @@
 
 
-#    print "list_filenames", list_filenames
+    #print "list_filenames", list_filenames
 
     #use all the files to get the values for the plot axis
@@ -1862 +1863 @@
     legend_list_dic={}
     legend_list =[]
-    for i, directory in enumerate(directories_dic.keys()): 
+    for i, directory in enumerate(directories_dic.keys()):
+        
         if verbose: print'Plotting in %s %s' %(directory, new_plot_numbers)
 #        print 'LIST',list_filenames
@@ -1879 +1881 @@
             #if they don't exist
             #print 'i %s,j %s, number %s, file %s' %(i,j,number,file)
-            attribute_dic, title_index_dic = csv2dict(directory+filename+'.csv')
+            attribute_dic, title_index_dic = csv2dict(directory+sep+filename+'.csv')
             #get data from dict in to list
             #do maths to list by changing to array
@@ -1930 +1932 @@
                     pylab.title('%s at %s gauge' %(quantity,filename[len(base_name):]))
                     if output_dir == '':
-                        figname = '%s%s_%s%s.png' %(directory,
+                        figname = '%s%s%s_%s%s.png' %(directory,sep,
                                             filename,
                                             quantity,
                                             extra_plot_name)
                     else:
-                        figname = '%s%s_%s%s.png' %(output_dir,
+                        figname = '%s%s%s_%s%s.png' %(output_dir,sep,
                                             filename,
                                             quantity,

anuga_work/development/attenuation_near_shore/create_mesh.py

@@ -77 +77 @@
     dy = dx
     L = 2080.
-    W = 2000.
+    W = dx
 
     # structured mesh
-    points, vertices, boundary = rectangular_cross(int(L/dx), int(W/dy), L, W, (-80.0, -1000.0))
+    points, vertices, boundary = rectangular_cross(int(L/dx), int(W/dy), L, W, (-80.0, -W*0.5))
 
     domain = Domain(points, vertices, boundary) 

anuga_work/development/attenuation_near_shore/run_beach_structured.py

@@ -123 +123 @@
 
     head,tail = path.split(mesh_filename)
-    copy (mesh_filename,
-          pro_instance.outputdir + tail )
+    #copy (mesh_filename,
+    #      pro_instance.outputdir + tail )
     #-------------------------------------------------------------------------
     # Setup computational domain