Merge pull request #4940 from firedrakeproject/pbrubeck/merge-release

Author: connorjward

docs/source/tutorial_mar_26.rst

@@ -43,8 +43,8 @@ The course will begin at 13:00 on March 18 and end at 16:00 on March 20.
 Schedule
 --------
 
-Wed Mar 18
-==========
+Wed Mar 18 (room L4)
+====================
 
 +-------------+------------------------------------+
 | Time        | Session                            |
@@ -56,8 +56,8 @@ Wed Mar 18
 | 15:15–17:00 | Meshing with Netgen. Adaptivity    |
 +-------------+------------------------------------+
 
-Thu Mar 19
-==========
+Thu Mar 19 (room L4)
+====================
 
 +-------------+-------------------------------------+
 | Time        | Session                             |
@@ -77,8 +77,8 @@ Thu Mar 19
 | 16:15-18:00 | Hyperelasticity. Multiple solutions |
 +-------------+-------------------------------------+
 
-Fri Mar 20
-==========
+Fri Mar 20 (room L2)
+====================
 
 +-------------+------------------------------------+
 | Time        | Session                            |

firedrake/deflation.py

@@ -94,7 +94,8 @@ def solve(self, snes, b, x):
         snes.reason = self.inner.reason
 
         # Record the solution we've just found
-        self.deflation.append(Function(self.problem.u))
+        if snes.reason > 0:
+            self.deflation.append(Function(self.problem.u))
 
         return out
 

tests/pyop2/test_caching.py

@@ -821,6 +821,7 @@ def test_writing_large_so():
     COMM_WORLD.Barrier()
     with open("big.c", "r") as fh:
         program = fh.read()
+    COMM_WORLD.Barrier()
 
     if COMM_WORLD.rank == 1:
         os.remove("big.c")