CBC.Block

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

  1. fenics-1.0-updates
  2. Merge into kent
Proposed by Joachim Haga
Status: Merged
Merged at revision: 93
Proposed branch: lp:~jobh/cbc.block/fenics-1.0-updates
Merge into: lp:~cbc.block/cbc.block/kent
Diff against target: 187 lines (+4/-55)
13 files modified
block/__init__.py (+3/-23)
block/algebraic/trilinos/__init__.py (+0/-5)
demo/biot.py (+0/-4)
demo/fenics-book/hodge.py (+0/-1)
demo/fenics-book/poisson_neumann.py (+0/-1)
demo/fenics-book/stokes.py (+0/-1)
demo/fenics-book/timestokes.py (+0/-1)
demo/mixedpoisson.py (+0/-4)
demo/navierstokes.py (+1/-5)
demo/numpy_test.py (+0/-1)
demo/parallelmixedpoisson.py (+0/-4)
demo/poisson.py (+0/-1)
demo/stokes.py (+0/-4)
To merge this branch: bzr merge lp:~jobh/cbc.block/fenics-1.0-updates
Reviewer Review Type Date Requested Status
Kent-Andre Mardal Pending
Review via email: mp+91245@code.launchpad.net

Description of the change

Remove some unused stuff

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
65 dolfin.GenericMatrix.create_vec = vec_pool(create_vec)65 dolfin.GenericMatrix.create_vec = vec_pool(create_vec)
6666
67 # For the Trilinos stuff, it's much nicer if down_cast is a method on the67 # For the Trilinos stuff, it's much nicer if down_cast is a method on the
68 # object. Also do some fixup so that the down-casted object is not deleted68 # object.
69 # just because the owning object goes out of scope, by creating a hidden69 dolfin.GenericMatrix.down_cast = dolfin.down_cast
70 # backwards reference. (Python garbage collects circular references as long70 dolfin.GenericVector.down_cast = dolfin.down_cast
71 # as custom __del__ methods are not in use.) NOTE this is fixed now in recent
72 # dolfin, may be simplified.
73 def la_object(self):
74 obj = self.la_object()
75 obj.reference = self
76 return obj
77 def down_cast(self):
78 obj = dolfin.down_cast(self)
79 if not hasattr(obj, 'la_object'):
80 cls = obj.__class__
81 if hasattr(cls, 'vec'):
82 cls.vec, cls.la_object = la_object, cls.vec
83 elif hasattr(cls, 'mat'):
84 cls.mat, cls.la_object = la_object, cls.mat
85 else:
86 raise RuntimeError, 'down_cast on unknown object'
87 return obj
88
89 dolfin.GenericMatrix.down_cast = down_cast
90 dolfin.GenericVector.down_cast = down_cast
9171
92_init()72_init()
9373
=== 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 @@
1def _init():1def _init():
2 import sys
3 if 'dolfin' in sys.modules and not 'PyTrilinos' in sys.modules:
4 raise RuntimeError('must be imported before dolfin -- add "import PyTrilinos" first in your script')
5 del sys
6
7 import block.algebraic2 import block.algebraic
8 class active_backend(object):3 class active_backend(object):
9 name = 'trilinos'4 name = 'trilinos'
105
=== 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 @@
41Richardson method just for reporting purposes.41Richardson method just for reporting purposes.
42"""42"""
4343
44# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
45# modules. This works around a bug with MPI initialisation/destruction order.
46import PyTrilinos
47
48from block import *44from block import *
49from block.iterative import *45from block.iterative import *
50from block.algebraic.trilinos import *46from block.algebraic.trilinos import *
5147
=== 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 @@
26preconditioned systems.26preconditioned systems.
27"""27"""
2828
29import PyTrilinos
30from dolfin import *29from dolfin import *
31from block import *30from block import *
32from block.iterative import *31from block.iterative import *
3332
=== 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 @@
1import PyTrilinos
2from dolfin import *1from dolfin import *
3from block.iterative import ConjGrad2from block.iterative import ConjGrad
4from block.algebraic.trilinos import ML3from block.algebraic.trilinos import ML
54
=== 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 @@
1import PyTrilinos
2from dolfin import *1from dolfin import *
3from block import *2from block import *
4from block.iterative import *3from block.iterative import *
54
=== 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 @@
23systems.23systems.
24"""24"""
2525
26import PyTrilinos
27from dolfin import *26from dolfin import *
28from block import *27from block import *
29from block.iterative import CGN28from block.iterative import CGN
3029
=== 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 @@
44operator it is safe to use as inner solver for an outer Krylov solver.44operator it is safe to use as inner solver for an outer Krylov solver.
45"""45"""
4646
47# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
48# modules. This works around a bug with MPI initialisation/destruction order.
49import PyTrilinos
50
51from block import *47from block import *
52from block.iterative import Richardson, ConjGrad, MinRes48from block.iterative import Richardson, ConjGrad, MinRes
53from block.algebraic.trilinos import ML, collapse49from block.algebraic.trilinos import ML, collapse
5450
=== 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 @@
5It is a modification of the Stokes demo (demo-stokes.py).5It is a modification of the Stokes demo (demo-stokes.py).
6"""6"""
77
8# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin8# Scipy (in LGMRES) seems to crash unless it's loaded before PyTrilinos.
9# modules. This works around a bug with MPI initialisation/destruction order.
10# Furthermore, scipy (in LGMRES) seems to crash unless it's loaded before
11# PyTrilinos.
12import scipy9import scipy
13import PyTrilinos
14import os10import os
1511
16from dolfin import *12from dolfin import *
1713
=== 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 @@
1import PyTrilinos
2from block import *1from block import *
3from block.iterative import *2from block.iterative import *
4from block.algebraic.trilinos import *3from block.algebraic.trilinos import *
54
=== 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 @@
32Alternatively, a non-symmetric solver such as TFQMR or BiCGStab may be used.32Alternatively, a non-symmetric solver such as TFQMR or BiCGStab may be used.
33"""33"""
3434
35# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
36# modules. This works around a bug with MPI initialisation/destruction order.
37import PyTrilinos
38
39from block import *35from block import *
40from block.iterative import TFQMR, Richardson, ConjGrad, MinRes36from block.iterative import TFQMR, Richardson, ConjGrad, MinRes
41from block.algebraic.trilinos import ML, collapse37from block.algebraic.trilinos import ML, collapse
4238
=== 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 @@
1import PyTrilinos
2from block import *1from block import *
3from block.iterative import *2from block.iterative import *
4from block.algebraic.trilinos import *3from block.algebraic.trilinos import *
54
=== 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 @@
19 | 0 L |19 | 0 L |
20"""20"""
2121
22# Since we use ML from Trilinos, we must import PyTrilinos before any dolfin
23# modules. This works around a bug with MPI initialisation/destruction order.
24import PyTrilinos
25
26from dolfin import *22from dolfin import *
27from block import *23from block import *
28from block.iterative import *24from block.iterative import *

Subscribers

People subscribed via source and target branches