Skip to content

Commit df4e638

Browse files
committed
address some of ed's comments
1 parent e485c9c commit df4e638

2 files changed

Lines changed: 26 additions & 17 deletions

File tree

requirements-testing.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pytest>=7.2,<8.5
22
pytest-runner<6.0.2
33
pytest-cov<6.1.2
4-
pytest-order
54
flake8-pyproject>=1.2.3,<1.2.4
65
nbval<0.11.1
76
scipy<1.15.3

tests/test_petsc.py

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
@skipif('petsc')
23-
@pytest.mark.order(0)
23+
@pytest.fixture(scope='session', autouse=True)
2424
def test_petsc_initialization():
2525
# TODO: Temporary workaround until PETSc is automatically
2626
# initialized
@@ -1341,27 +1341,37 @@ def test_laplacian_1d(self, nx, unorm, mode):
13411341
os.environ['CC'] = 'mpicc'
13421342
PetscInitialize()
13431343

1344-
class SubLeft(SubDomain):
1345-
name = 'subleft'
1344+
# class SubLeft(SubDomain):
1345+
# name = 'subleft'
13461346

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'
13501353

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)
13531368

13541369
def define(self, dimensions):
13551370
x, = dimensions
1356-
return {x: ('right', 1)}
1357-
1358-
sub1 = SubLeft()
1359-
sub2 = SubRight()
1360-
subdomains = (sub1, sub2,)
1371+
return {x: (self.side, 1)}
13611372

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')]
13651375

13661376
u = Function(name='u', grid=grid, space_order=2)
13671377
f = Function(name='f', grid=grid, space_order=2)

0 commit comments

Comments
 (0)