lp:~fluidity-core/fluidity/hybrid-assemble

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:fluidity at revision 4042

Stephan Kramer: Approve on 2012-08-31

Diff: 187 lines (+98/-12)

3 files modified

assemble/Advection_Diffusion_DG.F90 (+50/-5)
assemble/Advection_Diffusion_FV.F90 (+47/-6)
tests/divergence_free_velocity_press_cg_test_cty_cv/divergence_free_velocity_press_cg_test_cty_cv.xml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3634. By Xiaohu Guo on 2012-08-31

merge from trunk (up to revision 4041)

3633. By Xiaohu Guo on 2012-08-31

merge from trunk (up to revision 4039)

3632. By Xiaohu Guo on 2012-08-30

merge from trunk (up to revision 4038)

3631. By Xiaohu Guo on 2012-08-09

thread matrix assembly part for Advection_Diffusion_FV.F90

3630. By Xiaohu Guo on 2012-08-08

merge from trunk (up to revison 4023)

3629. By Xiaohu Guo on 2012-07-17

merge from trunk (up to revison 4010)

3628. By Xiaohu Guo on 2012-05-31

merge from trunk (up to revison 3997)

3627. By Xiaohu Guo on 2012-05-31

1. thread matrix assembly part for Advection_Diffusion_DG.F90
2. More work need to be done to figure out the sparsity of MASSLUMPED_RT0 diffusion scheme, I simply set threads back to 1 if MASSLUMPED_RT0 diffusion scheme is being used for now.

3626. By Lawrence Mitchell on 2012-05-14

Fix null dereference when checking halo types

Logical evaluations aren't necessarily short-circuited when an
argument evaluates to .false., so

   if (associated(foo) .and. (foo%bar == baz))

may dereference foo even if it is unassociated. So don't do it.

3625. By Lawrence Mitchell on 2012-05-09

Update femtools/Makefile dependencies