Skip to content

Commit faaa7bd

Browse files
ksagiyamksagiyam
committed
k
1 parent 0dfdf0e commit faaa7bd

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎tests/firedrake/regression/test_multiple_domains.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def test_functional(mesh1, mesh2):
8181

8282

8383
def cell_measure(primal, secondary):
84-
return Measure("dx", primal, extra_measures=(Measure("dx", secondary),))
84+
return Measure("dx", primal, intersect_measures=(Measure("dx", secondary),))
8585

8686

8787
@pytest.mark.parametrize("form,expect", [

‎tests/firedrake/submesh/test_submesh_assemble.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def test_submesh_assemble_cell_cell_integral_cell():
1717
v = TestFunction(V)
1818
u0, u1 = split(u)
1919
v0, v1 = split(v)
20-
dx0 = Measure("dx", domain=mesh, extra_measures=(Measure("dx", subm),))
21-
dx1 = Measure("dx", domain=subm, extra_measures=(Measure("dx", mesh),))
20+
dx0 = Measure("dx", domain=mesh, intersect_measures=(Measure("dx", subm),))
21+
dx1 = Measure("dx", domain=subm, intersect_measures=(Measure("dx", mesh),))
2222
a = inner(u1, v0) * dx0(999) + inner(u0, v1) * dx1
2323
A = assemble(a, mat_type="nest")
2424
assert np.allclose(A.M.sparsity[0][0].nnz, [1, 1, 1, 1, 1, 1]) # bc nodes
@@ -48,8 +48,8 @@ def test_submesh_assemble_cell_cell_integral_facet():
4848
v = TestFunction(V)
4949
u0, u1 = split(u)
5050
v0, v1 = split(v)
51-
dS0 = Measure("dS", domain=mesh, extra_measures=(Measure("ds", subm),))
52-
ds1 = Measure("ds", domain=subm, extra_measures=(Measure("dS", mesh),))
51+
dS0 = Measure("dS", domain=mesh, intersect_measures=(Measure("ds", subm),))
52+
ds1 = Measure("ds", domain=subm, intersect_measures=(Measure("dS", mesh),))
5353
a = inner(u1, v0('+')) * dS0 + inner(u0('+'), v1) * ds1(5)
5454
A = assemble(a, mat_type="nest")
5555
assert np.allclose(A.M.sparsity[0][0].nnz, [1, 1, 1, 1, 1, 1, 1, 1]) # bc nodes
@@ -113,31 +113,31 @@ def test_submesh_assemble_cell_cell_cell_cell_integral_various():
113113
mesh_rl = Submesh(mesh_r, dim, label_rl)
114114
dS = Measure(
115115
"dS", domain=mesh,
116-
extra_measures=(
116+
intersect_measures=(
117117
Measure("ds", mesh_l),
118118
Measure("ds", mesh_r),
119119
Measure("ds", mesh_rl),
120120
)
121121
)
122122
ds_l = Measure(
123123
"ds", domain=mesh_l,
124-
extra_measures=(
124+
intersect_measures=(
125125
Measure("dS", mesh),
126126
Measure("ds", mesh_r),
127127
Measure("ds", mesh_rl),
128128
)
129129
)
130130
ds_r = Measure(
131131
"ds", domain=mesh_r,
132-
extra_measures=(
132+
intersect_measures=(
133133
Measure("dS", mesh),
134134
Measure("ds", mesh_l),
135135
Measure("ds", mesh_rl),
136136
)
137137
)
138138
ds_rl = Measure(
139139
"ds", domain=mesh_rl,
140-
extra_measures=(
140+
intersect_measures=(
141141
Measure("dS", mesh),
142142
Measure("ds", mesh_l),
143143
Measure("ds", mesh_r),
@@ -220,47 +220,47 @@ def test_submesh_assemble_cell_cell_cell_cell_integral_avg():
220220
x_rl, y_rl = SpatialCoordinate(mesh_rl)
221221
dx = Measure(
222222
"dx", domain=mesh,
223-
extra_measures=(
223+
intersect_measures=(
224224
Measure("dx", mesh_l),
225225
Measure("dx", mesh_r),
226226
Measure("dx", mesh_rl),
227227
)
228228
)
229229
dx_l = Measure(
230230
"dx", domain=mesh_l,
231-
extra_measures=(
231+
intersect_measures=(
232232
Measure("dx", mesh),
233233
Measure("dx", mesh_r),
234234
Measure("dx", mesh_rl),
235235
)
236236
)
237237
dx_rl = Measure(
238238
"dx", domain=mesh_rl,
239-
extra_measures=(
239+
intersect_measures=(
240240
Measure("dx", mesh),
241241
Measure("dx", mesh_l),
242242
Measure("dx", mesh_r),
243243
)
244244
)
245245
dS = Measure(
246246
"dS", domain=mesh,
247-
extra_measures=(
247+
intersect_measures=(
248248
Measure("dS", mesh_l),
249249
Measure("ds", mesh_r),
250250
Measure("ds", mesh_rl),
251251
)
252252
)
253253
dS_l = Measure(
254254
"dS", domain=mesh_l,
255-
extra_measures=(
255+
intersect_measures=(
256256
Measure("dS", mesh),
257257
Measure("ds", mesh_r),
258258
Measure("ds", mesh_rl),
259259
)
260260
)
261261
ds_rl = Measure(
262262
"ds", domain=mesh_rl,
263-
extra_measures=(
263+
intersect_measures=(
264264
Measure("dS", mesh),
265265
Measure("dS", mesh_l),
266266
Measure("ds", mesh_r),
@@ -301,7 +301,7 @@ def test_submesh_assemble_cell_cell_equation_bc():
301301
u_l, u_r = split(u)
302302
v_l, v_r = split(v)
303303
dx_l = Measure("dx", domain=mesh_l)
304-
ds_l = Measure("ds", domain=mesh_l, extra_measures=(Measure("ds", mesh_r),))
304+
ds_l = Measure("ds", domain=mesh_l, intersect_measures=(Measure("ds", mesh_r),))
305305
a = inner(u_l, v_l) * dx_l
306306
a_int = inner(u_l - u_r, v_l) * ds_l(label_int)
307307
L_int = inner(Constant(0), v_l) * ds_l(label_int)

‎tests/firedrake/submesh/test_submesh_solve.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ def test_submesh_solve_cell_cell_mixed_scalar(dim, simplex):
9292
v = TestFunction(V)
9393
u0, u1 = split(u)
9494
v0, v1 = split(v)
95-
dx0 = Measure("dx", domain=mesh, extra_measures=(Measure("dx", subm),))
96-
dx1 = Measure("dx", domain=subm, extra_measures=(Measure("dx", mesh),))
95+
dx0 = Measure("dx", domain=mesh, intersect_measures=(Measure("dx", subm),))
96+
dx1 = Measure("dx", domain=subm, intersect_measures=(Measure("dx", mesh),))
9797
a = inner(grad(u0), grad(v0)) * dx0 + inner(u0 - u1, v1) * dx1
9898
L = inner(Constant(0.), v1) * dx1
9999
g = Function(V0).interpolate(solution_expr(SpatialCoordinate(mesh)))
@@ -165,8 +165,8 @@ def test_submesh_solve_cell_cell_mixed_vector(dim, simplex):
165165
v = TestFunction(V)
166166
u0, u1 = split(u)
167167
v0, v1 = split(v)
168-
dx0 = Measure("dx", domain=mesh, extra_measures=(Measure("dx", subm),))
169-
dx1 = Measure("dx", domain=subm, extra_measures=(Measure("dx", mesh),))
168+
dx0 = Measure("dx", domain=mesh, intersect_measures=(Measure("dx", subm),))
169+
dx1 = Measure("dx", domain=subm, intersect_measures=(Measure("dx", mesh),))
170170
a = inner(u0, v0) * dx0 + inner(u0 - u1, v1) * dx1
171171
L = inner(SpatialCoordinate(mesh), v0) * dx0
172172
solution = Function(V)
@@ -261,12 +261,12 @@ def _mixed_poisson_solve_2d(nref, degree, quadrilateral, submesh_region):
261261
sigma_exact = Function(BDM).project(as_vector([- 2 * pi * sin(2 * pi * subx) * cos(2 * pi * suby), - 2 * pi * cos(2 * pi * subx) * sin(2 * pi * suby)]),
262262
solver_parameters={"ksp_type": "cg", "ksp_rtol": 1.e-16})
263263
f = Function(DG).interpolate(- 8 * pi * pi * cos(2 * pi * x) * cos(2 * pi * y))
264-
dx0 = Measure("dx", domain=mesh, extra_measures=(Measure("dx", subm),))
265-
dx1 = Measure("dx", domain=subm, extra_measures=(Measure("dx", mesh),))
266-
ds0 = Measure("ds", domain=mesh, extra_measures=(Measure("ds", subm),))
267-
ds1_ext = Measure("ds", domain=subm, extra_measures=(Measure("ds", mesh),))
268-
ds1_int = Measure("ds", domain=subm, extra_measures=(Measure("dS", mesh),))
269-
dS0 = Measure("dS", domain=mesh, extra_measures=(Measure("ds", subm),))
264+
dx0 = Measure("dx", domain=mesh, intersect_measures=(Measure("dx", subm),))
265+
dx1 = Measure("dx", domain=subm, intersect_measures=(Measure("dx", mesh),))
266+
ds0 = Measure("ds", domain=mesh, intersect_measures=(Measure("ds", subm),))
267+
ds1_ext = Measure("ds", domain=subm, intersect_measures=(Measure("ds", mesh),))
268+
ds1_int = Measure("ds", domain=subm, intersect_measures=(Measure("dS", mesh),))
269+
dS0 = Measure("dS", domain=mesh, intersect_measures=(Measure("ds", subm),))
270270
bc = DirichletBC(W.sub(0), sigma_exact, boun_dirichlet)
271271
# Do the base case.
272272
w = Function(W)
@@ -393,10 +393,10 @@ def _mixed_poisson_solve_3d(hexahedral, degree, submesh_region):
393393
- 2 * pi * cos(2 * pi * subx) * cos(2 * pi * suby) * sin(2 * pi * subz)]),
394394
solver_parameters={"ksp_type": "cg", "ksp_rtol": 1.e-16})
395395
f = Function(DG).interpolate(- 12 * pi * pi * cos(2 * pi * x) * cos(2 * pi * y) * cos(2 * pi * z))
396-
dx0 = Measure("dx", domain=mesh, extra_measures=(Measure("dx", subm),))
397-
dx1 = Measure("dx", domain=subm, extra_measures=(Measure("dx", mesh),))
398-
ds0 = Measure("ds", domain=mesh, extra_measures=(Measure("ds", subm),))
399-
ds1 = Measure("ds", domain=subm, extra_measures=(Measure("dS", mesh),))
396+
dx0 = Measure("dx", domain=mesh, intersect_measures=(Measure("dx", subm),))
397+
dx1 = Measure("dx", domain=subm, intersect_measures=(Measure("dx", mesh),))
398+
ds0 = Measure("ds", domain=mesh, intersect_measures=(Measure("ds", subm),))
399+
ds1 = Measure("ds", domain=subm, intersect_measures=(Measure("dS", mesh),))
400400
bc = DirichletBC(W.sub(0), sigma_exact, boun_dirichlet)
401401
# Do the base case.
402402
w = Function(W)
@@ -447,9 +447,9 @@ def test_submesh_solve_cell_cell_equation_bc(nref, degree, simplex):
447447
sol = Function(V)
448448
u_outer, u_inner = split(u)
449449
v_outer, v_inner = split(v)
450-
dx_outer = Measure("dx", domain=mesh_outer, extra_measures=(Measure("dx", mesh), Measure("dx", mesh_inner)))
451-
dx_inner = Measure("dx", domain=mesh_inner, extra_measures=(Measure("dx", mesh), Measure("dx", mesh_outer)))
452-
ds_outer = Measure("ds", domain=mesh_outer, extra_measures=(Measure("ds", mesh_inner),))
450+
dx_outer = Measure("dx", domain=mesh_outer, intersect_measures=(Measure("dx", mesh), Measure("dx", mesh_inner)))
451+
dx_inner = Measure("dx", domain=mesh_inner, intersect_measures=(Measure("dx", mesh), Measure("dx", mesh_outer)))
452+
ds_outer = Measure("ds", domain=mesh_outer, intersect_measures=(Measure("ds", mesh_inner),))
453453
a = inner(grad(u_outer), grad(v_outer)) * dx_outer + \
454454
inner(u_inner, v_inner) * dx_inner
455455
L = inner(x * y, v_inner) * dx_inner

0 commit comments

Comments
 (0)