Viewing all changes in revision 3866.
- Committer: Rhodri Davies
- Date: 2014-05-29 00:14:40 UTC
- mfrom: (3854.1.473 fluidity)
- Revision ID: rhodri.davies@imperial.ac.uk-20140529001440-0lx74o0djriitwbn
Merge in trunk.
- files added:
- assemble/Shallow_Water_Equations.F90
- examples/backward_facing_step_3d/Ercoftac-test31-BFS
- m4
- 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/Helmholtz-anisotropic-scalar-mms-p1p1cg-unstructured
- tests/Helmholtz-anisotropic-scalar-mms-p1p1cg-unstructured/src
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg-structured
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg-structured/src
- tests/Stokes_mms_cg_p2p1_periodic
- tests/Stokes_mms_cg_p2p1_periodic/src
- tests/detectors_parallel_init
- tests/detectors_parallel_init/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/friction-slope-swe
- tests/friction-slope-swe/src
- tests/genpvd_test
- tests/genpvd_test/src
- tests/inlet_velocity_bc_compressible
- tests/inlet_velocity_bc_compressible_without_gravity
- tests/inlet_velocity_bc_compressible_without_gravity/src
- tests/inlet_velocity_bc_incompressible
- tests/internal_boundary_adaptivity
- tests/internal_boundary_adaptivity/src
- tests/lagrangian_detectors_checkpoint
- tests/meshconv_test
- tests/meshconv_test/src
- tests/mms_les_second_order_p2p1
- tests/mms_les_second_order_p2p1/src
- tests/mms_p1dgp2_stressform_br_sp
- tests/mms_p1dgp2_stressform_br_sp/src
- tests/mphase_inlet_velocity_bc_compressible
- tests/mphase_strong_pressure_bc_compressible
- tests/mphase_subtract_out_reference_profile
- tests/periodic_adaptivity_at_first_timestep
- tests/periodic_adaptivity_at_first_timestep/src
- tests/prescribed_normal_flow_dg
- tests/prescribed_normal_flow_landslide
- tests/rename_checkpoint
- tests/rename_checkpoint/src
- tests/sigma_layer_sphere_parallel
- tests/sigma_layer_sphere_parallel/mesh
- tests/standing_wave-swe
- tests/standing_wave-swe/src
- tests/strong_pressure_bc_compressible
- tests/subtract_out_reference_profile
- tests/subtract_out_reference_profile/src
- tests/temporal_max_vector
- tests/temporal_max_vector/src
- tests/test_gmsh_intel
- tests/tidal_diagnostics
- tests/tidal_diagnostics/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_testcv
- tests/viscous_fs_simpletopbottom_explicit_testcv/src
- tests/viscous_fs_simpletopbottom_explicit_varrho
- tests/viscous_fs_simpletopbottom_explicit_varrho/src
- tests/viscous_fs_simpletopbottom_testcv
- tests/viscous_fs_simpletopbottom_testcv/src
- tests/viscous_fs_simpletopbottom_varrho
- tests/viscous_fs_simpletopbottom_varrho/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:
- examples/backward_facing_step_2d/backward_facing_step_2d.xml
- examples/backward_facing_step_3d/Ercoftac-test31-BFS
- libalgencan
- 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/Helmholtz-mms-p2p1cg-noadv
- tests/Helmholtz-mms-p2p1cg-noadv/src
- tests/fldecomp
- tests/fldecomp/src
- tests/fldecomp_1d
- tests/fldecomp_1d/src
- tests/fldecomp_2d
- tests/fldecomp_2d/src
- tests/water_collapse_2d_algencan
- files renamed:
- assemble/LES_viscosity.F90 => assemble/LES.F90
- tests/Helmholtz-anisotropic-scalar-mms-p1p1cg-noadv/ => tests/Helmholtz-anisotropic-scalar-mms-p1p1cg-structured/
- tests/Helmholtz-anisotropic-scalar-mms-p1p1cg-noadv/Helmholtz-anisotropic-scalar-mms-p1p1cg-noadv.xml => tests/Helmholtz-anisotropic-scalar-mms-p1p1cg-structured/Helmholtz-anisotropic-scalar-mms-p1p1cg-structured.xml
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg/ => tests/Helmholtz-anisotropic-vector-mms-p1p1cg-unstructured/
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg/Helmholtz-anisotropic-vector-mms-p1p1cg.xml => tests/Helmholtz-anisotropic-vector-mms-p1p1cg-unstructured/Helmholtz-anisotropic-vector-mms-p1p1cg-unstructured.xml
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg/src/MMS_A.geo => tests/Helmholtz-anisotropic-vector-mms-p1p1cg-unstructured/src/MMS_A_unstructured.geo
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg/src/MMS_B.geo => tests/Helmholtz-anisotropic-vector-mms-p1p1cg-unstructured/src/MMS_B_unstructured.geo
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg/src/MMS_C.geo => tests/Helmholtz-anisotropic-vector-mms-p1p1cg-unstructured/src/MMS_C_unstructured.geo
- tests/Helmholtz-anisotropic-vector-mms-p1p1cg/src/MMS_D.geo => tests/Helmholtz-anisotropic-vector-mms-p1p1cg-unstructured/src/MMS_D_unstructured.geo
- tests/Stokes_may_sinker_stepxy/Stokes-may-sinker-stepxy.flml => tests/Stokes_may_sinker_stepxy/Stokes-may-sinker-stepxy-gamg.flml
- tests/Stokes_may_solcx_stepx/Stokes-may-solcx-stepx.flml => tests/Stokes_may_solcx_stepx/Stokes-may-solcx-stepx-gamg.flml
- tests/Stokes_may_solky_exponential/Stokes-may-solky-exponential.flml => tests/Stokes_may_solky_exponential/Stokes-may-solky-exponential-gamg.flml
- tests/backward_facing_step_2d/ => tests/backward_facing_step_2d_test/
- files modified:
- Makefile.in
expand all
collapse all
added
removed
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
manual/fluidity_logo.svg
manual/fluidity_logo_full.svg
manual/misc_images/manual_title.png
manual/misc_images/manual_title.svg
