lp://staging/~asc/fluidity/wetdryaspect_merge_proposal

Created by Adam Candy and last modified
Get this branch:
bzr branch lp://staging/~asc/fluidity/wetdryaspect_merge_proposal
Only Adam Candy can upload to this branch. If you are Adam Candy please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Adam Candy
Project:
Fluidity
Status:
Development

Recent revisions

4325. By Adam Candy

All of robust wetting and drying stabilisation code for the pressure and velocity solvers. Functions in both continuous and discontinuous spaces, on the sphere, with element distance calculation options and supported with conditioning evaluation test cases.

4324. By Tim Greaves

As per discussion at:
http://lists.gnu.org/archive/html/bug-libtool/2012-03/msg00004.html

libtool generation breaks for wrapped gfortran >=4.6 in some cases. This is
a different fix to the one proposed in the link above but seems to work. I'm
applying this directly to Fluidity to get a quick fix for Archer but will also
propose it as a fix to spud.

4323. By Stephan Kramer

Obvious copy and paste bug.

I think this may fix the intel flredecomp bug for the cx1 tests, as I get the following
backtrace (only for non-debugging build):
gdb) bt
#0 0x0000000000659f0b in state_module_mp_aliased_scalar_ ()
#1 0x000000000050950c in checkpoint_mp_checkpoint_fields_ ()
#2 0x00000000005072cb in checkpoint_mp_checkpoint_state_ ()
#3 0x0000000000507116 in checkpoint_mp_checkpoint_simulation_ ()
#4 0x0000000000503c5e in flredecomp ()
#5 0x000000000050419b in main ()

4322. By Cian Wilson

BUG FIX: p%mesh should be p_theta%mesh. This was only a problem when using the viscous fs while testing the divergence using cv. This is tested but apparently not in parallel when you can't get away with using the wrong global node numbering.

4321. By Tim Greaves

Relaxing tolerances slightly after consultation with David, in response to a
slight change in the test result on Ubuntu Trusty. Note that this may be a
change from gmsh - the test passed fine on 2.5/2.6, failed intermittently with
2.8.3, and fails consistently with 2.8.4.

4320. By Stephan Kramer

Speed up of vtudiff for vtus with multiple fields.

This is done by only setting up the VTK probe once instead of once per field. It does not change anything in the way fields are probed.
This commit also enables the diffing of cell-based (P0) fields in the vtu (only works if they are on the same mesh).

There is also a little bit of cleaning up in vtktools:
* removing the option to call vtktools as a main: this really doesn't make sense and should be in a separate script
* removing the "field manipulation" methods. These were basically vectorial operations on fields but implemented in a rather inefficient way. I see no reason to not simply use numpy vector operations for that, so instead of:

vtu.SubFieldFromField("fieldName", array, "newFieldName")

just do:

field = vtu.GetField("fieldName")
vtu.AddField("newFieldName", field-array)

4319. By Stephan Kramer

Bug-fix: fixes bottom friction term for shallow water equations with CG velocity.

4318. By Gerard

Reran a more recent version of autoconf because older versions have a buggy AC_COMPUTE_INT macro.

4317. By Gerard

bugfix: fixes a long standing issue where incorrect parts were generated for include dirs when libadjoint was not installed.

4316. By Gerard

Patches to build to support ARCHER: patches include path from cray-petsc (have also reported bug to cray); extend hector hack for archer that forces libspud to be built statically.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/fluidity
This branch contains Public information 
Everyone can see this information.

Subscribers