Merge pull request #166 from firedrakeproject/new_fd_interpolate

Update use of `firedrake.interpolate` with new symbolic version
firedrakeproject · Feb 12, 2024 · 5f09851 · 5f09851
2 parents 68d8b34 + 1740fb8
commit 5f09851
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/case_studies/stratigraphic_model/mms.py b/case_studies/stratigraphic_model/mms.py
@@ -79,7 +79,7 @@ def function_space(self, mesh):
 
         for i in range(1):
             t.assign(t+dt)
-            s_exact = fd.interpolate((t+1)*fd.sin((x+2*y)), Z)
+            s_exact = fd.Function(Z).interpolate((t+1)*fd.sin((x+2*y)))
             solver.solve()
             A = fd.errornorm(s, s_exact)/fd.norm(s_exact)
             PETSc.Sys.Print("E :%s" % A)

diff --git a/utils/mg.py b/utils/mg.py
@@ -53,7 +53,7 @@ def high_order_icosahedral_mesh_hierarchy(mh, degree, R0):
     meshes = []
     for m in mh:
         X = fd.VectorFunctionSpace(m, "Lagrange", degree)
-        new_coords = fd.interpolate(m.coordinates, X)
+        new_coords = fd.Function(X).interpolate(m.coordinates)
         x, y, z = new_coords
         r = (x**2 + y**2 + z**2)**0.5
         new_coords.interpolate(R0*new_coords/r)

diff --git a/utils/shallow_water/galewsky.py b/utils/shallow_water/galewsky.py
@@ -123,7 +123,7 @@ def depth_expression(x, y, z):
     W = fd.VectorFunctionSpace(mesh, V.ufl_element())
 
     # initialise depth from coordinates
-    coords = fd.interpolate(mesh.coordinates, W)
+    coords = fd.Function(W).interpolate(mesh.coordinates)
     h = fd.Function(V)
     h.dat.data[:] = depth_calculation(coords.dat.data_ro)