Changeset 9165

Timestamp:

Jun 16, 2014, 11:36:32 PM (10 years ago)

Author:

davies

Message:

Fixing likely bug in riverwall routine

Location:

trunk/anuga_core/source/anuga

Files:

• shallow_water/swDE1_domain_ext.c (modified) (1 diff)
• structures/riverwall.py (modified) (1 diff)

trunk/anuga_core/source/anuga/shallow_water/swDE1_domain_ext.c

@@ -691 +691 @@
             // Edge flux computation (triangle k, edge i)
             _flux_function_central(ql, qr,
+            //_flux_function_toro(ql, qr,
                     h_left, h_right,
                     hle, hre,

trunk/anuga_core/source/anuga/structures/riverwall.py

@@ -478 +478 @@
 
         # Find which 2 vertices have the edge value, by testing the
-        # x coordinate.
+        # coordinates
         X01=0.5*(domain.vertex_coordinates[rwV0Inds,0]+domain.vertex_coordinates[rwV1Inds,0]) 
-        k01=(abs(X01- domain.edge_coordinates[riverwalledgeInds,0])<tol)
+        Y01=0.5*(domain.vertex_coordinates[rwV0Inds,1]+domain.vertex_coordinates[rwV1Inds,1]) 
+        k01=(abs(X01- domain.edge_coordinates[riverwalledgeInds,0])+abs(Y01-domain.edge_coordinates[riverwalledgeInds,1])<tol)
         X12=0.5*(domain.vertex_coordinates[rwV2Inds,0]+domain.vertex_coordinates[rwV1Inds,0])
-        k12=(abs(X12 - domain.edge_coordinates[riverwalledgeInds,0])<tol)
+        Y12=0.5*(domain.vertex_coordinates[rwV2Inds,1]+domain.vertex_coordinates[rwV1Inds,1])
+        k12=(abs(X12 - domain.edge_coordinates[riverwalledgeInds,0])+abs(Y12-domain.edge_coordinates[riverwalledgeInds,1])<tol)
         X02=0.5*(domain.vertex_coordinates[rwV2Inds,0]+domain.vertex_coordinates[rwV0Inds,0])
-        k02=(abs(X02 - domain.edge_coordinates[riverwalledgeInds,0])<tol)
+        Y02=0.5*(domain.vertex_coordinates[rwV2Inds,1]+domain.vertex_coordinates[rwV0Inds,1])
+        k02=(abs(X02 - domain.edge_coordinates[riverwalledgeInds,0])+abs(Y02-domain.edge_coordinates[riverwalledgeInds,1])<tol)
 
         riverwallV2Inds=riverwallCentInds*0