Changeset 7915 for trunk/anuga_work/development/sudi/sw_1d/avalanche/B_momentum/shallow_water_domain_avalanche.py
- Timestamp:
- Aug 5, 2010, 6:50:49 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/anuga_work/development/sudi/sw_1d/avalanche/B_momentum/shallow_water_domain_avalanche.py
r7837 r7915 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 x-axis … … 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, h_min 586 591 … … 667 672 668 673 import sys 669 from Numeric import zeros, Float 674 from Numeric import Float 675 from numpy import zeros 670 676 from config import epsilon, h0 671 677 … … 774 780 """ 775 781 776 from Numeric import zeros, Float 782 from Numeric import Float 783 from numpy import zeros 777 784 778 785 N = domain.number_of_elements … … 941 948 942 949 from util import gradient 943 from Numeric import zeros, Float, array, sum 950 from Numeric import Float 951 from numpy import zeros, array, sum 944 952 945 953 xmom = domain.quantities['xmomentum'].explicit_update … … 975 983 976 984 from util import gradient 977 from Numeric import zeros, Float, array, sum 985 from Numeric import Float 986 from numpy import zeros, array, sum 978 987 from parameters import F1#This is an additional friction!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 979 988 … … 1011 1020 1012 1021 from util import gradient 1013 from Numeric import zeros, Float, array, sum 1022 from Numeric import Float 1023 from numpy import zeros, array, sum 1014 1024 from parameters import F2#This is an additional friction!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 1015 1025 … … 1111 1121 """ 1112 1122 1113 from Numeric import ones, Float, array 1123 from Numeric import Float 1124 from numpy import ones, array 1114 1125 1115 1126 … … 1193 1204 1194 1205 from config import rho_a, rho_w, eta_w 1195 from Numeric import array, Float 1206 from Numeric import Float 1207 from numpy import array 1196 1208 1197 1209 if len(args) == 2: … … 1224 1236 1225 1237 from math import pi, cos, sin, sqrt 1226 from Numeric import Float, ones, ArrayType 1238 from Numeric import Float, ArrayType 1239 from numpy import ones 1227 1240 1228 1241 xmom_update = domain.quantities['xmomentum'].explicit_update
Note: See TracChangeset
for help on using the changeset viewer.