Changeset 2604

Timestamp:

Mar 27, 2006, 2:04:19 PM (18 years ago)

Author:

duncan

Message:

check in unknown changes

Location:

production/gippsland_2005

Files:

• get_timeseries.py (modified) (5 diffs)
• project.py (modified) (1 diff)

production/gippsland_2005/get_timeseries.py

@@ -12 +12 @@
     
 #swwfile = project.newoutputname + '.sww'
-swwfile = project.outputname + '.sww'
+swwfile = project.outputname
+
+# Causes a memory error
+#swwfile = 'O:/2/cit/inundation/Gippsland Lakes/120106/lakes_100_628759.sww'
+
+swwfile = 'O:/2/cit/inundation/Gippsland Lakes/lakes_100_314920.sww'
+
 
 #Time interval to plot
@@ -39 +45 @@
     return gauges, lines, gaugelocation
 
-#gauges, buildings = get_gauges_from_file(project.gauge_filename)
 gauges, lines, locations = get_gauges_from_file(project.gauge_filename)
 
 #Read model output
-quantities = ['stage', 'elevation', 'xmomentum', 'ymomentum']
+quantities = ['stage', 'elevation']
 f = file_function(swwfile,
                   quantities = quantities,
                   interpolation_points = gauges,
                   verbose = True,
-                  use_cache = True)
+                  use_cache = False)
 
 
@@ -61 +66 @@
     stages = []
     elevations = []
-    momenta = []
-    velocity = []
 
     max_depth = 0
-    max_momentum = 0
-    max_velocity = 0
     for i, t in enumerate(f.T): # T is a list of times
         #if tmin < t < tmax:
         w = f(t, point_id = k)[0]
         z = f(t, point_id = k)[1]
-        uh = f(t, point_id = k)[2]
-        vh = f(t, point_id = k)[3]
         #myloc = locations[k]
-
-        m = sqrt(uh*uh + vh*vh)   #Absolute momentum
-        vel = sqrt(uh*uh + vh*vh) / (w-z + 1.e-30) #Absolute velocity
-        print vel
-        #dep = w-z
-        #vel = sqrt(uh*uh + vh*vh) / dep #Absolute velocity
         
         model_time.append(t)        
         stages.append(w)
         elevations.append(z)  #Should be constant over time
-        momenta.append(m)
-        velocity.append(vel)
 
         if w-z > max_depth:
             max_depth = w-z
-        if m > max_momentum:            
-            max_momentum = m
-        if vel > max_velocity:
-            max_velocity = vel
-            print 'max speed', max_velocity
 
     
@@ -105 +91 @@
     hold(False)
 
-    if elevations[0] < -10:
-        plot(model_time, stages, '-b')
-    else:    
-        plot(model_time, stages, '-b',
-             model_time, elevations, '-k')
+    plot(model_time, stages, '-b')      
     name = 'Gauge_%d: (%.1f, %.1f)' %(k, g[0], g[1])
     #name = 'Gauge_%d: (%.1f, %.1f) Location: %s' %(k, g[0], g[1], myloc)
@@ -124 +106 @@
     raw_input('Next')
 
-
-    #Momentum plot
-    ion()
-    hold(False)
-    plot(model_time, momenta, '-r')
-    title(name)
-
-    title('%s (momentum)' %name)
-    xlabel('time [s]')
-    ylabel('sqrt( uh^2 + vh^2 ) [m^2/s]')    
-    savefig('Gauge_%d_momentum' %k)
-    #savefig('Gauge_%s_momentum' %myloc)
-    
-    raw_input('Next')
-
-    #Speed plot
-    ion()
-    hold(False)
-    plot(model_time, velocity, '-r')
-    title(name)
-
-    title('%s (velocity)' %name)
-    xlabel('time [s]')
-    ylabel('sqrt( uh^2 + vh^2 ) / depth [m/s]')    
-    savefig('Gauge_%d_speed' %k)
-    #savefig('Gauge_%s_speed' %myloc)
-    
-    raw_input('Next')
     
 

production/gippsland_2005/project.py

@@ -39 +39 @@
 outputname = outputdir + basename  + '.sww' #Used by post processing
 
-gauge_filename = 'all_bld_ind.csv'
+gauge_filename = 'gauges.csv'
 
 tide = 0.0