Viewing all changes in revision 3965.
- Committer: Adam Candy
- Date: 2012-10-25 18:57:30 UTC
- mfrom: (3961.5.93 fluidity3)
- Revision ID: adam.candy@imperial.ac.uk-20121025185730-ud3lc4og74zchgu9
Merge in of *a* trunk...
- files added:
- build
- tests/bed_shear_from_grad_u_CG
- tests/bed_shear_from_grad_u_CG/src
- tests/bed_shear_from_grad_u_DG
- tests/bed_shear_from_grad_u_DG/src
- tests/flredecomp_2d_fieldweighted
- tests/flredecomp_2d_fieldweighted/src
- tests/flux_bc
- tests/flux_bc/src
- tests/gls-ocean-param
- tests/gls-ocean-param/src
- tests/mms_rans_p2p1_keps
- tests/mms_rans_p2p1_keps/alternative_flmls
- tests/mms_rans_p2p1_keps/src
- tests/mms_sediment
- tests/mms_sediment/src
- tests/mms_tracer_P1dg_cdg_diff_steady_3d_cjc_inhNmnnbc
- tests/mphase_dusty_gas_shock_tube
- tests/mphase_inlet_velocity_bc_incompressible
- tests/mphase_mms_p2p1_stress_form
- tests/mphase_mms_p2p1_stress_form/src
- tests/mphase_rogue_shock_tube_dense_bed_glass
- tests/mphase_rogue_shock_tube_dense_bed_glass/src
- tests/mphase_rogue_shock_tube_dense_bed_nylon
- tests/mphase_rogue_shock_tube_dense_bed_nylon/src
- tests/mphase_wen_yu_drag_correlation
- tests/mphase_wen_yu_drag_correlation/src
- tests/tracer_inflow_2d_dg_cg_quad
- tests/tracer_inflow_2d_dg_cg_quad/src
- files removed:
- assemble/Vertical_Extrapolation.F90
- bin
- libadaptivity/adapt3d/lib
- libadaptivity/lib
- libadaptivity/load_balance/lib
- libjudy/doc/man
- libjudy/doc/man/man3
- libspud/diamond/tests/write_xml
- tests/biology_6_component/src
- tests/biology_6_component_parallel/src
- tests/k-epsilon_mms_cg_p1p1
- tests/k-epsilon_mms_cg_p1p1/src
- tests/lagrangian_detectors/src
- tests/periodic_adaptivity_3d/src
- tests/sediment_critical_shear
- tests/sediment_deposition
- tests/sediment_reentrainment_one_sediment
- files renamed:
- tests/burgers_mms_diffusion_replay/mms_A.bml => tests/burgers_mms_diffusion_replay/mms_template.bml
- tests/burgers_mms_diffusion_time_integral/mms_A.bml => tests/burgers_mms_diffusion_time_integral/mms_template.bml
- tests/burgers_mms_replay/mms_A.bml => tests/burgers_mms_replay/mms_template.bml
- tests/burgers_mms_steady_adjoint_gradient_init/mms_A.bml => tests/burgers_mms_steady_adjoint_gradient_init/mms_template.bml
- tests/burgers_mms_steady_adjoint_gradient_init/op_A.oml => tests/burgers_mms_steady_adjoint_gradient_init/op_template.oml
- tests/burgers_mms_steady_adjoint_gradient_src/mms_A.bml => tests/burgers_mms_steady_adjoint_gradient_src/mms_template.bml
- tests/burgers_mms_steady_adjoint_gradient_src/op_A.oml => tests/burgers_mms_steady_adjoint_gradient_src/op_template.oml
- tests/column-parallel/fluidity.err-1 => tests/column-parallel/fluidity.err-1.THIS
- tests/column-parallel/fluidity.log-1 => tests/column-parallel/fluidity.log-1.THIS
- tests/shallow_water_adjoint_default_controls_2d/adjoint_A.swml => tests/shallow_water_adjoint_default_controls_2d/adjoint_template.swml
- tests/shallow_water_adjoint_func_eval/adjoint_A.swml => tests/shallow_water_adjoint_func_eval/adjoint_template.swml
- tests/shallow_water_adjoint_func_eval_2d/adjoint_A.swml => tests/shallow_water_adjoint_func_eval_2d/adjoint_template.swml
- tests/shallow_water_optimisation/adjoint_A.swml => tests/shallow_water_optimisation/adjoint_template.swml
- tests/shallow_water_optimisation/optimiser_A.oml => tests/shallow_water_optimisation/optimiser_template.oml
- files modified:
- Makefile.in
expand all
collapse all
added
removed
