Changeset 7914 for trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/shallow_water_domain_avalanche.py
 Timestamp:
 Aug 5, 2010, 5:41:58 PM (13 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/shallow_water_domain_avalanche.py
r7837 r7914 218 218 """ 219 219 220 from Numeric import zeros, Float 220 from Numeric import Float 221 from numpy import zeros 221 222 222 223 assert len(q) == 3,\ … … 266 267 from config import g, epsilon, h0 267 268 from math import sqrt 268 from Numericimport array269 from numpy import array 269 270 270 271 #Align momentums with xaxis … … 336 337 def compute_timestep(domain): 337 338 import sys 338 from Numeric import zeros, Float 339 from Numeric import Float 340 from numpy import zeros 339 341 340 342 N = domain.number_of_elements … … 398 400 def compute_fluxes_C_wellbalanced(domain): 399 401 import sys 400 from Numeric import zeros, Float 402 from Numeric import Float 403 from numpy import zeros 401 404 402 405 N = domain.number_of_elements … … 475 478 def compute_fluxes_C_nonwellbalanced2(domain): 476 479 import sys 477 from Numeric import zeros, Float 480 from Numeric import Float 481 from numpy import zeros 478 482 479 483 N = domain.number_of_elements … … 582 586 583 587 import sys 584 from Numeric import zeros, Float 588 from Numeric import Float 589 from numpy import zeros 585 590 from config import epsilon, h0 586 591 … … 662 667 663 668 import sys 664 from Numeric import zeros, Float 669 from Numeric import Float 670 from numpy import zeros 665 671 from config import epsilon, h0 666 672 … … 766 772 """ 767 773 768 from Numeric import zeros, Float 774 from Numeric import Float 775 from numpy import zeros 769 776 770 777 N = domain.number_of_elements … … 933 940 934 941 from util import gradient 935 from Numeric import zeros, Float, array, sum 942 from Numeric import Float 943 from numpy import zeros, array, sum 936 944 937 945 xmom = domain.quantities['xmomentum'].explicit_update … … 967 975 968 976 from util import gradient 969 from Numeric import zeros, Float, array, sum 977 from Numeric import Float 978 from numpy import zeros, array, sum 970 979 from parameters import F1#This is an additional friction!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 971 980 … … 1003 1012 1004 1013 from util import gradient 1005 from Numeric import zeros, Float, array, sum 1014 from Numeric import Float 1015 from numpy import zeros, array, sum 1006 1016 from parameters import F2#This is an additional friction!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 1007 1017 … … 1103 1113 """ 1104 1114 1105 from Numeric import ones, Float, array 1115 from Numeric import Float 1116 from numpy import ones, array 1106 1117 1107 1118 … … 1185 1196 1186 1197 from config import rho_a, rho_w, eta_w 1187 from Numeric import array, Float 1198 from Numeric import Float 1199 from numpy import array 1188 1200 1189 1201 if len(args) == 2: … … 1216 1228 1217 1229 from math import pi, cos, sin, sqrt 1218 from Numeric import Float, ones, ArrayType 1230 from Numeric import Float, ArrayType 1231 from numpy import ones 1219 1232 1220 1233 xmom_update = domain.quantities['xmomentum'].explicit_update
Note: See TracChangeset
for help on using the changeset viewer.