Merge lp:~fluidity-core/fluidity/fix_diagnostic_material_viscosity into lp:fluidity

Proposed by Rhodri Davies
Status: Merged
Merged at revision: 4158
Proposed branch: lp:~fluidity-core/fluidity/fix_diagnostic_material_viscosity
Merge into: lp:fluidity
Diff against target: 0 lines
To merge this branch: bzr merge lp:~fluidity-core/fluidity/fix_diagnostic_material_viscosity
Reviewer Review Type Date Requested Status
Stephan Kramer Approve
Review via email: mp+144847@code.launchpad.net

Description of the change

This branch includes a patch to fix the multi material diagnostic dependency bug (supplied by Cian). It was a simple indexing error. The branch also includes the minor modifications required to ensure that material viscosities are updated in sync with momentum diagnostics.

To post a comment you must log in.
Revision history for this message
Rhodri Davies (rhodri-davies) wrote :

Forgot to mention: there is a green buildbot branch here:

http://buildbot-ocean.ese.ic.ac.uk:8080/builders/fix_diagnostic_material_viscosity

Revision history for this message
Stephan Kramer (s-kramer) wrote :

This looks correct to me. It would be nice if we could switch this on in a test somewhere, but if this is something that's still under development better to merge this fix in first.

review: Approve
4158. By Rhodri Davies

Merge trunk changes into branch before merge.

Preview Diff

Empty