Changeset 3704
- Timestamp:
- Oct 5, 2006, 8:50:08 PM (16 years ago)
- Location:
- anuga_core/source/anuga
- Files:
-
- 3 edited
-
abstract_2d_finite_volumes/test_quantity.py (modified) (2 diffs)
-
config.py (modified) (1 diff)
-
shallow_water/test_shallow_water_domain.py (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py
r3689 r3704 1012 1012 """ 1013 1013 quantity = Conserved_quantity(self.mesh4) 1014 1014 quantity.domain.beta_w = 0.9 1015 1015 1016 #Test centroids 1016 1017 quantity.set_values([2.,4.,8.,2.], location = 'centroids') … … 1027 1028 1028 1029 # limited value for beta_w = 0.9 1030 1029 1031 assert allclose(quantity.vertex_values[1,:], [2.2, 4.9, 4.9]) 1030 1032 # limited values for beta_w = 0.5 -
anuga_core/source/anuga/config.py
r3689 r3704 70 70 # 71 71 #Good values are: 72 beta_w = 0.9 73 beta_w_dry = 0.9 74 beta_uh = 0.9 75 beta_uh_dry = 0.9 76 beta_vh = 0.9 77 beta_vh_dry = 0.9 78 beta_h = 0.2 72 79 73 80 74 # I think these are better SR but they conflict with the unit tests! 81 #beta_w = 1.082 #beta_w_dry = 0.283 #beta_uh = 1.084 #beta_uh_dry = 0.285 #beta_vh = 1.086 #beta_vh_dry = 0.287 #beta_h = 0.275 beta_w = 1.0 76 beta_w_dry = 0.2 77 beta_uh = 1.0 78 beta_uh_dry = 0.2 79 beta_vh = 1.0 80 beta_vh_dry = 0.2 81 beta_h = 0.2 88 82 89 83 -
anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py
r3703 r3704 1517 1517 #Second order 1518 1518 domain._order_ = 2 1519 domain.beta_w = 0.9 1520 domain.beta_w_dry = 0.9 1521 domain.beta_uh = 0.9 1522 domain.beta_uh_dry = 0.9 1523 domain.beta_vh = 0.9 1524 domain.beta_vh_dry = 0.9 1519 1525 domain.distribute_to_vertices_and_edges() 1520 1526 assert allclose(L[1], [2.2, 4.9, 4.9]) … … 1554 1560 1555 1561 domain._order_ = 2 1562 domain.beta_w = 0.9 1563 domain.beta_w_dry = 0.9 1564 domain.beta_uh = 0.9 1565 domain.beta_uh_dry = 0.9 1566 domain.beta_vh = 0.9 1567 domain.beta_vh_dry = 0.9 1556 1568 domain.distribute_to_vertices_and_edges() 1557 1569 assert allclose(L[1], [0.57777777, 2.37777778, 2.37777778]) … … 1592 1604 1593 1605 domain._order_ = 2 1606 domain.beta_w = 0.9 1607 domain.beta_w_dry = 0.9 1608 domain.beta_uh = 0.9 1609 domain.beta_uh_dry = 0.9 1610 domain.beta_vh = 0.9 1611 domain.beta_vh_dry = 0.9 1594 1612 domain.distribute_to_vertices_and_edges() 1595 1613 assert allclose(L[1], [1.07160494, 6.46058131, 7.28262855]) … … 1731 1749 #print E 1732 1750 domain._order_ = 2 1751 domain.beta_w = 0.9 1752 domain.beta_w_dry = 0.9 1753 domain.beta_uh = 0.9 1754 domain.beta_uh_dry = 0.9 1755 domain.beta_vh = 0.9 1756 domain.beta_vh_dry = 0.9 1733 1757 domain.beta_h = 0.0 #Use first order in h-limiter 1734 1758 domain.distribute_to_vertices_and_edges() … … 2226 2250 domain.smooth = False 2227 2251 domain.default_order=2 2228 2252 domain.beta_w = 0.9 2253 domain.beta_w_dry = 0.9 2254 domain.beta_uh = 0.9 2255 domain.beta_uh_dry = 0.9 2256 domain.beta_vh = 0.9 2257 domain.beta_vh_dry = 0.9 2258 2229 2259 # Boundary conditions 2230 2260 Br = Reflective_boundary(domain) … … 2371 2401 domain.visualise = False 2372 2402 domain.default_order=2 2403 domain.beta_w = 0.9 2404 domain.beta_w_dry = 0.9 2405 domain.beta_uh = 0.9 2406 domain.beta_uh_dry = 0.9 2407 domain.beta_vh = 0.9 2408 domain.beta_vh_dry = 0.9 2373 2409 #domain.minimum_allowed_height = 0.0 #Makes it like the 'oldstyle' balance 2374 2410 … … 2429 2465 domain.visualise = False 2430 2466 domain.default_order=2 2467 domain.beta_w = 0.9 2468 domain.beta_w_dry = 0.9 2469 domain.beta_uh = 0.9 2470 domain.beta_uh_dry = 0.9 2471 domain.beta_vh = 0.9 2472 domain.beta_vh_dry = 0.9 2431 2473 domain.maximum_allowed_speed = 0.0 #Makes it like the 'oldstyle' 2432 2474 … … 2475 2517 domain.visualise = False 2476 2518 domain.default_order=domain._order_=2 2519 domain.beta_w = 0.9 2520 domain.beta_w_dry = 0.9 2521 domain.beta_uh = 0.9 2522 domain.beta_uh_dry = 0.9 2523 domain.beta_vh = 0.9 2524 domain.beta_vh_dry = 0.9 2477 2525 2478 2526 # Boundary conditions … … 2720 2768 domain.smooth = False 2721 2769 domain.default_order=2 2770 domain.beta_w = 0.9 2771 domain.beta_w_dry = 0.9 2772 domain.beta_uh = 0.9 2773 domain.beta_uh_dry = 0.9 2774 domain.beta_vh = 0.9 2775 domain.beta_vh_dry = 0.9 2722 2776 2723 2777 #Bed-slope and friction at vertices (and interpolated elsewhere) … … 2806 2860 domain.smooth = False 2807 2861 domain.default_order=2 2862 domain.beta_w = 0.9 2863 domain.beta_w_dry = 0.9 2864 domain.beta_uh = 0.9 2865 domain.beta_uh_dry = 0.9 2866 domain.beta_vh = 0.9 2867 domain.beta_vh_dry = 0.9 2808 2868 domain.beta_h = 0.0 #Use first order in h-limiter 2809 2869 … … 2898 2958 domain.smooth = False 2899 2959 domain.default_order=2 2960 domain.beta_w = 0.9 2961 domain.beta_w_dry = 0.9 2962 domain.beta_uh = 0.9 2963 domain.beta_uh_dry = 0.9 2964 domain.beta_vh = 0.9 2965 domain.beta_vh_dry = 0.9 2900 2966 domain.beta_h = 0.0 #Use first order in h-limiter 2901 2967 … … 2986 3052 domain.smooth = False 2987 3053 domain.default_order=2 3054 domain.beta_w = 0.9 3055 domain.beta_w_dry = 0.9 3056 domain.beta_uh = 0.9 3057 domain.beta_uh_dry = 0.9 3058 domain.beta_vh = 0.9 3059 domain.beta_vh_dry = 0.9 2988 3060 domain.beta_h = 0.0 #Use first order in h-limiter 2989 3061 … … 3102 3174 domain.smooth = False 3103 3175 domain.default_order=2 3176 domain.beta_w = 0.9 3177 domain.beta_w_dry = 0.9 3178 domain.beta_uh = 0.9 3179 domain.beta_uh_dry = 0.9 3180 domain.beta_vh = 0.9 3181 domain.beta_vh_dry = 0.9 3104 3182 domain.beta_h = 0.0 #Use first order in h-limiter 3105 3183
Note: See TracChangeset
for help on using the changeset viewer.
