Changeset 9056 for trunk/anuga_work/development/gareth/tests/wave_runup

Timestamp:

Mar 3, 2014, 9:58:02 AM (11 years ago)

Author:

davies

Message:

Minor updates to validation tests

Location:

trunk/anuga_work/development/gareth/tests/wave_runup

Files:

• plotme.py (modified) (2 diffs)
• runup.py (modified) (2 diffs)

trunk/anuga_work/development/gareth/tests/wave_runup/plotme.py

@@ -66 +66 @@
 for i in range(len(model_shore_x)):
     # Compute index of shoreline
-    vtmp = p2.stage[i,:]>p2.elev+shoreline_depth_thresh1
+    #vtmp = p2.stage[i,:]>p2.elev+shoreline_depth_thresh1
+    #model_shore_x[i]=p2.x[vtmp].min()
     
-    model_shore_x[i]=p2.x[vtmp].min()
+    vtmp = p2.stage[i,:]<p2.elev+shoreline_depth_thresh1
+    model_shore_x[i]=p2.x[vtmp].max()
+    vtmp2=(p2.x>model_shore_x[i])
+    model_shore_x[i]=p2.x[vtmp2].min()
     #v_ind=(p2.stage[i,vtmp]-p2.elev[vtmp]).argmin()
     # Store x and xvel
@@ -76 +80 @@
     # Extract shoreline velocity. It is tricky, to avoid getting
     # zero velocity points -- might be a better way to do it?
-    vtmp2= (p2.stage[i,:]>p2.elev+shoreline_depth_thresh1)*\
-           (p2.stage[i,:]<p2.elev+shoreline_depth_thresh2)
-    mloc=abs(p2.xvel[i,vtmp2]).argmax()
+    #vtmp2= (p2.stage[i,:]>p2.elev+shoreline_depth_thresh1)*\
+    #       (p2.stage[i,:]<p2.elev+shoreline_depth_thresh2)
+    #mloc=abs(p2.xvel[i,vtmp2]).argmax()
+
     #print abs(p2.xvel[i,vtmp2]).max(), mloc
-    model_shore_u[i]=p2.xvel[i,vtmp2][mloc]
+    #model_shore_u[i]=p2.xvel[i,vtmp2][mloc]
     #vtmp2 = (p2.stage[i,:]>p2.elev+0.01)
     #mloc= (vtmp2*(p2.stage[i,:]-p2.elev)).argmin()
     #model_shore_u[i] = p2.xvel[i,mloc]
+    
+    vtmp2=vtmp
+    mloc=model_shore_x[i]
+    model_shore_u[i] = p2.xvel[i,p2.x==model_shore_x[i]].max()
 
 pyplot.plot(p2.time, model_shore_x-200.,'-o')

trunk/anuga_work/development/gareth/tests/wave_runup/runup.py

@@ -10 +10 @@
 
 from math import sin, pi, exp
-from bal_and import *
-#from anuga import Domain as Domain
+#from bal_and import *
+from anuga import Domain as Domain
 
 #from anuga_tsunami import *
@@ -32 +32 @@
 domain.set_datadir('.')                          # Use current folder
 #domain.set_quantities_to_be_stored({'stage': 2, 'xmomentum': 2, 'ymomentum': 2, 'elevation': 1})
-#domain.set_flow_algorithm('DE1')
+domain.set_flow_algorithm('DE1')
 #------------------
 # Define topography