Skip to content

Commit f07d264

Browse files
authored
Remove gdim from basix.ufl.element (#65)
* Fixes related to FEniCS/basix#772
1 parent eb055b2 commit f07d264

5 files changed

+8
-22
lines changed

src/adios4dolfinx/checkpointing.py

-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ def read_mesh(
497497
degree,
498498
basix.LagrangeVariant(int(lvar)),
499499
shape=(mesh_geometry.shape[1],),
500-
gdim=mesh_geometry.shape[1],
501500
dtype=mesh_geometry.dtype,
502501
)
503502
domain = ufl.Mesh(element)

src/adios4dolfinx/legacy_readers.py

-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ def read_mesh_from_legacy_h5(
316316
1,
317317
basix.LagrangeVariant.equispaced,
318318
shape=(mesh_geometry.shape[1],),
319-
gdim=mesh_geometry.shape[1],
320319
)
321320
domain = ufl.Mesh(element)
322321
return dolfinx.mesh.create_mesh(

tests/test_checkpointing.py

-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ def test_read_write_P_2D(read_comm, family, degree, complex, mesh_2D):
4646
mesh.ufl_cell().cellname(),
4747
degree,
4848
basix.LagrangeVariant.gll_warped,
49-
gdim=mesh.geometry.dim,
5049
shape=(mesh.geometry.dim, ),
5150
dtype=mesh.geometry.x.dtype)
5251

@@ -72,7 +71,6 @@ def test_read_write_P_3D(read_comm, family, degree, complex, mesh_3D):
7271
mesh.ufl_cell().cellname(),
7372
degree,
7473
basix.LagrangeVariant.gll_warped,
75-
gdim=mesh.geometry.dim,
7674
shape=(mesh.geometry.dim, ))
7775

7876
def f(x):
@@ -100,7 +98,6 @@ def test_read_write_P_2D_time(read_comm, family, degree, complex, mesh_2D):
10098
mesh.ufl_cell().cellname(),
10199
degree,
102100
basix.LagrangeVariant.gll_warped,
103-
gdim=mesh.geometry.dim,
104101
shape=(mesh.geometry.dim, ),
105102
dtype=mesh.geometry.x.dtype)
106103

@@ -134,7 +131,6 @@ def test_read_write_P_3D_time(read_comm, family, degree, complex, mesh_3D):
134131
mesh.ufl_cell().cellname(),
135132
degree,
136133
basix.LagrangeVariant.gll_warped,
137-
gdim=mesh.geometry.dim,
138134
shape=(mesh.geometry.dim, ))
139135

140136
def f(x):

tests/test_checkpointing_vector.py

+5-10
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ def test_read_write_2D(read_comm, family, degree, complex, simplex_mesh_2D):
5858
f_dtype = get_dtype(mesh.geometry.x.dtype, complex)
5959
el = basix.ufl.element(family,
6060
mesh.ufl_cell().cellname(),
61-
degree,
62-
gdim=mesh.geometry.dim)
61+
degree)
6362

6463
def f(x):
6564
values = np.empty((2, x.shape[1]), dtype=f_dtype)
@@ -81,8 +80,7 @@ def test_read_write_3D(read_comm, family, degree, complex, simplex_mesh_3D):
8180
f_dtype = get_dtype(mesh.geometry.x.dtype, complex)
8281
el = basix.ufl.element(family,
8382
mesh.ufl_cell().cellname(),
84-
degree,
85-
gdim=mesh.geometry.dim)
83+
degree)
8684

8785
def f(x):
8886
values = np.empty((3, x.shape[1]), dtype=f_dtype)
@@ -104,8 +102,7 @@ def test_read_write_2D_quad(read_comm, family, degree, complex, non_simplex_mesh
104102
f_dtype = get_dtype(mesh.geometry.x.dtype, complex)
105103
el = basix.ufl.element(family,
106104
mesh.ufl_cell().cellname(),
107-
degree,
108-
gdim=mesh.geometry.dim)
105+
degree)
109106

110107
def f(x):
111108
values = np.empty((2, x.shape[1]), dtype=f_dtype)
@@ -127,8 +124,7 @@ def test_read_write_hex(read_comm, family, degree, complex, non_simplex_mesh_3D)
127124
f_dtype = get_dtype(mesh.geometry.x.dtype, complex)
128125
el = basix.ufl.element(family,
129126
mesh.ufl_cell().cellname(),
130-
degree,
131-
gdim=mesh.geometry.dim)
127+
degree)
132128

133129
def f(x):
134130
values = np.empty((3, x.shape[1]), dtype=f_dtype)
@@ -151,8 +147,7 @@ def test_read_write_multiple(read_comm, family, degree, complex, non_simplex_mes
151147
f_dtype = get_dtype(mesh.geometry.x.dtype, complex)
152148
el = basix.ufl.element(family,
153149
mesh.ufl_cell().cellname(),
154-
degree,
155-
gdim=mesh.geometry.dim)
150+
degree)
156151

157152
def f(x):
158153
values = np.empty((2, x.shape[1]), dtype=f_dtype)

tests/test_numpy_vectorization.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ def test_unroll_P(family, degree, mesh_2D):
8282
def test_unroll_RTCF(family, degree, mesh_3D):
8383
el = basix.ufl.element(family,
8484
mesh_3D.ufl_cell().cellname(),
85-
degree,
86-
gdim=mesh_3D.geometry.dim)
85+
degree)
8786

8887
V = dolfinx.fem.functionspace(mesh_3D, el)
8988
dofmap = V.dofmap
@@ -105,8 +104,7 @@ def test_unroll_RTCF(family, degree, mesh_3D):
105104
def test_compute_dofmap_pos_RTCF(family, degree, mesh_3D):
106105
el = basix.ufl.element(family,
107106
mesh_3D.ufl_cell().cellname(),
108-
degree,
109-
gdim=mesh_3D.geometry.dim)
107+
degree)
110108

111109
V = dolfinx.fem.functionspace(mesh_3D, el)
112110
local_cells, local_pos = compute_dofmap_pos(V)
@@ -123,8 +121,7 @@ def test_compute_dofmap_pos_RTCF(family, degree, mesh_3D):
123121
def test_compute_dofmap_pos_P(family, degree, mesh_2D):
124122
el = basix.ufl.element(family,
125123
mesh_2D.ufl_cell().cellname(),
126-
degree,
127-
gdim=mesh_2D.geometry.dim)
124+
degree)
128125

129126
V = dolfinx.fem.functionspace(mesh_2D, el)
130127
local_cells, local_pos = compute_dofmap_pos(V)

0 commit comments

Comments
 (0)