lp:~s-parkinson11/fluidity/sinking_velocity_schema_fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:fluidity at revision 4133

Jon Hill: Approve on 2012-10-04

Diff: 406 lines (+160/-9)

14 files modified

assemble/Advection_Diffusion_CG.F90 (+15/-2)
assemble/Advection_Diffusion_DG.F90 (+82/-1)
assemble/Advection_Diffusion_FV.F90 (+15/-2)
assemble/Field_Equations_CV.F90 (+19/-2)
schemas/fluidity_options.rnc (+3/-0)
schemas/fluidity_options.rng (+4/-1)
schemas/prognostic_field_options.rnc (+6/-0)
schemas/prognostic_field_options.rng (+7/-1)
tests/biology_6_component_parallel/biology_conservation.flml (+1/-0)
tests/biology_6_component_parallel/biology_conservation_parallel.flml (+1/-0)
tests/biology_conservation_adapt/biology_conservation.flml (+1/-0)
tests/mms_sediment/MMS_X.flml (+4/-0)
tests/sinking_velocity/sinking_velocity.flml (+1/-0)
tests/sinking_velocity_cv/sinking_velocity.flml (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4076. By Samuel Parkinson on 2012-11-27

make makefiles

4075. By Samuel Parkinson on 2012-11-27

merge with trunk

4074. By Samuel Parkinson on 2012-10-25

merge with broken branch

4073. By Samuel Parkinson on 2012-10-04

fixed bug that made all runs with scalar fields, but no sinking velocity, fail

4072. By Samuel Parkinson on 2012-10-04

updated test flml files

4071. By Samuel Parkinson on 2012-10-04

fixed bugs in options checking routines - these now work as planned

4070. By Samuel Parkinson on 2012-10-04

merge with trunk

4069. By Samuel Parkinson on 2012-10-04

Added SinkingVelocity mesh checking to check_options routines of:
Advection_Diffusion_CG.F90
Advection_Diffusion_FV.F90
Field_Equations_CV.F90

Added check_options routine in Advection_Diffusion_DG.F90 with check for SinkingVelocity mesh.

not tested yet.

4068. By Samuel Parkinson on 2012-09-29

changes to schema so that sinking velocity can have any mesh

4067. By Adam Candy on 2012-09-20

radial scale tool - no need for pylab dependencies, available in math.