Changeset 4647

Timestamp:

Jul 31, 2007, 11:38:31 AM (17 years ago)

Author:

nick

Message:

fixed ticket 188

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• test_util.py (modified) (1 diff)
• util.py (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -1335 +1335 @@
             return
         
-        current_dir=getcwd()+sep+'abstract_2d_finite_volumes'
-        temp_dir = tempfile.mkdtemp('','figures')
-#        print 'temp_dir',temp_dir
-        fileName = temp_dir+sep+'time_series_3.csv'
-        file = open(fileName,"w")
-        file.write("Time,Stage,Speed,Momentum,Elevation\n\
+        if sys.platform == 'win32':  #Windows
+        
+            current_dir=getcwd()+sep+'abstract_2d_finite_volumes'
+            temp_dir = tempfile.mkdtemp('','figures')
+    #        print 'temp_dir',temp_dir
+            fileName = temp_dir+sep+'time_series_3.csv'
+            file = open(fileName,"w")
+            file.write("Time,Stage,Speed,Momentum,Elevation\n\
 1.0, 0, 0, 0, 10 \n\
 2.0, 5, 2, 4, 10 \n\
 3.0, 3, 3, 5, 10 \n")
-        file.close()
-
-        fileName1 = temp_dir+sep+'time_series_4.csv'
-        file1 = open(fileName1,"w")
-        file1.write("Time,Stage,Speed,Momentum,Elevation\n\
+            file.close()
+    
+            fileName1 = temp_dir+sep+'time_series_4.csv'
+            file1 = open(fileName1,"w")
+            file1.write("Time,Stage,Speed,Momentum,Elevation\n\
 1.0, 0, 0, 0, 5 \n\
 2.0, -5, -2, -4, 5 \n\
 3.0, -4, -3, -5, 5 \n")
-        file1.close()
-
-        fileName2 = temp_dir+sep+'time_series_5.csv'
-        file2 = open(fileName2,"w")
-        file2.write("Time,Stage,Speed,Momentum,Elevation\n\
+            file1.close()
+    
+            fileName2 = temp_dir+sep+'time_series_5.csv'
+            file2 = open(fileName2,"w")
+            file2.write("Time,Stage,Speed,Momentum,Elevation\n\
 1.0, 0, 0, 0, 7 \n\
 2.0, 4, -0.45, 57, 7 \n\
 3.0, 6, -0.5, 56, 7 \n")
-        file2.close()
-        
-        dir, name=os.path.split(fileName)
-        make_plots_from_csv_file(directories_dic={dir:['gauge', 0, 0]},
-                            output_dir=temp_dir,
-                            base_name='time_series_',
-                            plot_numbers=['3-5'],
-                            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)
-
-        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)
-
-
-        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)
-
-        del_dir(temp_dir)
+            file2.close()
+            
+            dir, name=os.path.split(fileName)
+            make_plots_from_csv_file(directories_dic={dir:['gauge', 0, 0]},
+                                output_dir=temp_dir,
+                                base_name='time_series_',
+                                plot_numbers=['3-5'],
+                                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)
+    
+            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)
+    
+    
+            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)
+    
+            del_dir(temp_dir)
+        
 
     

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1742 +1742 @@
         for j, filename in enumerate(which_csv_to_assess):
             if assess_all_csv_files==False:
-                dir_filename=directory+base_name+sep+filename
+#                dir_filename=directory+sep+base_name+filename
+                dir_filename=join(directory,base_name+filename)
             else:
                 dir_filename=join(directory,filename)
-                
+#            print'dir_filename',dir_filename
             attribute_dic, title_index_dic = csv2dict(dir_filename+
                                                        '.csv')
@@ -1785 +1786 @@
                      min_mom, max_mom)
 #    ion()
-    pylab.hold()
+#    pylab.hold()