Fluidity

Merge lp://staging/~r-nelson/fluidity/parallel_sigma into lp://staging/fluidity

  1. parallel_sigma
  2. Merge into dev-trunk
Proposed by Rhodri Nelson
Status: Work in progress
Proposed branch: lp://staging/~r-nelson/fluidity/parallel_sigma
Merge into: lp://staging/fluidity
Diff against target: 357 lines (+166/-46)
3 files modified
horizontal_adaptivity/Combine_Meshes.F90 (+164/-44)
horizontal_adaptivity/Extrude.F90 (+1/-1)
horizontal_adaptivity/Extrude_radially.F90 (+1/-1)
To merge this branch: bzr merge lp://staging/~r-nelson/fluidity/parallel_sigma
Reviewer Review Type Date Requested Status
Simon Funke Needs Information
Review via email: mp+71571@code.staging.launchpad.net

Description of the change

Fixed a bug with Sigma coordinates in parallel. Instead of using a pre-existing chain as a dummy chain to create the initial mesh, a specific dummy chain is now created. This ensures consistency across all processors.

Also, updated a couple of interfaces to be more in line with the fluidity style.

To post a comment you must log in.
Revision history for this message
Simon Funke (simon-funke) wrote :

This merge request has empty? What happened?

review: Needs Information
Reply
Revision history for this message
Lawrence Mitchell (wence) wrote :

I think the relevant differences in the branch are already in trunk (see r3545)

Reply
Revision history for this message
Adam Candy (asc) wrote :

That was my conclusion too.
It'd be good to check that there isn't some extra code that was meant to be included in this merge - Rhodri? Let us know when you're back online - さっぽろはどうですか？　おげんきで！

Reply
Revision history for this message
Rhodri Nelson (r-nelson) wrote :

Something strange seems to have happened, which was probably my mistake. I modified my trunk and then made a branch from it but for some reason none of the changes were ported into the branch. Maybe it's because I forgot to commit them locally or something? I can't access Rossby at the moment though so can't get hold of the code. I'll update the other merge request later though as I have that on my laptop.

Reply
lp://staging/~r-nelson/fluidity/parallel_sigma updated
3551. By Rhodri Nelson

Updating some local changes.

Revision history for this message
Rhodri Nelson (r-nelson) wrote :

The relevant changes have now been uploaded to Launchpad.

Reply

Unmerged revisions

3551. By Rhodri Nelson

Updating some local changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.