lp://staging/~asc/fluidity/testharnessregex

Created by Adam Candy and last modified
Get this branch:
bzr branch lp://staging/~asc/fluidity/testharnessregex
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

3571. By Adam Candy

Removal of ugly blank lines that had been allowed to creep in.

3570. By Adam Candy

New feature for the testharness - specify test cases to consider by a regex using the option -s.
For example, the following runs all tests beginning with 'iceshelf' or 'shallow':
  testharness.py -s '^(iceshelf|shallow).*\.xml

3569. By Patrick Farrell

Clean up the configure.in; a debugging print statement
got left behind somehow.

3568. By Christian Jacobs

Merging ctjacobs-multiphase branch revisions (from r3452 to r3532 inclusive) into trunk. Branch queue passes all unit, short and medium tests on buildbot.

Summary of changes:
===================

- Implemented the fluid-particle drag term in Multiphase.F90. The mphase_stokes_law and mphase_tephra_settling test cases have been updated to use this new implementation, rather than a Python diagnostic Source field. An MMS test which includes this fluid-particle drag term is available in longtests/mphase_mms_p1dgp2_fpdrag, and converges at the expected order.

- Implemented a new boundary condition type, called 'flux', for control volume discretisations. Updated the mphase_tephra_settling test case to use this, which allows to flux in through the boundary at the correct rate. Also added documentation regarding this boundary condition type to the manual.

- When checking the tfield_bc_type in Field_Equations_CV.F90, we now compare against the more meaningful integer parameters BC_TYPE_WEAKDIRICHLET (=1), BC_TYPE_NEUMANN (=2), etc.

- Added the 'tephra_settling' example to the examples directory, along with some documentation (background, simulation setup, results, pretty pictures) in manual/examples.tex.

- In manual/model_equations.tex and manual/configuring_fluidity.tex: Added documentation on the multi-phase flow model equations, setting up multi-phase flow simulations, available inter-phase interaction terms, and current limitations of the model.

- Corrected typos in various places in the manual.

- Made the mphase_tephra_settling test more realistic by adding in random perturbations to the PhaseVolumeFraction influx. Also made a few minor tweaks (e.g. finish_time, timestep), and added pass_tests.

- Added a three-phase test called mphase_three_layers. This checks that our model can simulate more than one dispersed phase, allowing us to use several different particle sizes in our tephra settling simulation later on.

- Moved the mphase_tephra_settling_3d test case to the longtests directory.

3567. By Patrick Farrell

I think this should fix Tim's BAS unit test fail.

The line was padded with whitespace at the end to position 157,
running over the 132 character limit, and so the compiler didn't
see the end of the line ...

3566. By Patrick Farrell

Possible fix for lp:832197. It seems that the old version of scipy
installed on cx1 doesn't take in the 'shape' argument for scipy.sparse.csr_matrix.__init__.
Fail gracefully in that case, rather than printing an exception which may
confuse users.

3565. By Patrick Farrell

Update libspud to r452.

3564. By Jon Hill

Bug fix to Momentum_DG when using implicity_buoyancy. The interface to ele_grad_at_quad got changed a while back and this one was missed or reverted

3563. By Rhodri Nelson

Switching the indices of an array which seems to have been missed when the ele_grad_at_quad interface was updated a while back.

3562. By Patrick Farrell

I think this will fix the cx1 build. The rule to fetch the python
binding to libspud (libspud.so) was trying to copy it from
lib/python*/site-packages, but redhat helpfully puts the python binding in
lib64/python*/site-packages.

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