|
20 | 20 |
|
21 | 21 |
|
22 | 22 | @skipif('petsc') |
23 | | -@pytest.mark.order(0) |
| 23 | +@pytest.fixture(scope='session', autouse=True) |
24 | 24 | def test_petsc_initialization(): |
25 | 25 | # TODO: Temporary workaround until PETSc is automatically |
26 | 26 | # initialized |
@@ -1341,27 +1341,37 @@ def test_laplacian_1d(self, nx, unorm, mode): |
1341 | 1341 | os.environ['CC'] = 'mpicc' |
1342 | 1342 | PetscInitialize() |
1343 | 1343 |
|
1344 | | - class SubLeft(SubDomain): |
1345 | | - name = 'subleft' |
| 1344 | + # class SubLeft(SubDomain): |
| 1345 | + # name = 'subleft' |
1346 | 1346 |
|
1347 | | - def define(self, dimensions): |
1348 | | - x, = dimensions |
1349 | | - return {x: ('left', 1)} |
| 1347 | + # def define(self, dimensions): |
| 1348 | + # x, = dimensions |
| 1349 | + # return {x: ('left', 1)} |
| 1350 | + |
| 1351 | + # class SubRight(SubDomain): |
| 1352 | + # name = 'subright' |
1350 | 1353 |
|
1351 | | - class SubRight(SubDomain): |
1352 | | - name = 'subright' |
| 1354 | + # def define(self, dimensions): |
| 1355 | + # x, = dimensions |
| 1356 | + # return {x: ('right', 1)} |
| 1357 | + |
| 1358 | + # grid = Grid(shape=(nx,), dtype=np.float64) |
| 1359 | + |
| 1360 | + # sub1 = SubLeft(grid=grid) |
| 1361 | + # sub2 = SubRight(grid=grid) |
| 1362 | + |
| 1363 | + class SubSide(SubDomain): |
| 1364 | + def __init__(self, side='left', grid=None): |
| 1365 | + self.side = side |
| 1366 | + self.name = f'sub{side}' |
| 1367 | + super().__init__(grid=grid) |
1353 | 1368 |
|
1354 | 1369 | def define(self, dimensions): |
1355 | 1370 | x, = dimensions |
1356 | | - return {x: ('right', 1)} |
1357 | | - |
1358 | | - sub1 = SubLeft() |
1359 | | - sub2 = SubRight() |
1360 | | - subdomains = (sub1, sub2,) |
| 1371 | + return {x: (self.side, 1)} |
1361 | 1372 |
|
1362 | | - grid = Grid( |
1363 | | - shape=(nx,), subdomains=subdomains, dtype=np.float64 |
1364 | | - ) |
| 1373 | + grid = Grid(shape=(nx,), dtype=np.float64) |
| 1374 | + sub1, sub2 = [SubSide(side=s, grid=grid) for s in ('left', 'right')] |
1365 | 1375 |
|
1366 | 1376 | u = Function(name='u', grid=grid, space_order=2) |
1367 | 1377 | f = Function(name='f', grid=grid, space_order=2) |
|
0 commit comments