Changeset 8288

Timestamp:

Dec 18, 2011, 6:55:46 PM (11 years ago)

Author:

steve

Message:

Added in new test function for balanced code

Location:

trunk

Files:

• anuga_core/source/anuga/__init__.py (modified) (1 diff)
• anuga_work/shallow_water_balanced_steve/merimbula_10785_1.tsh (added)
• anuga_work/shallow_water_balanced_steve/run_step.py (modified) (1 diff)
• anuga_work/shallow_water_balanced_steve/run_sw_merimbula.py (added)
• anuga_work/shallow_water_balanced_steve/swb_domain.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/__init__.py

@@ -175 +175 @@
 # Create domain from file
 #----------------------------
-def create_domain_from_file(file):
+def create_domain_from_file(file, DomainClass=Domain):
     """
     Create a domain from a file
     """
-    return pmesh_to_domain_instance(file,Domain)
+    return pmesh_to_domain_instance(file,DomainClass=DomainClass)
 
 #---------------------------

trunk/anuga_work/shallow_water_balanced_steve/run_step.py

@@ -49 +49 @@
 
 
-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)
+#anuga.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/swb_domain.py

@@ -75 +75 @@
         # with swb version
         #--------------------------------------------
+        print self.forcing_terms
+
         self.forcing_terms[1] = swb_gravity
 
-        print "Swb_domain"
-
+        print 'swb_domain'
+        print self.forcing_terms
     def check_integrity(self):
         Sww_domain.check_integrity(self)
@@ -232 +234 @@
         num_min = num.min(h_V)
         if num_min < -1.0e-14:
-            print 'num.min(h_V)', num_min
+            #print 'num.min(h_V)', num_min
+            pass