lp://staging/~asc/fluidity/here

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/fluidity

Fluidity Core Team: Pending requested 2011-09-02

Diff: 36 lines (+15/-0)

2 files modified

debug/Debug.F90 (+14/-0)
include/fdebug.h (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3570. By Adam Candy on 2011-09-02

A new debugging function FLHere(string) which prints out filename:linenumber followed by 'string' - much like FLExit and FLAbort. This function will not be called in release code, but is useful for debugging.

3569. By Patrick Farrell on 2011-09-02

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

3568. By Christian Jacobs on 2011-08-31

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 on 2011-08-24

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 on 2011-08-23

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 on 2011-08-16

Update libspud to r452.

3564. By Jon Hill on 2011-08-15

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 on 2011-08-15

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 on 2011-08-15

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.

3561. By Patrick Farrell on 2011-08-15

This branch contains the features that let the embedded python interpreter in fluidity access the spud dictionary of fluidity's options.

Use it as follows:

import libspud
libspud.get_option("/simulation_name")

It only works for Python >= 2.7, so if you want your code to work on 2.6 or before, you need to guard with an

if sys.version_info[1] > 6

This branch also contains some minor fixes for compiling fluidity against; sometimes things were using the system one, and sometimes things were using the libspud/ directory.

This branch also updates libspud/ to be the latest spud trunk. Those changes have been reviewed earlier in other merge requests.

A lot of the work on this was done by Nan Mao.