Changeset 6155
- Timestamp:
- Jan 13, 2009, 3:13:33 PM (16 years ago)
- Location:
- anuga_core/source/anuga/mesh_engine
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
anuga_core/source/anuga/mesh_engine/mesh_engine.py
r4916 r6155 11 11 #import anuga.mesh_engine.list_dic as triang 12 12 13 from Numeric import array, Float, Int32, reshape 13 import Numeric as num 14 14 15 15 from anuga.utilities.numerical_tools import ensure_numeric … … 46 46 47 47 try: 48 points = ensure_numeric(points, Float)48 points = ensure_numeric(points, num.Float) 49 49 except ValueError: 50 50 msg = 'ERROR: Inconsistent points array.' … … 61 61 try: 62 62 # If Int is used, instead of Int32, it fails in Linux 63 segments = ensure_numeric(segments, Int32)63 segments = ensure_numeric(segments, num.Int32) 64 64 65 65 except ValueError: … … 72 72 73 73 try: 74 holes = ensure_numeric(holes, Float)74 holes = ensure_numeric(holes, num.Float) 75 75 except ValueError: 76 76 msg = 'ERROR: Inconsistent holess array.' … … 80 80 regions = add_area_tag(regions) 81 81 try: 82 regions = ensure_numeric(regions, Float)82 regions = ensure_numeric(regions, num.Float) 83 83 except (ValueError, TypeError): 84 84 msg = 'ERROR: Inconsistent regions array.' … … 90 90 91 91 try: 92 pointatts = ensure_numeric(pointatts, Float)92 pointatts = ensure_numeric(pointatts, num.Float) 93 93 except (ValueError, TypeError): 94 94 msg = 'ERROR: Inconsistent point attributes array.' … … 100 100 raise ANUGAError, msg 101 101 if len(pointatts.shape) == 1: 102 pointatts = reshape(pointatts,(pointatts.shape[0],1))103 104 try: 105 segatts = ensure_numeric(segatts, Int32)102 pointatts = num.reshape(pointatts,(pointatts.shape[0],1)) 103 104 try: 105 segatts = ensure_numeric(segatts, num.Int32) 106 106 except ValueError: 107 107 msg = 'ERROR: Inconsistent point attributes array.' -
anuga_core/source/anuga/mesh_engine/test_generate_mesh.py
r5950 r6155 12 12 from anuga.mesh_engine.mesh_engine import generate_mesh 13 13 14 from Numeric import array, Float, Int, alltrue, allclose 14 import Numeric as num 15 15 16 16 from anuga.utilities.numerical_tools import ensure_numeric … … 43 43 pointattlist,segattlist, mode, points) 44 44 45 correct = array([(1, 0, 2), (2, 3, 1)])46 self.failUnless( alltrue(data['generatedtrianglelist'].flat == \47 correct.flat),45 correct = num.array([(1, 0, 2), (2, 3, 1)]) 46 self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \ 47 correct.flat), 48 48 'trianglelist is wrong!') 49 correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])50 self.failUnless( alltrue(data['generatedsegmentlist'].flat == \51 correct.flat),49 correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)]) 50 self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \ 51 correct.flat), 52 52 'segmentlist is wrong!') 53 53 54 correct = array([(0.0, 0.0), (0.0, 10.0),55 (3.0, 0.0), (3.0, 10.0)])56 self.failUnless( allclose(data['generatedpointlist'].flat, \57 correct.flat),54 correct = num.array([(0.0, 0.0), (0.0, 10.0), 55 (3.0, 0.0), (3.0, 10.0)]) 56 self.failUnless(num.allclose(data['generatedpointlist'].flat, \ 57 correct.flat), 58 58 'Failed') 59 59 … … 74 74 data = generate_mesh(points,seglist,holelist,regionlist, 75 75 pointattlist,segattlist, mode, points) 76 correct = array([(1, 0, 2), (2, 3, 1)])77 self.failUnless( alltrue(data['generatedtrianglelist'].flat == \78 correct.flat),76 correct = num.array([(1, 0, 2), (2, 3, 1)]) 77 self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \ 78 correct.flat), 79 79 'trianglelist is wrong!') 80 correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])81 self.failUnless( alltrue(data['generatedsegmentlist'].flat == \82 correct.flat),80 correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)]) 81 self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \ 82 correct.flat), 83 83 'segmentlist is wrong!') 84 84 85 correct = array([(0.0, 0.0), (0.0, 10.0),86 (3.0, 0.0), (3.0, 10.0)])87 self.failUnless( allclose(data['generatedpointlist'].flat, \88 correct.flat),85 correct = num.array([(0.0, 0.0), (0.0, 10.0), 86 (3.0, 0.0), (3.0, 10.0)]) 87 self.failUnless(num.allclose(data['generatedpointlist'].flat, \ 88 correct.flat), 89 89 'Failed') 90 90 … … 154 154 pointattlist,segattlist, mode, points) 155 155 156 correct = array([(1, 0, 2), (2, 3, 1)])157 self.failUnless( alltrue(data['generatedtrianglelist'].flat == \158 correct.flat),156 correct = num.array([(1, 0, 2), (2, 3, 1)]) 157 self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \ 158 correct.flat), 159 159 'trianglelist is wrong!') 160 correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])161 self.failUnless( alltrue(data['generatedsegmentlist'].flat == \162 correct.flat),160 correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)]) 161 self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \ 162 correct.flat), 163 163 'segmentlist is wrong!') 164 164 165 correct = array([(0.0, 0.0), (0.0, 10.0),166 (3.0, 0.0), (3.0, 10.0)])167 self.failUnless( allclose(data['generatedpointlist'].flat, \168 correct.flat),169 'Failed') 170 171 self.failUnless( alltrue(data['generatedsegmentmarkerlist'] == \172 array([1,2,3,4])),165 correct = num.array([(0.0, 0.0), (0.0, 10.0), 166 (3.0, 0.0), (3.0, 10.0)]) 167 self.failUnless(num.allclose(data['generatedpointlist'].flat, \ 168 correct.flat), 169 'Failed') 170 171 self.failUnless(num.alltrue(data['generatedsegmentmarkerlist'] == \ 172 num.array([1,2,3,4])), 173 173 'Failed!') 174 174 … … 338 338 pointattlist,segattlist, mode, points) 339 339 340 correct = array([[77.0], [77.0], [77.0], [77.0]])341 self.failUnless( allclose(data['generatedtriangleattributelist'].flat,342 correct.flat),340 correct = num.array([[77.0], [77.0], [77.0], [77.0]]) 341 self.failUnless(num.allclose(data['generatedtriangleattributelist'].flat, 342 correct.flat), 343 343 'Failed') 344 344 … … 362 362 pointattlist,segattlist, mode, points) 363 363 364 correct = array([[77.0], [77.0], [77.0], [77.0]])365 self.failUnless( allclose(data['generatedtriangleattributelist'].flat,366 correct.flat),364 correct = num.array([[77.0], [77.0], [77.0], [77.0]]) 365 self.failUnless(num.allclose(data['generatedtriangleattributelist'].flat, 366 correct.flat), 367 367 'Failed') 368 368 … … 388 388 389 389 390 correct = array([(1, 0, 2), (2, 3, 1)])391 self.failUnless( alltrue(data['generatedtrianglelist'].flat == \392 correct.flat),390 correct = num.array([(1, 0, 2), (2, 3, 1)]) 391 self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \ 392 correct.flat), 393 393 'trianglelist is wrong!') 394 correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])395 self.failUnless( alltrue(data['generatedsegmentlist'].flat == \396 correct.flat),394 correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)]) 395 self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \ 396 correct.flat), 397 397 'segmentlist is wrong!') 398 398 399 correct = array([(0.0, 0.0), (0.0, 10.0),400 (3.0, 0.0), (3.0, 10.0)])401 self.failUnless( allclose(data['generatedpointlist'].flat, \402 correct.flat),403 'Failed') 404 405 correct = array([[tri_tag], [tri_tag]])406 self.failUnless( allclose(data['generatedtriangleattributelist'].flat, \407 correct.flat),408 'Failed') 409 correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])410 self.failUnless( alltrue(data['generatedsegmentlist'].flat == \411 correct.flat),399 correct = num.array([(0.0, 0.0), (0.0, 10.0), 400 (3.0, 0.0), (3.0, 10.0)]) 401 self.failUnless(num.allclose(data['generatedpointlist'].flat, \ 402 correct.flat), 403 'Failed') 404 405 correct = num.array([[tri_tag], [tri_tag]]) 406 self.failUnless(num.allclose(data['generatedtriangleattributelist'].flat, \ 407 correct.flat), 408 'Failed') 409 correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)]) 410 self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \ 411 correct.flat), 412 412 'Failed!') 413 413 414 correct = array(segattlist)415 self.failUnless( allclose(data['generatedsegmentmarkerlist'].flat,416 correct.flat),414 correct = num.array(segattlist) 415 self.failUnless(num.allclose(data['generatedsegmentmarkerlist'].flat, 416 correct.flat), 417 417 'Failed') 418 418 419 419 # I copied these answers from the output, so bad test.. 420 correct = array([(-1, 1, -1), (-1, 0, -1)])421 self.failUnless( alltrue(data['generatedtriangleneighborlist'].flat == \422 correct.flat),420 correct = num.array([(-1, 1, -1), (-1, 0, -1)]) 421 self.failUnless(num.alltrue(data['generatedtriangleneighborlist'].flat == \ 422 correct.flat), 423 423 'Failed!') 424 424 … … 440 440 pointattlist,segattlist, mode, points) 441 441 442 correct = array([[0.0],[0.0],[10],[10]])443 self.failUnless( allclose(data['generatedpointattributelist'].flat, \444 correct.flat),442 correct = num.array([[0.0],[0.0],[10],[10]]) 443 self.failUnless(num.allclose(data['generatedpointattributelist'].flat, \ 444 correct.flat), 445 445 'Failed') 446 446 … … 449 449 data = generate_mesh(points,seglist,holelist,regionlist, 450 450 pointattlist,segattlist, mode, points) 451 correct = array([[0.0],[0.0],[10],[10]])452 self.failUnless( allclose(data['generatedpointattributelist'].flat, \453 correct.flat),451 correct = num.array([[0.0],[0.0],[10],[10]]) 452 self.failUnless(num.allclose(data['generatedpointattributelist'].flat, \ 453 correct.flat), 454 454 'Failed') 455 455 … … 459 459 pointattlist,segattlist, mode, points) 460 460 #print "data", data 461 correct = array(pointattlist)462 self.failUnless( allclose(data['generatedpointattributelist'].flat, \463 correct.flat),461 correct = num.array(pointattlist) 462 self.failUnless(num.allclose(data['generatedpointattributelist'].flat, \ 463 correct.flat), 464 464 'Failed') 465 465
Note: See TracChangeset
for help on using the changeset viewer.