Merge lp:~fluidity-core/fluidity/firedrake-val-removal into lp:fluidity/firedrake

[Lawrence Mitchell]

[Florian Rathgeber (florian-rathgeber)]

Entirely sensible.

review: Approve

[Lawrence Mitchell (wence)]

Now that this is going to the right place, it looks eminently sensible, approve.

review: Approve

=== modified file 'python/firedrake/core_types.pyx'
--- python/firedrake/core_types.pyx	2013-08-27 08:55:15 +0000
+++ python/firedrake/core_types.pyx	2013-08-27 10:26:44 +0000
@@ -447,7 +447,7 @@
         """Return a newly allocated :class:`pyop2.Dat` defined on the
         :attr:`dof.dset` of this :class:`Function`."""
 
-        return op2.Dat(self.dof_dset, np.zeros(self.dof_count * self._dim),
+        return op2.Dat(self.dof_dset, np.zeros(self.dof_count),
                        valuetype)
 
 
@@ -515,12 +515,16 @@
 
         ufl.Coefficient.__init__(self, self._function_space.ufl_element())
 
+        self.name = name
+        self.uid = _new_uid()
+
         if val is not None:
-            self.val = val
+            self.dat = op2.Dat(self.dof_dset, val, valuetype, self.name,
+                               uid=self.uid)
         else:
-            self.val = np.zeros(self._function_space.dof_count)
-        self.name = name
-        self.uid = _new_uid()
+            self.dat = op2.Dat(self.dof_dset, 
+                               np.zeros(self._function_space.dof_count),
+                               valuetype, self.name, uid=self.uid)
 
         self._repr = None
 
@@ -538,11 +542,6 @@
     def dof_dset(self):
         return self._function_space.dof_dset
 
-    @utils.cached_property
-    def dat(self):
-        return op2.Dat(self.dof_dset, self.val, valuetype, self.name,
-                       uid=self.uid)
-
     @property
     def cell_node_map(self):
         return self._function_space.cell_node_map

=== modified file 'tests/ufl_firedrake/test.py'
--- tests/ufl_firedrake/test.py	2013-08-08 12:55:12 +0000
+++ tests/ufl_firedrake/test.py	2013-08-27 10:26:44 +0000
@@ -22,7 +22,7 @@
     
     firedrake.solve(u*v*firedrake.dx==f*v*firedrake.dx, out)
     
-    return np.max(np.abs(out.val-f.val))
+    return np.max(np.abs(out.dat.data-f.dat.data))
 
 def run_test():
     family = "Lagrange"

=== modified file 'tests/ufl_firedrake_parallel/test.py'
--- tests/ufl_firedrake_parallel/test.py	2013-08-08 12:55:12 +0000
+++ tests/ufl_firedrake_parallel/test.py	2013-08-27 10:26:44 +0000
@@ -23,7 +23,7 @@
     
     firedrake.solve(u*v*firedrake.dx==f*v*firedrake.dx, out)
 
-    err = np.max(np.abs(out.val - f.val))
+    err = np.max(np.abs(out.dat.data - f.dat.data))
     MPI.COMM_WORLD.allreduce(MPI.IN_PLACE, err, MPI.MAX)
     return err