Merge lp:~jobh/cbc.block/fenics-1.0-updates into lp:~cbc.block/cbc.block/kent

[Joachim Haga]

Remove some unused stuff

=== modified file 'block/__init__.py'
--- block/__init__.py	2011-08-09 11:00:44 +0000
+++ block/__init__.py	2012-02-02 11:43:26 +0000
@@ -65,28 +65,8 @@
     dolfin.GenericMatrix.create_vec = vec_pool(create_vec)
 
     # For the Trilinos stuff, it's much nicer if down_cast is a method on the
-    # object. Also do some fixup so that the down-casted object is not deleted
-    # just because the owning object goes out of scope, by creating a hidden
-    # backwards reference. (Python garbage collects circular references as long
-    # as custom __del__ methods are not in use.) NOTE this is fixed now in recent
-    # dolfin, may be simplified.
-    def la_object(self):
-        obj = self.la_object()
-        obj.reference = self
-        return obj
-    def down_cast(self):
-        obj = dolfin.down_cast(self)
-        if not hasattr(obj, 'la_object'):
-            cls = obj.__class__
-            if hasattr(cls, 'vec'):
-                cls.vec, cls.la_object = la_object, cls.vec
-            elif hasattr(cls, 'mat'):
-                cls.mat, cls.la_object = la_object, cls.mat
-            else:
-                raise RuntimeError, 'down_cast on unknown object'
-        return obj
-
-    dolfin.GenericMatrix.down_cast = down_cast
-    dolfin.GenericVector.down_cast = down_cast
+    # object.
+    dolfin.GenericMatrix.down_cast = dolfin.down_cast
+    dolfin.GenericVector.down_cast = dolfin.down_cast
 
 _init()

=== modified file 'block/algebraic/trilinos/__init__.py'
--- block/algebraic/trilinos/__init__.py	2011-03-28 19:13:44 +0000
+++ block/algebraic/trilinos/__init__.py	2012-02-02 11:43:26 +0000
@@ -1,9 +1,4 @@
 def _init():
-    import sys
-    if 'dolfin' in sys.modules and not 'PyTrilinos' in sys.modules:
-        raise RuntimeError('must be imported before dolfin -- add "import PyTrilinos" first in your script')
-    del sys
-
     import block.algebraic
     class active_backend(object):
         name = 'trilinos'

=== modified file 'demo/biot.py'
--- demo/biot.py	2011-11-04 20:57:36 +0000
+++ demo/biot.py	2012-02-02 11:43:26 +0000
@@ -41,10 +41,6 @@
 Richardson method just for reporting purposes.
 """
 
-# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
-# modules. This works around a bug with MPI initialisation/destruction order.
-import PyTrilinos
-
 from block import *
 from block.iterative import *
 from block.algebraic.trilinos import *

=== modified file 'demo/fenics-book/hodge.py'
--- demo/fenics-book/hodge.py	2011-04-28 09:37:49 +0000
+++ demo/fenics-book/hodge.py	2012-02-02 11:43:26 +0000
@@ -26,7 +26,6 @@
 preconditioned systems.
 """
 
-import PyTrilinos
 from dolfin import *
 from block import *
 from block.iterative import *

=== modified file 'demo/fenics-book/poisson_neumann.py'
--- demo/fenics-book/poisson_neumann.py	2011-04-28 09:37:49 +0000
+++ demo/fenics-book/poisson_neumann.py	2012-02-02 11:43:26 +0000
@@ -1,4 +1,3 @@
-import PyTrilinos
 from dolfin import *
 from block.iterative import ConjGrad
 from block.algebraic.trilinos import ML

=== modified file 'demo/fenics-book/stokes.py'
--- demo/fenics-book/stokes.py	2011-04-28 09:37:49 +0000
+++ demo/fenics-book/stokes.py	2012-02-02 11:43:26 +0000
@@ -1,4 +1,3 @@
-import PyTrilinos
 from dolfin import *
 from block import *
 from block.iterative import *

=== modified file 'demo/fenics-book/timestokes.py'
--- demo/fenics-book/timestokes.py	2011-04-28 09:37:49 +0000
+++ demo/fenics-book/timestokes.py	2012-02-02 11:43:26 +0000
@@ -23,7 +23,6 @@
 systems.
 """
 
-import PyTrilinos
 from dolfin import *
 from block import *
 from block.iterative import CGN

=== modified file 'demo/mixedpoisson.py'
--- demo/mixedpoisson.py	2011-04-26 11:51:16 +0000
+++ demo/mixedpoisson.py	2012-02-02 11:43:26 +0000
@@ -44,10 +44,6 @@
 operator it is safe to use as inner solver for an outer Krylov solver.
 """
 
-# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
-# modules. This works around a bug with MPI initialisation/destruction order.
-import PyTrilinos
-
 from block import *
 from block.iterative import Richardson, ConjGrad, MinRes
 from block.algebraic.trilinos import ML, collapse

=== modified file 'demo/navierstokes.py'
--- demo/navierstokes.py	2011-11-04 20:57:36 +0000
+++ demo/navierstokes.py	2012-02-02 11:43:26 +0000
@@ -5,12 +5,8 @@
 It is a modification of the Stokes demo (demo-stokes.py).
 """
 
-# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
-# modules. This works around a bug with MPI initialisation/destruction order.
-# Furthermore, scipy (in LGMRES) seems to crash unless it's loaded before
-# PyTrilinos.
+# Scipy (in LGMRES) seems to crash unless it's loaded before PyTrilinos.
 import scipy
-import PyTrilinos
 import os
 
 from dolfin import *

=== modified file 'demo/numpy_test.py'
--- demo/numpy_test.py	2011-05-26 01:03:40 +0000
+++ demo/numpy_test.py	2012-02-02 11:43:26 +0000
@@ -1,4 +1,3 @@
-import PyTrilinos
 from block import *
 from block.iterative import *
 from block.algebraic.trilinos import *

=== modified file 'demo/parallelmixedpoisson.py'
--- demo/parallelmixedpoisson.py	2011-04-26 11:51:16 +0000
+++ demo/parallelmixedpoisson.py	2012-02-02 11:43:26 +0000
@@ -32,10 +32,6 @@
 Alternatively, a non-symmetric solver such as TFQMR or BiCGStab may be used.
 """
 
-# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
-# modules. This works around a bug with MPI initialisation/destruction order.
-import PyTrilinos
-
 from block import *
 from block.iterative import TFQMR, Richardson, ConjGrad, MinRes
 from block.algebraic.trilinos import ML, collapse

=== modified file 'demo/poisson.py'
--- demo/poisson.py	2011-06-01 15:35:13 +0000
+++ demo/poisson.py	2012-02-02 11:43:26 +0000
@@ -1,4 +1,3 @@
-import PyTrilinos
 from block import *
 from block.iterative import *
 from block.algebraic.trilinos import *

=== modified file 'demo/stokes.py'
--- demo/stokes.py	2011-11-04 20:57:36 +0000
+++ demo/stokes.py	2012-02-02 11:43:26 +0000
@@ -19,10 +19,6 @@
        | 0   L |
 """
 
-# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
-# modules. This works around a bug with MPI initialisation/destruction order.
-import PyTrilinos
-
 from dolfin import *
 from block import *
 from block.iterative import *