Changeset 2700

Timestamp:

Apr 11, 2006, 5:05:36 PM (17 years ago)

Author:

nick

Message:

added functionality to export_results.py

Location:

production/onslow_2006

Files:

• export_results.py (modified) (3 diffs)
• get_timeseries.py (modified) (4 diffs)

production/onslow_2006/export_results.py

@@ -1 +1 @@
 import project, os
-from os import sep
+import sys
 
 from pyvolution.data_manager import sww2dem
 from pyvolution.ermapper_grids import read_ermapper_grid
+from pyvolution.util import Screen_Catcher
+from os import sep
 
-#name = project.outputname
-
-time_dir = "20060328_094539_alpha_0.1"
+time_dir = "20060327_095435"
 directory = project.outputdir
 name = directory + time_dir +sep + "source"
 
-print'output dir:', name
+#normal screen output is stored in 'outname'
+screen_output_name = directory + time_dir + sep + "export_output.txt"
+
+#used to catch screen output to file
+sys.stdout = Screen_Catcher(screen_output_name)
+sys.stderr = Screen_Catcher(screen_output_name)
+
+print 'output dir:', name
 #print 'Which variable do you want to export?'
 #which_var = int(raw_input('Stage = 0, Absolute Momentum = 1, Depth = 2, Speed = 3  '  ))
@@ -38 +45 @@
     quantityname = 'elevation'  #Elevation
 
-    
+print 'start sww2dem'
 sww2dem(name, basename_out = outname,
             quantity = quantityname,
-            cellsize = 30,       # Trevor would like this at 25
+            cellsize = 1000,       # Trevor would like this at 25
             # define region for viz purposes
             easting_min = project.e_min_area,
@@ -51 +58 @@
             format = 'asc')
 
+sys.stderr.write(sys.stdout.data)
+
 #Check
 

production/onslow_2006/get_timeseries.py

@@ -11 +11 @@
 
  
-'''
-time_dir = "20060331_155157"
+
+time_dir = "20060410_054158_elevation_6_side_15000"
 directory = project.outputdir
 swwfile = directory + time_dir +sep + "source.sww"
@@ -18 +18 @@
 directory = project.boundarydir
 swwfile = directory + "SU-AU_high_res.sww"
-
+'''
 #swwfile = project.outputname + '.sww'
 
@@ -30 +30 @@
     for line in lines[1:]:
         fields = line.split(',')
-        # my gauge file set up as locationname, easting, northing
+        # my gauge file set up as  easting, northing locationname,
         
         easting = float(fields[0])
         northing = float(fields[1])
-        location = fields[2]
+        location = fields[2].strip()
+        print 'location',location
         #z, easting, northing  = redfearn(lat, lon)
         gauges.append([easting, northing])
@@ -207 +208 @@
 
     whichone = '_%s' %myloc
-    thisfile = project.gaugetimeseries+whichone+'.csv'
+#    thisfile = project.gaugetimeseries+whichone+'.csv'
+    thisfile = directory + time_dir +sep +whichone+'.csv'
     fid = open(thisfile, 'w')
     s = 'Time, Depth, Momentum, Velocity \n'