Avoid the vector method (#166)

Towards #164 

Similarly as in Animate and Goalie.

Author: joewallwork

movement/laplacian_smoothing.py

@@ -44,7 +44,7 @@ def __init__(self, mesh, timestep, **kwargs):
         super().__init__(mesh, **kwargs)
         assert timestep > 0.0
         self.dt = timestep
-        dim = self.mesh.topological_dimension()
+        dim = self.mesh.topological_dimension
         self.displacement = np.zeros((self.mesh.num_vertices(), dim))
 
     def _create_functions(self):

movement/monge_ampere.py

@@ -579,7 +579,7 @@ def __init__(self, mesh, monitor_function, phi_init=None, H_init=None, **kwargs)
         :kwarg dtol: divergence tolerance for the residual
         :type dtol: :class:`float`
         """
-        if mesh.topological_dimension() == 1:
+        if mesh.topological_dimension == 1:
             raise NotImplementedError(
                 "1D case not implemented for quasi-Newton method."
             )

movement/mover.py

@@ -5,6 +5,7 @@
 import firedrake.exceptions as fexc
 import numpy as np
 import ufl
+from animate.utility import function_data_max, function_data_min, function_data_sum
 from firedrake.cython.dmcommon import create_section
 from firedrake.petsc import PETSc
 
@@ -50,8 +51,8 @@ def __init__(
                 stacklevel=1,
             )
         self.raise_convergence_errors = raise_convergence_errors
-        self.dim = self.mesh.topological_dimension()
-        self.gdim = self.mesh.geometric_dimension()
+        self.dim = self.mesh.topological_dimension
+        self.gdim = self.mesh.geometric_dimension
 
         # DMPlex setup
         self.plex = self.mesh.topology_dm
@@ -197,18 +198,19 @@ def volume_ratio(self):
         :return: the ratio of the largest and smallest element volumes.
         :rtype: :class:`float`
         """
-        volume_array = self.volume.vector().gather()
-        return volume_array.max() / volume_array.min()
+        return function_data_max(self.volume) / function_data_min(self.volume)
 
     @property
     def coefficient_of_variation(self):
         """
         :return: the coefficient of variation (σ/μ) of element volumes.
         :rtype: :class:`float`
         """
-        volume_array = self.volume.vector().gather()
-        mean = volume_array.sum() / volume_array.size
-        return np.sqrt(np.sum((volume_array - mean) ** 2) / volume_array.size) / mean
+        size = self.volume.dat.dataset.layout_vec.getSizes()[0]
+        mean = function_data_sum(self.volume) / size
+        coef = firedrake.Function(self.P0)
+        coef.interpolate((self.volume - mean) ** 2)
+        return np.sqrt(function_data_sum(coef) / size) / mean
 
     @abc.abstractmethod
     def move(self):

movement/spring.py

@@ -53,7 +53,7 @@ def __init__(self, mesh, timestep, **kwargs):
         assert timestep > 0.0
         self.dt = timestep
         num_vertices = mesh.num_vertices()
-        self._forcing = np.zeros((num_vertices, mesh.topological_dimension()))
+        self._forcing = np.zeros((num_vertices, mesh.topological_dimension))
         self.displacement = np.zeros(num_vertices)
 
     def _create_function_spaces(self):

test/monitors.py

@@ -10,7 +10,7 @@ def ring_monitor(mesh):
     alpha = Constant(10.0)  # amplitude
     beta = Constant(200.0)  # width
     gamma = Constant(0.15)  # radius
-    dim = mesh.geometric_dimension()
+    dim = mesh.geometric_dimension
     xyz = ufl.SpatialCoordinate(mesh) - ufl.as_vector([0.5] * dim)
     r = ufl.dot(xyz, xyz)
     return Constant(1.0) + alpha / ufl.cosh(beta * (r - gamma)) ** 2

test/test_monge_ampere.py

@@ -236,7 +236,7 @@ def test_change_monitor(self, dim, method):
         happen during timestepping.
         """
         mesh = self.mesh(dim=dim)
-        gdim = mesh.geometric_dimension()
+        gdim = mesh.geometric_dimension
         coords = mesh.coordinates.dat.data.copy()
         atol = 1.0e-03
         rtol = 1.0e02 * atol**gdim

test/test_monitor.py

@@ -41,11 +41,11 @@ class TestConstant(BaseClasses.TestMonitorBuilder):
     """
 
     def test_value_get_monitor(self):
-        mb = ConstantMonitorBuilder(self.mesh.topological_dimension())
+        mb = ConstantMonitorBuilder(self.mesh.topological_dimension)
         self.assertTrue(np.allclose(mb.get_monitor()(self.mesh).dat.data, 1))
 
     def test_value_call(self):
-        mb = ConstantMonitorBuilder(self.mesh.topological_dimension())
+        mb = ConstantMonitorBuilder(self.mesh.topological_dimension)
         self.assertTrue(np.allclose(mb()(self.mesh).dat.data, 1))