Viewing all changes in revision 3640.
- Committer: Adam Candy
- Date: 2012-07-31 12:45:55 UTC
- mfrom: (3564.21.277 fluidity)
- Revision ID: adam.candy@imperial.ac.uk-20120731124555-kdmekgqul3u5vjgl
Merge in of trunk.
- files added:
- assemble/Porous_Media.F90
- tests/3material-droplet-p1dgp2-test-cty-cv-rhop1dg
- tests/3material-droplet-p1dgp2-test-cty-cv-rhop1dg-3d
- tests/3material-droplet-p1dgp2-test-cty-cv-rhop1dg/3material-droplet-p1dgp2-test-cty-cv-rhop1dg.flml
- tests/bc_from_field
- tests/bc_from_field/src
- tests/buoyancy_adjustment_dg_two_element_generic_linear_eos
- tests/buoyancy_adjustment_dg_two_element_generic_linear_eos/src
- tests/column-parallel
- tests/column-parallel/src
- tests/cv_mass_matrix_check_p1/src
- tests/cv_mass_matrix_check_p2/src
- tests/darcy_p0p1_test_cty_cv_pressBCinlet_2phase_constant_volf_and_abs
- tests/darcy_p0p1_test_cty_cv_pressBCinlet_advect_tracer_p0_steptwochannel
- tests/darcy_p0p1_test_cty_cv_pressBCinlet_advect_tracer_p1cg
- tests/darcy_p0p1_test_cty_cv_pressBCinlet_advect_tracer_p1cv
- tests/darcy_p0p1_test_cty_cv_pressBCinlet_advect_tracer_p1cv_steptwochannel
- tests/darcy_p0p1_test_cty_cv_pressBCinlet_advect_tracer_p1cv_steptwochannel_adaptive
- tests/darcy_p0p1_test_cty_cv_pressBCinlet_advect_tracer_p1dg
- tests/heat_2d_dg_local_assembly
- tests/heat_2d_dg_local_assembly/src
- tests/mms_tracer_cv_fesweby_adv_steady
- tests/mms_tracer_cv_fesweby_adv_steady/src
- tests/mms_tracer_cv_feultimate_adv_steady
- tests/mms_tracer_cv_feultimate_adv_steady/src
- tests/radial_scale_tool
- tests/spherical_patch
- tests/spherical_patch/src
- tests/viscosity_2d_p0_parallel_local_assembly
- tests/viscosity_2d_p0_parallel_local_assembly/src
- files removed:
- assemble/Porous_Media.F90
- tests/3material-droplet-p1dgp2-test-cty-cv-rhop1dg
- tests/3material-droplet-p1dgp2-test-cty-cv-rhop1dg-3d
- tests/3material-droplet-p1dgp2-test-cty-cv-rhop1dg/3material-droplet-p1dgp2-test-cty-cv-rhop1dg.flml
- tests/porous_medium_p1p1_2d
- tests/porous_medium_p1p1_2d/src
- files modified:
- AUTHORS
expand all
collapse all
added
removed
manual/fluidity_logo.svg
manual/fluidity_logo_full.svg
