Changeset 7846

Timestamp:

Jun 16, 2010, 8:23:42 AM (15 years ago)

Author:

James Hudson

Message:

Fixed failing validations

Location:

anuga_validation

Files:

• analytical_solutions/fit_example.py (deleted)
• automated_validation_tests/flow_tests/test_inflow_using_flowline.py (modified) (2 diffs)
• convergence_study/dam_break.py (modified) (4 diffs)
• performance_tests/run_profile.py (modified) (3 diffs)
• performance_tests/run_profile2.py (modified) (3 diffs)

anuga_validation/automated_validation_tests/flow_tests/test_inflow_using_flowline.py

@@ -28 +28 @@
 length = 400.
 width  = 20.
-dx = dy = 2          # Resolution: of grid on both axes
+dx = dy = 1.25          # Resolution: of grid on both axes
 
 points, vertices, boundary = anuga.rectangular_cross(int(length/dx), \
@@ -138 +138 @@
         
         msg = 'Predicted depth of flow at 200m was %f, should have been %f' % (normal_depth, domain_depth)
-        msg = 'Mannings n = %s, slope = %s' % (mannings_n, slope)
+        msg += 'Mannings n = %s, slope = %s' % (mannings_n, slope)
         if verbose:
             print 'Depth at 200m: ANUGA = %f, Mannings = %f' % (domain_depth, normal_depth)

anuga_validation/convergence_study/dam_break.py

@@ -10 +10 @@
 
 import sys
-from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
-from anuga.shallow_water import Domain
-from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Dirichlet_boundary
-from anuga.shallow_water import Time_boundary
-from anuga.shallow_water import Transmissive_boundary
-from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
-from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files
+import anuga
 
 from math import cos
-from Numeric import zeros, Float
+from numpy import zeros, float
 from time import localtime, strftime, gmtime
 
@@ -34 +27 @@
 output_file = 'dam_break'
 
-copy_code_files(output_dir,__file__)
+anuga.copy_code_files(output_dir,__file__)
 #start_screen_catcher(output_dir+'_')
 
@@ -47 +40 @@
 
 # structured mesh
-points, vertices, boundary = rectangular_cross(int(L/dx), int(W/dy), L, W, (0.0, -W/2))
+points, vertices, boundary = anuga.rectangular_cross(int(L/dx), int(W/dy), L, W, (0.0, -W/2))
 
-domain = Domain(points, vertices, boundary) 
+domain = anuga.Domain(points, vertices, boundary) 
 
 domain.set_name(output_file)                
@@ -97 +90 @@
 #------------------------------------------------------------------------------
 from math import sin, pi, exp
-Br = Reflective_boundary(domain)      # Solid reflective wall
-Bt = Transmissive_boundary(domain)    # Continue all values on boundary 
-Bd = Dirichlet_boundary([1,0.,0.]) # Constant boundary values
+Br = anuga.Reflective_boundary(domain)      # Solid reflective wall
+Bt = anuga.Transmissive_boundary(domain)    # Continue all values on boundary 
+Bd = anuga.Dirichlet_boundary([1,0.,0.]) # Constant boundary values
 
 

anuga_validation/performance_tests/run_profile.py

@@ -6 +6 @@
 ######################
 # Module imports
-from anuga.shallow_water import Domain, Reflective_boundary
-from mesh_factory import rectangular
-#import numpy as num     # not used?
-
+import anuga
 
 ######################
@@ -21 +18 @@
 print 'Creating domain'
 #Create basic mesh
-points, vertices, boundary = rectangular(N, N)
+points, vertices, boundary = anuga.rectangular(N, N)
 
 #Create shallow water domain
-domain = Domain(points, vertices, boundary)
+domain = anuga.Domain(points, vertices, boundary)
 domain.set_default_order(2)        
 domain.set_quantities_to_be_stored(None)
@@ -41 +38 @@
 
 print 'Setting boundary conditions'
-Br = Reflective_boundary(domain)
+Br = anuga.Reflective_boundary(domain)
 domain.set_boundary({'left': Br, 'right': Br, 'bottom': Br, 'top': Br})
 

anuga_validation/performance_tests/run_profile2.py

@@ -11 +11 @@
 # Module imports 
 #
-from anuga.shallow_water import Domain, Reflective_boundary,\
-     Dirichlet_boundary,\
-     Transmissive_boundary, Time_boundary
-
-from mesh_factory import rectangular
-from Numeric import array
+import anuga
+from numpy import array
     
 
@@ -27 +23 @@
 print 'Creating domain'
 #Create basic mesh
-points, vertices, boundary = rectangular(N, N)
+points, vertices, boundary = anuga.rectangular(N, N)
 
 #Create shallow water domain
-domain = Domain(points, vertices, boundary)
+domain = anuga.Domain(points, vertices, boundary)
 domain.default_order = 2
 domain.set_quantities_to_be_stored(None)
@@ -46 +42 @@
 # Boundary conditions
 #
-Br = Reflective_boundary(domain)
+Br = anuga.Reflective_boundary(domain)
 domain.set_boundary({'left': Br, 'right': Br, 'bottom': Br, 'top': Br})