Changeset 8248

Timestamp:

Nov 15, 2011, 4:36:00 PM (13 years ago)

Author:

steve

Message:

commiting at the anuga_core level

Location:

trunk

Files:

• anuga_core/compile_all.py (modified) (2 diffs)
• anuga_core/source/anuga/__init__.py (modified) (2 diffs)
• anuga_core/source/anuga/compile_all.py (modified) (2 diffs)
• anuga_core/source/anuga/operators/base_operator.py (modified) (2 diffs)
• anuga_core/source/anuga/operators/mannings_operator.py (added)
• anuga_core/source/anuga/operators/mannings_operator_ext.c (added)
• anuga_validation/okushiri_2005/run_okushiri.py (modified) (3 diffs)
• anuga_work/shallow_water_balanced_steve/run_step.py (modified) (2 diffs)
• anuga_work/shallow_water_balanced_steve/run_wave.py (modified) (3 diffs)
• anuga_work/shallow_water_balanced_steve/swb_domain.py (modified) (1 diff)

trunk/anuga_core/compile_all.py

@@ -28 +28 @@
 
 os.chdir('..')
+os.chdir('geometry')
+execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
+
+os.chdir('..')
 os.chdir('structures')
 execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
@@ -43 +47 @@
 execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
-os.chdir('..')
-os.chdir('shallow_water_balanced')
-execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
 os.chdir('..')

trunk/anuga_core/source/anuga/__init__.py

@@ -305 +305 @@
     """
 
-    from anuga.shallow_water.shallow_water_domain import Domain
+    #from anuga.shallow_water.shallow_water_domain import Domain
     from anuga.pmesh.mesh_interface import create_mesh_from_regions
     
@@ -321 +321 @@
                              use_cache=False,
                              verbose=verbose)
+
     domain = Domain(mesh_filename, use_cache=False, verbose=verbose)
 

trunk/anuga_core/source/anuga/compile_all.py

@@ -10 +10 @@
 execfile('compile.py')
 
-os.chdir('..')
-os.chdir('advection')
-execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
+#os.chdir('..')
+#os.chdir('advection')
+#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
 os.chdir('..')
 os.chdir('operators')
+execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
+
+
+os.chdir('..')
+os.chdir('geometry')
 execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
@@ -34 +39 @@
 execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
-os.chdir('..')
-os.chdir('shallow_water_balanced')
-execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
+#os.chdir('..')
+#os.chdir('shallow_water_balanced')
+#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
 os.chdir('..')

trunk/anuga_core/source/anuga/operators/base_operator.py

@@ -28 +28 @@
 
     def __parallel_safe(self):
-
-        return True
+        """By default an operator is not parallel safe
+        """
+        return False
 
     def statistics(self):
@@ -35 +36 @@
         message = 'You need to implement operator statistics for your operator'
         return message
+    
 
     def print_statistics(self):

trunk/anuga_validation/okushiri_2005/run_okushiri.py

@@ -22 +22 @@
 
 # Module imports
-from anuga.interface import Domain
-from anuga.interface import Reflective_boundary
-from anuga.interface import Time_boundary
-from anuga.interface import Transmissive_momentum_set_stage_boundary
-from anuga.interface import Transmissive_n_momentum_zero_t_momentum_set_stage_boundary
-from anuga.interface import file_function
+from anuga import Domain
+from anuga import Reflective_boundary
+from anuga import Time_boundary
+from anuga import Transmissive_momentum_set_stage_boundary
+from anuga import Transmissive_n_momentum_zero_t_momentum_set_stage_boundary
+from anuga import file_function
 
 import project
@@ -84 +84 @@
 triangle_id = domain.get_triangle_containing_point([4.521, 1.196])
 # This should get triangle id 32833 with centroid (4.5244, 1.1972)
+print 'triangle_id = ',triangle_id
 bdry_id = domain.get_triangle_containing_point([0.000, 1.696])
+# This should get triangle id 56474
 print 'bdry_id = ',bdry_id
 
@@ -96 +98 @@
 for t in domain.evolve(yieldstep = 0.05, finaltime = 22.5):
     domain.write_time()
-    print  function(domain.get_time())[0],' bdry_d = ',bdry_id,' ',\
+    print '   ',function(domain.get_time())[0],' bdry_d = ',bdry_id,' ',\
           domain.get_conserved_quantities(bdry_id, edge=0)[0],' ',\
           domain.get_conserved_quantities(bdry_id, edge=1)[0],' ',\

trunk/anuga_work/shallow_water_balanced_steve/run_step.py

@@ -12 +12 @@
 import sys
 import anuga
+#from anuga import Domain
 from swb_domain import *
 
@@ -46 +47 @@
 # structured mesh
 points, vertices, boundary = anuga.rectangular_cross(int(L/dx), int(W/dy), L, W, (0.0, -W/2))
+
+
+create_mesh_from_regions(bounding_polygon,
+                             boundary_tags,
+                             maximum_triangle_area=maximum_triangle_area,
+                             interior_regions=interior_regions,
+                             filename=mesh_filename,
+                             interior_holes=interior_holes,
+                             hole_tags=hole_tags,
+                             poly_geo_reference=poly_geo_reference,
+                             mesh_geo_reference=mesh_geo_reference,
+                             minimum_triangle_angle=minimum_triangle_angle,
+                             fail_if_polygons_outside=fail_if_polygons_outside,
+                             use_cache=False,
+                             verbose=verbose)
 
 domain = Domain(points, vertices, boundary) 

trunk/anuga_work/shallow_water_balanced_steve/run_wave.py

@@ -12 +12 @@
 import sys
 import anuga
-from swb_domain import *
+from anuga import Domain
+#from swb_domain import *
 
 from math import cos
@@ -56 +57 @@
 domain.set_timestepping_method('rk2')
 domain.set_default_order(2)
+domain.set_beta(2.0)
 
 print domain.get_timestepping_method()
@@ -79 +81 @@
 Bd = anuga.Dirichlet_boundary([1,0.,0.]) # Constant boundary values
 amplitude = 1
-wave_length = 1000.0
+wave_length = 300.0
 Bw = anuga.Time_boundary(domain=domain,     # Time dependent boundary
 ## Sine wave

trunk/anuga_work/shallow_water_balanced_steve/swb_domain.py

@@ -77 +77 @@
         self.forcing_terms[1] = swb_gravity
 
+        print "Swb_domain"
 
     def check_integrity(self):