dolfin team mailing list archive

Thread
Date

Re: [Branch ~dolfin-core/dolfin/main] Rev 5372: Re-activate Python adaptivity module.

To: DOLFIN Mailing List <dolfin@xxxxxxxxxxxxxxxxxxx>
From: "Marie E. Rognes" <meg@xxxxxxxxx>
Date: Tue, 7 Dec 2010 14:20:31 +0100
In-reply-to: <20101207131633.6780.49228.launchpad@loganberry.canonical.com>

Yep, will check this evening. 

--
Marie

On 7. des. 2010, at 14:16, noreply@xxxxxxxxxxxxx wrote:

> ------------------------------------------------------------
> revno: 5372
> committer: Garth N. Wells <gnw20@xxxxxxxxx>
> branch nick: dolfin-all
> timestamp: Tue 2010-12-07 13:13:29 +0000
> message:
>  Re-activate Python adaptivity module.
> 
>  Maries: can you check the logic of the change?
> modified:
>  site-packages/dolfin/__init__.py
>  site-packages/dolfin/adaptivity/specialfunctions.py
> 
> 
> --
> lp:dolfin
> https://code.launchpad.net/~dolfin-core/dolfin/main
> 
> Your team DOLFIN Core Team is subscribed to branch lp:dolfin.
> To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/main/+edit-subscription
> === modified file 'site-packages/dolfin/__init__.py' --- site-packages/dolfin/__init__.py	2010-12-03 13:11:44 +0000 +++ site-packages/dolfin/__init__.py	2010-12-07 13:13:29 +0000 @@ -49,7 +49,7 @@ from dolfin.mesh.ale import * from dolfin.mesh.refine import * -#from dolfin.adaptivity.adaptive import * +from dolfin.adaptivity.adaptive import * # Classes from dolfin.cpp import Matrix, Vector, Scalar, GenericMatrix, GenericVector === modified file 'site-packages/dolfin/adaptivity/specialfunctions.py' --- site-packages/dolfin/adaptivity/specialfunctions.py	2010-05-09 13:47:14 +0000 +++ site-packages/dolfin/adaptivity/specialfunctions.py	2010-12-07 13:13:29 +0000 @@ -2,7 +2,8 @@ __copyright__ = "Copyright (C) 2009 - Marie E. Rognes" __license__ = "GNU GPL version 3 or any later version" -# Last changed: 2010-05-09 +# Modified by Garth N. Wells, 2010. +# Last changed: 2010-12-07 from dolfin import FunctionSpace, Function, Expression @@ -58,11 +59,11 @@ def set(self, R_e): self.R_e = R_e - def eval_data(self, values, data): + def eval_cell(self, values, x, cell): """ If x is on a facet, evaluate the function associated with that facet """ # Note: Maybe slow? values[0] = 0.0 - if data.on_facet(): - self.R_e[data.facet()].eval_data(values, data) + if cell.local_facet >= 0: + self.R_e[data.facet()].eval_data(values, x, cell)