lp:~michael-lange/fluidity/detector_cleanup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:fluidity at revision 3590

Dr Colin J Cotter: Approve on 2011-09-27

Paul Woodhams: Needs Fixing on 2011-07-26

Cian Wilson: Needs Fixing on 2011-07-21

Diff: 7633 lines (+2553/-3800)

43 files modified

assemble/Adapt_State.F90 (+21/-3)
assemble/Implicit_Solids.F90 (+1/-0)
assemble/Makefile.dependencies (+12/-11)
assemble/Sam_integration.F90 (+11/-30)
assemble/Zoltan_callbacks.F90 (+47/-72)
assemble/Zoltan_detectors.F90 (+82/-122)
assemble/Zoltan_global_variables.F90 (+1/-1)
assemble/Zoltan_integration.F90 (+120/-133)
femtools/Checkpoint.F90 (+15/-51)
femtools/Detector_Data_Types.F90 (+48/-9)
femtools/Detector_Move_Lagrangian.F90 (+457/-0)
femtools/Detector_Parallel.F90 (+317/-0)
femtools/Detector_Tools.F90 (+424/-192)
femtools/Diagnostic_variables.F90 (+560/-2894)
femtools/Makefile.dependencies (+24/-1)
femtools/Makefile.in (+4/-2)
femtools/Pickers_Inquire.F90 (+14/-35)
main/Fluids.F90 (+4/-0)
main/Makefile.dependencies (+2/-2)
manual/Makefile (+1/-1)
manual/bibliography.bib (+12/-14)
manual/configuring_fluidity.tex (+5/-0)
manual/numerical_discretisation.tex (+37/-18)
manual/numerical_discretisation_images/bisection_method.fig (+0/-52)
manual/numerical_discretisation_images/guided_search_method.fig (+46/-0)
schemas/fluidity_options.rnc (+67/-57)
schemas/fluidity_options.rng (+66/-57)
tests/binary_detectors/binary_detectors.xml (+19/-1)
tests/binary_detectors/detectors.flml (+11/-0)
tests/binary_detectors/make_det_position.py (+16/-0)
tests/biology_6_component/biology_conservation.flml (+0/-12)
tests/detectors_parallel_adaptivity/Xvals.txt (+1/-0)
tests/detectors_parallel_adaptivity/Yvals.txt (+1/-0)
tests/detectors_parallel_adaptivity/detectors.flml (+41/-12)
tests/detectors_parallel_adaptivity/detectors_parallel_adaptivity.xml (+9/-2)
tests/detectors_parallel_adaptivity/readtool.py (+21/-0)
tests/lagrange_tracer_lowcourant/lagrange_tracer.flml (+20/-0)
tests/lagrangian_detectors/lagrangian_detectors_rk.flml (+6/-6)
tests/lagrangian_detectors_3d/lagrangian_detectors_3d.flml (+6/-6)
tests/turbine_flux_dg_2plus1/onedomain_2plus1.flml (+1/-1)
tests/turbine_flux_dg_2plus1/turbine_flux_dg_2plus1.flml (+1/-1)
tests/turbine_flux_penalty_2plus1/onedomain_2plus1.flml (+1/-1)
tests/turbine_flux_penalty_2plus1/turbine_flux_penalty_2plus1.flml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3549. By Michael Lange on 2011-09-27

Adding a paragraph about Lagrangian detector configuration to the manual.

3548. By Michael Lange on 2011-09-26

Merge from trunk

3547. By Michael Lange on 2011-08-22

Merge from trunk

3546. By Michael Lange on 2011-07-26

Oops, forgot this line in the last commit.

3545. By Michael Lange on 2011-07-26

Turning fixed-bound loops into while-loops when detectors are removed within the loop body. Also using any(...) to set do_broadcast flag. Thanks to Paul for pointing this out.

3544. By Michael Lange on 2011-07-26

Merge from trunk

3543. By Michael Lange on 2011-07-23

Merge from trunk and updated makefile dependencies

3542. By Michael Lange on 2011-07-19

Merge from trunk

3541. By Michael Lange on 2011-07-19

Removing description of bisection method from manual and adding guided search algorithm.

3540. By Michael Lange on 2011-07-18

Adding Forward Euler and RK4 as hardcoded options for lagrangian detector advection.