Viewing all changes in revision 4022.
- Committer: Jon Hill
- Date: 2013-02-16 09:01:40 UTC
- mfrom: (3981.7.159 fluidity)
- Revision ID: jon.hill@imperial.ac.uk-20130216090140-bplzxqzdk1eik4za
Megre from trunk, fixing several conflicts
- examples/stokes_square_convection
- examples/stokes_square_convection/mesh
- manual/examples_images/stokes_square_convection
- spatialindex-1.8.0
- spatialindex-1.8.0/include
- spatialindex-1.8.0/include/spatialindex
- spatialindex-1.8.0/include/spatialindex/capi
- spatialindex-1.8.0/include/spatialindex/tools
- spatialindex-1.8.0/spatialindex-vc
- spatialindex-1.8.0/src
- spatialindex-1.8.0/src/capi
- spatialindex-1.8.0/src/mvrtree
- spatialindex-1.8.0/src/rtree
- spatialindex-1.8.0/src/spatialindex
- spatialindex-1.8.0/src/storagemanager
- spatialindex-1.8.0/src/tools
- spatialindex-1.8.0/src/tprtree
- spatialindex-1.8.0/test
- spatialindex-1.8.0/test/mvrtree
- spatialindex-1.8.0/test/mvrtree/test1
- spatialindex-1.8.0/test/mvrtree/test2
- spatialindex-1.8.0/test/rtree
- spatialindex-1.8.0/test/rtree/test1
- spatialindex-1.8.0/test/rtree/test2
- spatialindex-1.8.0/test/rtree/test3
- spatialindex-1.8.0/test/rtree/test4
- spatialindex-1.8.0/test/tprtree
- spatialindex-1.8.0/test/tprtree/test1
- spatialindex-1.8.0/test/tprtree/test2
- 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/detectors_parallel_init
- tests/detectors_parallel_init/src
- tests/exodusii_read_support
- tests/exodusii_read_support/src
- tests/fldecomp
- tests/fldecomp/src
- tests/fldecomp_1d
- tests/fldecomp_1d/src
- tests/fldecomp_2d
- tests/fldecomp_2d/src
- tests/flredecomp
- tests/flredecomp/src
- tests/flredecomp_1d
- tests/flredecomp_1d/src
- tests/flredecomp_2d
- tests/flredecomp_2d/src
- tests/flredecomp_2d_fieldweighted
- tests/flredecomp_2d_fieldweighted/src
- tests/flux_bc
- tests/flux_bc/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/pressure_fs_topbottom
- tests/pressure_fs_topbottom/src
- tests/sigma_layer_sphere_parallel
- tests/sigma_layer_sphere_parallel/mesh
- tests/simple_vector_null_space
- tests/simple_vector_null_space/src
- tests/temporal_max_vector
- tests/temporal_max_vector/src
- tests/tidal_diagnostics
- tests/tidal_diagnostics/src
- tests/tracer_inflow_2d_dg_cg_quad
- tests/tracer_inflow_2d_dg_cg_quad/src
- tests/viscous_fs_simpletopbottom
- tests/viscous_fs_simpletopbottom/src
- tests/viscous_fs_simpletopbottom_explicit
- tests/viscous_fs_simpletopbottom_explicit/src
- tests/viscous_fs_simpletopbottom_explicit_varrho
- tests/viscous_fs_simpletopbottom_explicit_varrho/src
- tests/viscous_fs_simpletopbottom_varrho
- tests/viscous_fs_simpletopbottom_varrho/src
- tests/viscous_fs_top
- tests/viscous_fs_top/src
- tests/viscous_fs_top_explicit
- tests/viscous_fs_top_explicit/src
- tests/viscous_fs_zhong_spatial
- tests/viscous_fs_zhong_spatial/src
- tests/viscous_fs_zhong_spatial_explicit
- tests/viscous_fs_zhong_spatial_explicit/src
- tests/viscous_fs_zhong_spatial_explicit_varrho
- tests/viscous_fs_zhong_spatial_explicit_varrho/src
- tests/viscous_fs_zhong_spatial_varrho
- tests/viscous_fs_zhong_spatial_varrho/src
- files removed:
- bin
- libadaptivity/adapt3d/lib
- libadaptivity/lib
- libadaptivity/load_balance/lib
- libjudy/doc/man
- libjudy/doc/man/man3
- libspud/diamond/tests/write_xml
- spatialindex-1.5
- spatialindex-1.5/include
- spatialindex-1.5/include/capi
- spatialindex-1.5/include/tools
- spatialindex-1.5/regressiontest
- spatialindex-1.5/regressiontest/mvrtree
- spatialindex-1.5/regressiontest/mvrtree/test1
- spatialindex-1.5/regressiontest/mvrtree/test2
- spatialindex-1.5/regressiontest/rtree
- spatialindex-1.5/regressiontest/rtree/test1
- spatialindex-1.5/regressiontest/rtree/test2
- spatialindex-1.5/regressiontest/rtree/test3
- spatialindex-1.5/regressiontest/rtree/test4
- spatialindex-1.5/regressiontest/tprtree
- spatialindex-1.5/regressiontest/tprtree/test1
- spatialindex-1.5/regressiontest/tprtree/test2
- spatialindex-1.5/spatialindex-vc
- spatialindex-1.5/src
- spatialindex-1.5/src/capi
- spatialindex-1.5/src/mvrtree
- spatialindex-1.5/src/rtree
- spatialindex-1.5/src/spatialindex
- spatialindex-1.5/src/storagemanager
- spatialindex-1.5/src/tools
- spatialindex-1.5/src/tprtree
- tests/biology_6_component/src
- tests/biology_6_component_parallel/src
- tests/fldecomp
- tests/fldecomp/src
- tests/fldecomp_1d
- tests/fldecomp_1d/src
- tests/fldecomp_2d
- tests/fldecomp_2d/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/data/on_sphere_rotations/rotation.py => python/GFD_basisChange_tools.py
- tests/backward_facing_step_2d/backward_facing_step_2d.xml => tests/backward_facing_step_2d/backward_facing_step_2d_test.xml
- 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/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
femtools/doc/coordinate_transformations.png
manual/examples_images/stokes_square_convection/Nu_1e5.png
manual/examples_images/stokes_square_convection/RMS_1e5.png
manual/examples_images/stokes_square_convection/Temperature_planform.png
