Viewing all changes in revision 3889.
- Committer: Jon Hill
- Date: 2012-02-28 21:36:27 UTC
- mfrom: (3880.1.59 fluidity)
- Revision ID: jon.hill@imperial.ac.uk-20120228213627-75tqkd0za9nlcjrt
Merge from 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/cv_mass_matrix_check_p1
- tests/cv_mass_matrix_check_p2
- 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/darcy_p1dgp2_test_cty_cv_pressBCinlet
- tests/gyre_2d_p1dgp2
- tests/gyre_2d_p1dgp2/src
- tests/mmat-balancepressure-p1dgp2-test-cty-cv-rhop1dg
- tests/mmat-balancepressure-p1dgp2-test-cty-cv-rhop1dg-3d
- tests/mms_tracer_cv_3d_adv_excludemass
- tests/mms_tracer_cv_3d_adv_excludemass/src
- tests/mms_tracer_p2cv_3d_adv_excludemass
- tests/mms_tracer_p2cv_3d_adv_excludemass/src
- tests/mms_tracer_p2cv_adv_excludemass
- tests/mms_tracer_p2cv_adv_excludemass/src
- tests/netcdf_read_errors
- tests/netcdf_read_free_surface
- tests/pydiag_material_phase_support_multiple_velocity_children
- tests/test_source_absorption
- tests/test_source_absorption/src
- files removed:
- assemble/Porous_Media.F90
- tests/porous_medium_p1p1_2d
- tests/porous_medium_p1p1_2d/src
- files renamed:
- libadaptivity/adapt3d/include/fdebug.h => libadaptivity/adapt3d/include/fdebug_adapt.h
- tests/saltfinger2d_quad/ => tests/saltfinger2d_tri/
- tests/saltfinger2d_quad/saltfinger2d_quad.flml => tests/saltfinger2d_tri/saltfinger2d_tri.flml
- tests/saltfinger2d_quad/saltfinger2d_quad.xml => tests/saltfinger2d_tri/saltfinger2d_tri.xml
- files modified:
- Makefile.in
expand all
collapse all
added
removed
