Viewing all changes in revision 3559.2.4.
- Committer: Jon Hill
- Date: 2011-11-24 14:46:24 UTC
- mfrom: (3853 fluidity)
- mto: (4003.1.19 fluidity)
- mto: This revision was merged to the branch mainline in revision 4028.
- Revision ID: jon.hill@imperial.ac.uk-20111124144624-69ev9kyuludpg5fe
Merge from trunk. All bio stuff should be in trunk anyway, so this is now a copy of trunk. More devel to come though
- files added:
- debian/fluidity.dirs
- examples/backward_facing_step_2d/Ilinca-data
- examples/backward_facing_step_3d/Ercoftac-test31-BFS
- examples/backward_facing_step_3d/Le-profiles
- manual/adaptivity_images
- manual/embedded_models_images
- tests/Helmholtz-anisotropic-scalar-mms-p1p1cg-noadv
- tests/Helmholtz-anisotropic-scalar-mms-p1p1cg-noadv/src
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg/src
- tests/Helmholtz-mms-p2p1cg-noadv
- tests/Helmholtz-mms-p2p1cg-noadv/src
- tests/detectors_mesh_movement
- tests/detectors_mesh_movement/src
- tests/detectors_mesh_movement_parallel
- tests/detectors_mesh_movement_parallel/src
- tools/data
- files removed:
- debian/README.Debian
- libjudy/autom4te.cache
- spatialindex-1.5/autom4te.cache
- files renamed:
- manual/examples_images/tephra_settling/tephra_influx_1.png => manual/examples_images/tephra_settling/tephra_fine_1.png
- manual/examples_images/tephra_settling/tephra_influx_2.png => manual/examples_images/tephra_settling/tephra_fine_2.png
- manual/examples_images/tephra_settling/tephra_influx_3.png => manual/examples_images/tephra_settling/tephra_fine_3.png
- manual/examples_images/tephra_settling/tephra_influx_4.png => manual/examples_images/tephra_settling/tephra_fine_4.png
- manual/examples_images/tephra_settling/tephra_influx_5.png => manual/examples_images/tephra_settling/tephra_fine_5.png
- python/regressiontest.py => python/fluidity/regressiontest.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
examples/backward_facing_step_3d/Le-profiles/Le-profile1-uplus-x19.png
examples/backward_facing_step_3d/Le-profiles/Le-profiles.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0001.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0002.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0003.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0004.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0005.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0006.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0007.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0008.png
manual/examples_images/restratification_after_oodc/5000/rousset-res5000-depth-40m0009.png
manual/examples_images/restratification_after_oodc/mixing_stats.png
manual/examples_images/tephra_settling/tephra_coarse_1.png
manual/examples_images/tephra_settling/tephra_coarse_2.png
manual/examples_images/tephra_settling/tephra_coarse_3.png
manual/examples_images/tephra_settling/tephra_coarse_4.png
manual/examples_images/tephra_settling/tephra_coarse_5.png
manual/misc_images/NACA0025_mesh_with_partitions.svg
