Changeset 4078

Timestamp:

Dec 14, 2006, 11:49:49 AM (18 years ago)

Author:

sexton

Message:

modified sww2timeseries so that when elevation is positive, will plot depth rather than stage

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1053 +1053 @@
                     units = 'm'
                 if which_quantity == 'stage':
-                    plot(model_time[0:n[j]-1,k,j], stages[0:n[j]-1,k,j], '-', c = cstr[j])
+                    if elevations[0:n[j]-1,k,j] < 0:
+                        plot(model_time[0:n[j]-1,k,j], stages[0:n[j]-1,k,j], '-', c = cstr[j])
+                    else:
+                        plot(model_time[0:n[j]-1,k,j], depths[0:n[j]-1,k,j], '-', c = cstr[j])
                     #axis(stage_axis)
                     units = 'm'
@@ -1083 +1086 @@
 
                 xlabel('time (mins)')
-                ylabel('%s (%s)' %(which_quantity, units))
+                if which_quantity == 'stage' and elevations[0:n[j]-1,k,j] > 0:
+                    ylabel('%s (%s)' %('depth', units))
+                else:
+                    ylabel('%s (%s)' %(which_quantity, units))
                 if len(label_id) > 1: legend((leg_label),loc='upper right')
 
@@ -1130 +1136 @@
                 for i in range(nn-1):
                     if nn > 2:
-                        word_quantity += plot_quantity[i] + ', '
+                        if plot_quantity[i] == 'stage' and elevations[0,k,j] > 0:
+                            word_quantity += 'depth' + ', '
+                        else:
+                            word_quantity += plot_quantity[i] + ', '
                     else:
-                        word_quantity += plot_quantity[i]
+                        if plot_quantity[i] == 'stage' and elevations[0,k,j] > 0:
+                            word_quantity += 'depth' + ', '
+                        else:
+                            word_quantity += plot_quantity[i]
                     
-                word_quantity += ' and ' + plot_quantity[nn-1]
+                if plot_quantity[nn-1] == 'stage' and elevations[0,k,j] > 0:
+                    word_quantity += ' and ' + 'depth'
+                else:
+                    word_quantity += ' and ' + plot_quantity[nn-1]
                 caption = 'Time series for %s at %s location (elevation %.2fm)' %(word_quantity, locations[k], elev[k]) #gaugeloc.replace('_',' '))
                 if elev[k] == 0.0:
@@ -1151 +1166 @@
             for i in range(nn-1):
                 if nn > 2:
-                    word_quantity += plot_quantity[i] + ', '
+                    if plot_quantity[i] == 'stage' and elevations[0,k,j] > 0:
+                        word_quantity += 'depth' + ','
+                    else:
+                        word_quantity += plot_quantity[i] + ', '
                 else:
-                    word_quantity += plot_quantity[i]
+                    if plot_quantity[i] == 'stage' and elevations[0,k,j] > 0:
+                        word_quantity += 'depth'
+                    else:
+                        word_quantity += plot_quantity[i]
+                print 'hello', elevations[0,k,j]
                 where1 = 0
                 count1 += 1