 Timestamp:
 Aug 5, 2010, 8:20:47 PM (14 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/anuga_work/development/sudi/sw_1d/periodic_waves/johns/quantity.py
r7837 r7922 24 24 25 25 from domain import Domain 26 from Numeric import array, zeros, Float 26 from Numeric import Float 27 from numpy import array, zeros 27 28 28 29 msg = 'First argument in Quantity.__init__ ' … … 60 61 61 62 62 from Numeric import zeros, Float 63 from Numeric import Float 64 from numpy import zeros 63 65 64 66 #Allocate space for boundary values … … 194 196 """ 195 197 196 from Numeric import array, Float 198 from Numeric import Float 199 from numpy import array 197 200 198 201 values = array(values).astype(Float) … … 237 240 238 241 """ 239 from Numericimport take242 from numpy import take 240 243 241 244 if location not in ['vertices', 'centroids', 'unique vertices']: … … 310 313 """ 311 314 312 from Numeric import concatenate, zeros, Float, Int, array, reshape 315 from Numeric import Float, Int 316 from numpy import concatenate, zeros, array, reshape 313 317 314 318 … … 402 406 """ 403 407 404 from Numeric import sum, equal, ones, Float 408 from Numeric import Float 409 from numpy import sum, equal, ones 405 410 406 411 N = self.centroid_values.shape[0] … … 427 432 #print 'compute_gradient' 428 433 429 from Numeric import array, zeros, Float 434 from Numeric import Float 435 from numpy import array, zeros 430 436 431 437 N = self.centroid_values.shape[0] … … 518 524 #print 'compute_minmod_gradients' 519 525 520 from Numeric import array, zeros, Float,sign 526 from Numeric import Float,sign 527 from numpy import array, zeros 521 528 522 529 def xmin(a,b): … … 712 719 vertex values are updated 713 720 """ 714 from Numeric import zeros, Float 721 from Numeric import Float 722 from numpy import zeros 715 723 716 724 N = self.domain.number_of_elements … … 763 771 def limit_range(self): 764 772 import sys 765 from Numeric import zeros, Float 773 from Numeric import Float 774 from numpy import zeros 766 775 from util import minmod, minmod_kurganov, maxmod, vanleer, vanalbada 767 776 limiter = self.domain.limiter … … 822 831 823 832 import sys 824 from Numeric import zeros, Float 833 from Numeric import Float 834 from numpy import zeros 825 835 from util import minmod, minmod_kurganov, maxmod, vanleer 826 836 … … 947 957 #from domain import Domain 948 958 from domain_johns import Domain 949 from Numericimport arange959 from numpy import arange 950 960 951 961 points1 = [0.0, 1.0, 2.0, 3.0]
Note: See TracChangeset
for help on using the changeset viewer.