Merge lp:~fluidity-core/fluidity/remove-unused-tests-for-4.1.1 into lp:fluidity

Proposed by Tim Bond
Status: Merged
Merged at revision: 3869
Proposed branch: lp:~fluidity-core/fluidity/remove-unused-tests-for-4.1.1
Merge into: lp:fluidity
Diff against target: 423396 lines (+0/-421175)
412 files modified
tests/2d_periodic_p1p1_streamfunction/2d_nonperiodic_p1p1_streamfunction.flml (+0/-159)
tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.flml (+0/-204)
tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.xml (+0/-106)
tests/2d_periodic_p1p1_streamfunction/Makefile (+0/-21)
tests/2d_periodic_p1p1_streamfunction/src/2d_square.geo (+0/-20)
tests/IGW/IGW.xml (+0/-26)
tests/IGW/Makefile (+0/-8)
tests/IGW/basin.dat (+0/-3)
tests/IGW/basin.geo (+0/-9)
tests/IGW/basin_h.py (+0/-8)
tests/IGW/basin_u.py (+0/-9)
tests/IGW/channel.1_u.py (+0/-6)
tests/IGW/channel1.dat (+0/-1)
tests/IGW/channel1_h.py (+0/-3)
tests/IGW/channel1_u.py (+0/-6)
tests/IGW/gauss_h.py (+0/-11)
tests/IGW/kelvin.dat (+0/-5)
tests/IGW/kelvin.geo (+0/-12)
tests/IGW/kelvin_h.py (+0/-5)
tests/IGW/kelvin_mod.geo (+0/-23)
tests/IGW/kelvin_u.py (+0/-7)
tests/IGW/rand_h.py (+0/-11)
tests/IGW/sin_h.py (+0/-3)
tests/IGW/square.geo (+0/-12)
tests/IGW/square1.dat (+0/-4)
tests/IGW/square1_h.py (+0/-6)
tests/IGW/square1_u.py (+0/-9)
tests/IGW/square_rnd_h.py (+0/-6)
tests/IGW/square_sin.dat (+0/-3)
tests/IGW/square_weak.dat (+0/-4)
tests/IGW/squarep1p1.dat (+0/-3)
tests/Stokes_mms_p0p1cv/MMS_A.flml (+0/-478)
tests/Stokes_mms_p0p1cv/MMS_B.flml (+0/-478)
tests/Stokes_mms_p0p1cv/MMS_C.flml (+0/-478)
tests/Stokes_mms_p0p1cv/MMS_D.flml (+0/-478)
tests/Stokes_mms_p0p1cv/Makefile (+0/-8)
tests/Stokes_mms_p0p1cv/Stokes_mms_p0p1cv.xml (+0/-301)
tests/Stokes_mms_p0p1cv/src/MMS_A.geo (+0/-15)
tests/Stokes_mms_p0p1cv/src/MMS_A.msh (+0/-373)
tests/Stokes_mms_p0p1cv/src/MMS_B.geo (+0/-15)
tests/Stokes_mms_p0p1cv/src/MMS_B.msh (+0/-1291)
tests/Stokes_mms_p0p1cv/src/MMS_C.geo (+0/-15)
tests/Stokes_mms_p0p1cv/src/MMS_C.msh (+0/-4828)
tests/Stokes_mms_p0p1cv/src/MMS_D.geo (+0/-15)
tests/Stokes_mms_p0p1cv/src/MMS_D.msh (+0/-18535)
tests/Stokes_square_convection_1e4_p2p1_adaptive_parallel/Makefile (+0/-39)
tests/Stokes_square_convection_1e4_p2p1_adaptive_parallel/Stokes-square-convection-1e4-p2p1-adaptive-parallel.flml (+0/-609)
tests/Stokes_square_convection_1e4_p2p1_adaptive_parallel/Stokes_square_convection_1e4_p2p1_adaptive_parallel.xml (+0/-55)
tests/Stokes_square_convection_1e4_p2p1_adaptive_parallel/src/square-structured-linear.edge (+0/-84)
tests/Stokes_square_convection_1e4_p2p1_adaptive_parallel/src/square-structured-linear.ele (+0/-804)
tests/Stokes_square_convection_1e4_p2p1_adaptive_parallel/src/square-structured-linear.node (+0/-445)
tests/avlesen/avlesen-diagnostic.flml (+0/-418)
tests/avlesen/avlesen-prognostic.flml (+0/-468)
tests/avlesen/cube.geo (+0/-26)
tests/backward_facing_step_3d/Makefile (+0/-7)
tests/backward_facing_step_3d/backward_facing_step_3d.flml (+0/-369)
tests/backward_facing_step_3d/backward_facing_step_3d.mv (+0/-99)
tests/backward_facing_step_3d/backward_facing_step_3d.xml (+0/-40)
tests/backward_facing_step_3d/src/unstructured.geo (+0/-59)
tests/backward_facing_step_3d_zoltan_sam_small/Makefile (+0/-7)
tests/backward_facing_step_3d_zoltan_sam_small/backward_facing_step_3d.flml (+0/-410)
tests/backward_facing_step_3d_zoltan_sam_small/backward_facing_step_3d_zoltan_sam_small.xml (+0/-53)
tests/backward_facing_step_3d_zoltan_sam_small/sam_result/backward_facing_step_3d_sam.stat (+0/-67)
tests/backward_facing_step_3d_zoltan_sam_small/src/unstructured.geo (+0/-59)
tests/barotropic_double_gyre/Makefile (+0/-15)
tests/barotropic_double_gyre/barotropic_double_gyre.flml (+0/-495)
tests/barotropic_double_gyre/barotropic_double_gyre.xml (+0/-14)
tests/barotropic_double_gyre/src/gyre.geo (+0/-12)
tests/bdfm1_kelvin_wave/Makefile (+0/-8)
tests/bdfm1_kelvin_wave/bdfm1_kelvin_wave.swml (+0/-360)
tests/bdfm1_kelvin_wave/src/basin.geo (+0/-9)
tests/biology-nophysics/Makefile (+0/-5)
tests/biology-nophysics/biology-nophysics.xml (+0/-38)
tests/biology-nophysics/src/test1.geo (+0/-26)
tests/biology-nophysics/src/test1.msh (+0/-9017)
tests/biology-nophysics/test1.flml (+0/-706)
tests/biology-nophysics_checkpoint/Makefile (+0/-11)
tests/biology-nophysics_checkpoint/Reference.stat (+0/-5160)
tests/biology-nophysics_checkpoint/biology-nophysics_checkpoint.xml (+0/-63)
tests/biology-nophysics_checkpoint/src/test1.geo (+0/-26)
tests/biology-nophysics_checkpoint/src/test1.msh (+0/-9017)
tests/biology-nophysics_checkpoint/test1.flml (+0/-714)
tests/biology-nophysics_checkpoint/test1_180_checkpoint.flml (+0/-714)
tests/biology-nophysics_checkpoint/test1_CoordinateMesh_180_checkpoint.ele (+0/-661)
tests/biology-nophysics_checkpoint/test1_CoordinateMesh_180_checkpoint.face (+0/-553)
tests/biology-nophysics_checkpoint/test1_CoordinateMesh_180_checkpoint.node (+0/-317)
tests/biology-nophysics_checkpoint/test1_VelocityMesh_180_checkpoint.vtu (+0/-26)
tests/channel-flow-p0p1/Makefile (+0/-11)
tests/channel-flow-p0p1/channel-flow-p0p1.xml (+0/-29)
tests/channel-flow-p0p1/channel.flml (+0/-385)
tests/channel-flow-p0p1/channel.py (+0/-135)
tests/channel-flow-p0p1/channel_viscous.flml (+0/-384)
tests/channel-flow-p0p1/channel_viscous.py (+0/-218)
tests/channel-flow-p0p1/error_results (+0/-66)
tests/channel-flow-p0p1/generate_mesh (+0/-24)
tests/diffusion_2d_p0_adaptive_serial/Makefile (+0/-5)
tests/diffusion_2d_p0_adaptive_serial/diffusion_2d_p0_adaptive_serial.xml (+0/-61)
tests/diffusion_2d_p0_adaptive_serial/heat.flml (+0/-273)
tests/diffusion_2d_p0_adaptive_serial/src/square.geo (+0/-16)
tests/diffusion_2d_p0_adaptive_serial/src/square.msh (+0/-667)
tests/div_conforming_projection/Makefile (+0/-8)
tests/div_conforming_projection/div_conforming_projection.swml (+0/-450)
tests/div_conforming_projection/div_conforming_projection_bdfm.swml (+0/-450)
tests/div_conforming_projection/src/basin1.geo (+0/-13)
tests/driven_cavity_2d_dg/Makefile (+0/-5)
tests/driven_cavity_2d_dg/driven_cavity.flml (+0/-320)
tests/driven_cavity_2d_dg/driven_cavity_2d_dg.xml (+0/-25)
tests/driven_cavity_2d_dg/src/square.geo (+0/-16)
tests/driven_cavity_2d_dg/src/square.msh (+0/-1399)
tests/gls-StationPapa-biology/Makefile (+0/-6)
tests/gls-StationPapa-biology/forcing.dat (+0/-143)
tests/gls-StationPapa-biology/gls-StationPapa-3D.flml (+0/-1528)
tests/gls-StationPapa-biology/gls-StationPapa-biology.xml (+0/-52)
tests/gls-StationPapa-biology/levitus_S.dat (+0/-12)
tests/gls-StationPapa-biology/levitus_T.dat (+0/-12)
tests/gls-StationPapa-biology/levitus_dep.dat (+0/-1)
tests/gls-StationPapa-biology/src/gls-StationPapa-3D.geo (+0/-26)
tests/gravity-col-p0p1-weak-adaptive-parallel/Makefile (+0/-8)
tests/gravity-col-p0p1-weak-adaptive-parallel/column_under_gravity.flml (+0/-339)
tests/gravity-col-p0p1-weak-adaptive-parallel/gravity-col-p0p1-weak-adaptive-parallel.xml (+0/-79)
tests/gravity-col-p0p1-weak-adaptive-parallel/src/column.geo (+0/-15)
tests/gravity-col-p0p1-weak-adaptive-serial/Makefile (+0/-7)
tests/gravity-col-p0p1-weak-adaptive-serial/column_under_gravity.flml (+0/-288)
tests/gravity-col-p0p1-weak-adaptive-serial/gravity-col-p0p1-weak-adaptive-serial.xml (+0/-79)
tests/gravity-col-p0p1-weak-adaptive-serial/src/column.geo (+0/-15)
tests/gyre_baroclinic/Finer_unit_gyre.geo (+0/-15)
tests/gyre_baroclinic/baroclinic_IP.flml (+0/-594)
tests/gyre_baroclinic/gyre.geo (+0/-15)
tests/gyre_layered/Makefile (+0/-10)
tests/gyre_layered/gyre.flml (+0/-386)
tests/gyre_layered/gyre_layered.xml (+0/-27)
tests/gyre_layered/src/gyre.geo (+0/-15)
tests/hh_rt0_square/src/square.geo (+0/-14)
tests/hybridized_balance/Makefile (+0/-8)
tests/hybridized_balance/hybridized_balance_bdfm.swml (+0/-411)
tests/hybridized_balance/hybridized_balance_bdm.swml (+0/-411)
tests/hybridized_balance/src/basin1.geo (+0/-13)
tests/just-coarsen-parallel/Makefile (+0/-8)
tests/just-coarsen-parallel/just-coarsen-parallel.flml (+0/-149)
tests/just-coarsen-parallel/just-coarsen-parallel.geo (+0/-46)
tests/just-coarsen-parallel/just-coarsen-parallel.xml (+0/-37)
tests/kelvin_wave/Makefile (+0/-14)
tests/kelvin_wave/channel.flml (+0/-350)
tests/kelvin_wave/src/channel.geo (+0/-16)
tests/lock_exchange_2d_cg_parallel/Makefile (+0/-7)
tests/lock_exchange_2d_cg_parallel/lock_exchange_2d_cg.flml (+0/-480)
tests/lock_exchange_2d_cg_parallel/lock_exchange_2d_cg_parallel.xml (+0/-128)
tests/lock_exchange_2d_cg_parallel/src/channel_2d.geo (+0/-15)
tests/lock_exchange_2d_dg/Makefile (+0/-5)
tests/lock_exchange_2d_dg/lock_exchange.flml (+0/-409)
tests/lock_exchange_2d_dg/lock_exchange_2d_dg.xml (+0/-25)
tests/lock_exchange_2d_dg/src/channel.geo (+0/-25)
tests/lock_exchange_2d_dg/src/channel.msh (+0/-2992)
tests/lock_exchange_2d_dg_p0_p1_adaptive_parallel/Makefile (+0/-7)
tests/lock_exchange_2d_dg_p0_p1_adaptive_parallel/lock_exchange_2d_dg.flml (+0/-662)
tests/lock_exchange_2d_dg_p0_p1_adaptive_parallel/lock_exchange_2d_dg_p0_p1_adaptive_parallel.xml (+0/-14)
tests/lock_exchange_2d_dg_p0_p1_adaptive_parallel/src/channel_2d.geo (+0/-15)
tests/lock_exchange_2d_dg_p1dg_p2_adaptive_parallel/Makefile (+0/-7)
tests/lock_exchange_2d_dg_p1dg_p2_adaptive_parallel/lock_exchange_2d_dg.flml (+0/-612)
tests/lock_exchange_2d_dg_p1dg_p2_adaptive_parallel/lock_exchange_2d_dg_p1dg_p2_adaptive_parallel.xml (+0/-14)
tests/lock_exchange_2d_dg_p1dg_p2_adaptive_parallel/src/channel_2d.geo (+0/-15)
tests/lock_exchange_2d_dg_quad/Makefile (+0/-5)
tests/lock_exchange_2d_dg_quad/lock_exchange.flml (+0/-406)
tests/lock_exchange_2d_dg_quad/lock_exchange_2d_dg_quad.xml (+0/-25)
tests/lock_exchange_2d_dg_quad/src/channel.geo (+0/-24)
tests/lock_exchange_2d_dg_quad/src/channel.msh (+0/-1717)
tests/mmat-gravity-col-p0p1-weak-adaptive-parallel/Makefile (+0/-8)
tests/mmat-gravity-col-p0p1-weak-adaptive-parallel/column_under_gravity.flml (+0/-472)
tests/mmat-gravity-col-p0p1-weak-adaptive-parallel/mmat-gravity-col-p0p1-weak-adaptive-parallel.xml (+0/-124)
tests/mmat-gravity-col-p0p1-weak-adaptive-parallel/src/column.geo (+0/-16)
tests/mmat-gravity-col-p0p1-weak-adaptive-serial/Makefile (+0/-7)
tests/mmat-gravity-col-p0p1-weak-adaptive-serial/column_under_gravity.flml (+0/-421)
tests/mmat-gravity-col-p0p1-weak-adaptive-serial/mmat-gravity-col-p0p1-weak-adaptive-serial.xml (+0/-124)
tests/mmat-gravity-col-p0p1-weak-adaptive-serial/src/column.geo (+0/-16)
tests/mmat-gravity-col-p1bp1cv-2d/2material_column_under_gravity.flml (+0/-263)
tests/mmat-gravity-col-p1bp1cv-2d/Makefile (+0/-6)
tests/mmat-gravity-col-p1bp1cv-2d/mmat-gravity-col-p1bp1cv-2d.xml (+0/-45)
tests/mmat-gravity-col-p1bp1cv-2d/src/mmat-gravity-col.geo (+0/-15)
tests/mmat-meniscus/Makefile (+0/-7)
tests/mmat-meniscus/mmat-meniscus.flml (+0/-398)
tests/mmat-meniscus/mmat-meniscus.xml (+0/-16)
tests/mmat-square-blob/Makefile (+0/-7)
tests/mmat-square-blob/mmat-square-blob.flml (+0/-437)
tests/mmat-square-blob/mmat-square-blob.xml (+0/-16)
tests/mmat-square-blob/src/2d_square.geo (+0/-12)
tests/mms_tracer_fv_diff_excludemass_excludeadv/MMS_A.flml (+0/-353)
tests/mms_tracer_fv_diff_excludemass_excludeadv/MMS_B.flml (+0/-353)
tests/mms_tracer_fv_diff_excludemass_excludeadv/MMS_C.flml (+0/-353)
tests/mms_tracer_fv_diff_excludemass_excludeadv/MMS_D.flml (+0/-353)
tests/mms_tracer_fv_diff_excludemass_excludeadv/MMS_E.flml (+0/-353)
tests/mms_tracer_fv_diff_excludemass_excludeadv/Makefile (+0/-9)
tests/mms_tracer_fv_diff_excludemass_excludeadv/mms_tracer_fv_diff_excludemass_excludeadv.xml (+0/-173)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_A.geo (+0/-20)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_A.msh (+0/-145)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_B.geo (+0/-20)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_B.msh (+0/-469)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_C.geo (+0/-20)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_C.msh (+0/-1675)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_D.geo (+0/-20)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_D.msh (+0/-6184)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_E.geo (+0/-20)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_E.msh (+0/-27448)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_F.geo (+0/-20)
tests/mms_tracer_fv_diff_excludemass_excludeadv/src/MMS_F.msh (+0/-111910)
tests/moving_internal_wave_cg/Makefile (+0/-6)
tests/moving_internal_wave_cg/moving_internal_wave_cg.flml (+0/-554)
tests/moving_internal_wave_cg/moving_internal_wave_cg.xml (+0/-24)
tests/moving_internal_wave_cg/src/box.geo (+0/-18)
tests/moving_lock_exchange_2d_dg/Makefile (+0/-6)
tests/moving_lock_exchange_2d_dg/moving_lock_exchange_2d_dg.flml (+0/-493)
tests/moving_lock_exchange_2d_dg/moving_lock_exchange_2d_dg.xml (+0/-24)
tests/moving_lock_exchange_2d_dg/src/channel.geo (+0/-25)
tests/moving_lock_exchange_2d_dg/src/channel.msh (+0/-2968)
tests/mphase_test1_2d/Makefile (+0/-22)
tests/mphase_test1_2d/src/test.geo (+0/-38)
tests/mphase_test1_2d/test_anisotropic_p1p1.flml (+0/-429)
tests/mphase_test1_2d/test_p1dgp2.flml (+0/-374)
tests/mphase_test1_2d/test_p1p1.flml (+0/-429)
tests/parallel_adaptivity/Makefile (+0/-32)
tests/parallel_adaptivity/parallel_adaptivity.flml (+0/-303)
tests/parallel_p1_consistent_interpolation_2p1d/Makefile (+0/-16)
tests/parallel_p1_consistent_interpolation_2p1d/parallel_p1_consistent_interpolation.flml (+0/-137)
tests/parallel_p1_consistent_interpolation_3d/Makefile (+0/-18)
tests/parallel_p1_consistent_interpolation_3d/parallel_p1_consistent_interpolation.flml (+0/-112)
tests/parallel_p1_consistent_interpolation_3d/src/cube-unstructured.geo (+0/-17)
tests/parallel_p2_consistent_interpolation_2p1d/Makefile (+0/-16)
tests/parallel_p2_consistent_interpolation_2p1d/parallel_p2_consistent_interpolation.flml (+0/-142)
tests/parallel_p2_consistent_interpolation_3d/Makefile (+0/-18)
tests/parallel_p2_consistent_interpolation_3d/parallel_p2_consistent_interpolation.flml (+0/-117)
tests/parallel_p2_consistent_interpolation_3d/src/cube-unstructured.geo (+0/-17)
tests/parallel_periodic_adaptivity/Makefile (+0/-22)
tests/parallel_periodic_adaptivity/parallel_periodic_adaptivity.xml (+0/-27)
tests/parallel_periodic_adaptivity/periodic_adaptivity.flml (+0/-255)
tests/parallel_periodic_adaptivity/src/MMS_C.msh (+0/-1330)
tests/parallel_region_ids_2p1d/Makefile (+0/-19)
tests/parallel_region_ids_2p1d/parallel_region_ids.flml (+0/-209)
tests/parallel_region_ids_2p1d/src/square-unstructured.geo (+0/-54)
tests/parallel_region_ids_3d/Makefile (+0/-18)
tests/parallel_region_ids_3d/parallel_region_ids.flml (+0/-184)
tests/parallel_region_ids_3d/src/cube-unstructured.geo (+0/-159)
tests/periodic_2plus1_adaptivity_parallel/Makefile (+0/-8)
tests/periodic_2plus1_adaptivity_parallel/periodic_2plus1_adaptivity.flml (+0/-282)
tests/periodic_2plus1_adaptivity_parallel/periodic_2plus1_adaptivity_parallel.xml (+0/-27)
tests/periodic_2plus1_adaptivity_parallel/src/MMS_B.geo (+0/-12)
tests/periodic_advection_1d_cg/Makefile (+0/-5)
tests/periodic_advection_1d_cg/periodic_advection_1d_cg.xml (+0/-34)
tests/periodic_advection_1d_cg/region_ids.py (+0/-7)
tests/periodic_advection_1d_cg/tracer.flml (+0/-214)
tests/periodic_channel_convergence/MMS_A.flml (+0/-388)
tests/periodic_channel_convergence/MMS_B.flml (+0/-388)
tests/periodic_channel_convergence/MMS_C.flml (+0/-388)
tests/periodic_channel_convergence/MMS_D.flml (+0/-388)
tests/periodic_channel_convergence/MMS_E.flml (+0/-388)
tests/periodic_channel_convergence/Makefile (+0/-9)
tests/periodic_channel_convergence/periodic_channel_convergence.xml (+0/-374)
tests/periodic_channel_convergence/src/MMS_A.geo (+0/-11)
tests/periodic_channel_convergence/src/MMS_A.msh (+0/-115)
tests/periodic_channel_convergence/src/MMS_B.geo (+0/-11)
tests/periodic_channel_convergence/src/MMS_B.msh (+0/-370)
tests/periodic_channel_convergence/src/MMS_C.geo (+0/-11)
tests/periodic_channel_convergence/src/MMS_C.msh (+0/-1330)
tests/periodic_channel_convergence/src/MMS_D.geo (+0/-11)
tests/periodic_channel_convergence/src/MMS_D.msh (+0/-5050)
tests/periodic_channel_convergence/src/MMS_E.geo (+0/-11)
tests/periodic_channel_convergence/src/MMS_E.msh (+0/-19690)
tests/preditor_prey_0d/Makefile (+0/-5)
tests/preditor_prey_0d/predator_prey.flml (+0/-437)
tests/preditor_prey_0d/predator_prey_0d.xml (+0/-25)
tests/preditor_prey_0d/src/column.geo (+0/-36)
tests/preditor_prey_0d/src/column.msh (+0/-1859)
tests/prescribed_diffusivity/Makefile (+0/-5)
tests/prescribed_diffusivity/prescribed_diffusivity.flml (+0/-142)
tests/prescribed_diffusivity/prescribed_diffusivity.xml (+0/-17)
tests/prescribed_diffusivity/src/column.geo (+0/-36)
tests/prescribed_diffusivity/src/column.msh (+0/-1859)
tests/prescribed_diffusivity/src/cube.geo (+0/-10)
tests/prescribed_diffusivity/src/cube.msh (+0/-55)
tests/raleigh-bernard_2d_dg/Makefile (+0/-5)
tests/raleigh-bernard_2d_dg/src/box.geo (+0/-9)
tests/raleigh-bernard_2d_dg/src/box.msh (+0/-27937)
tests/region_id_parallel/Makefile (+0/-7)
tests/region_id_parallel/region_id_input.flml (+0/-378)
tests/region_id_parallel/region_id_parallel.xml (+0/-251)
tests/region_id_parallel/src/region_id.geo (+0/-44)
tests/rossby_equatorial_soliton_dg/Makefile (+0/-5)
tests/rossby_equatorial_soliton_dg/rossby_equatorial_soliton_dg.flml (+0/-373)
tests/rossby_equatorial_soliton_dg/rossby_equatorial_soliton_dg.xml (+0/-15)
tests/rossby_equatorial_soliton_dg/src/domain-unstruct.geo (+0/-23)
tests/rossby_equatorial_soliton_dg/src/domain-unstruct.msh (+0/-42035)
tests/shallow_water_optimisation_2d/Makefile (+0/-21)
tests/shallow_water_optimisation_2d/adjoint_A.swml (+0/-349)
tests/shallow_water_optimisation_2d/adjoint_B.swml (+0/-398)
tests/shallow_water_optimisation_2d/adjoint_C.swml (+0/-398)
tests/shallow_water_optimisation_2d/adjoint_D.swml (+0/-398)
tests/shallow_water_optimisation_2d/adjoint_E.swml (+0/-398)
tests/shallow_water_optimisation_2d/constants_2d.py (+0/-27)
tests/shallow_water_optimisation_2d/optimiser_A.log (+0/-15)
tests/shallow_water_optimisation_2d/optimiser_A.oml (+0/-20)
tests/shallow_water_optimisation_2d/optimiser_B.oml (+0/-20)
tests/shallow_water_optimisation_2d/optimiser_C.oml (+0/-20)
tests/shallow_water_optimisation_2d/optimiser_D.oml (+0/-20)
tests/shallow_water_optimisation_2d/optimiser_E.oml (+0/-20)
tests/shallow_water_optimisation_2d/shallow_water_optimisation_2d.xml (+0/-62)
tests/shallow_water_optimisation_2d/source_terms.py (+0/-25)
tests/shallow_water_optimisation_2d/source_terms.sage (+0/-22)
tests/shallow_water_optimisation_2d/src/Makefile (+0/-3)
tests/shallow_water_optimisation_2d/src/mesh_A.bound (+0/-4)
tests/shallow_water_optimisation_2d/src/mesh_A.edge (+0/-38)
tests/shallow_water_optimisation_2d/src/mesh_A.ele (+0/-198)
tests/shallow_water_optimisation_2d/src/mesh_A.geo (+0/-15)
tests/shallow_water_optimisation_2d/src/mesh_A.msh (+0/-358)
tests/shallow_water_optimisation_2d/src/mesh_A.node (+0/-119)
tests/shallow_water_optimisation_bounds/Makefile (+0/-19)
tests/shallow_water_optimisation_bounds/adjoint_A.swml (+0/-378)
tests/shallow_water_optimisation_bounds/adjoint_B.swml (+0/-422)
tests/shallow_water_optimisation_bounds/adjoint_C.swml (+0/-422)
tests/shallow_water_optimisation_bounds/adjoint_D.swml (+0/-422)
tests/shallow_water_optimisation_bounds/optimiser_A.oml (+0/-20)
tests/shallow_water_optimisation_bounds/optimiser_B.oml (+0/-20)
tests/shallow_water_optimisation_bounds/optimiser_C.oml (+0/-20)
tests/shallow_water_optimisation_bounds/optimiser_D.oml (+0/-20)
tests/shallow_water_optimisation_bounds/shallow_water_optimisation_bounds.py (+0/-19)
tests/shallow_water_optimisation_bounds/shallow_water_optimisation_bounds.xml (+0/-63)
tests/shallow_water_optimisation_bounds/source_terms.py (+0/-28)
tests/shallow_water_optimisation_bounds/source_terms.sage (+0/-25)
tests/shallow_water_optimisation_bounds/src/Makefile (+0/-5)
tests/shallow_water_optimisation_sphere/Makefile (+0/-16)
tests/shallow_water_optimisation_sphere/constants_2d.py (+0/-33)
tests/shallow_water_optimisation_sphere/optimiser_A.oml (+0/-23)
tests/shallow_water_optimisation_sphere/shallow_water_optimisation_sphere.xml (+0/-40)
tests/shallow_water_optimisation_sphere/source_terms.py (+0/-31)
tests/shallow_water_optimisation_sphere/source_terms.sage (+0/-28)
tests/shallow_water_optimisation_sphere/src/Makefile (+0/-7)
tests/shallow_water_optimisation_sphere/src/sphere_A.geo (+0/-42)
tests/shallow_water_optimisation_sphere/src/sphere_B.geo (+0/-42)
tests/shallow_water_optimisation_sphere/src/sphere_C.geo (+0/-42)
tests/shallow_water_optimisation_sphere/sw_fsphere_A.swml (+0/-471)
tests/shallow_water_optimisation_sphere/sw_fsphere_B.swml (+0/-472)
tests/shallow_water_optimisation_sphere/sw_fsphere_C.swml (+0/-472)
tests/square-dg/Makefile (+0/-5)
tests/square-dg/square-dg.xml (+0/-55)
tests/square-dg/square.flml (+0/-261)
tests/square-dg/src/square.1.edge (+0/-7)
tests/square-dg/src/square.1.ele (+0/-4)
tests/square-dg/src/square.1.node (+0/-6)
tests/square-dg/src/square.1.poly (+0/-8)
tests/square-dg/src/square.poly (+0/-12)
tests/sw_fsphere/Makefile (+0/-7)
tests/sw_fsphere/Williamson_RHwave.py (+0/-35)
tests/sw_fsphere/src/sphere.geo (+0/-42)
tests/sw_fsphere/src/sphere.msh (+0/-7501)
tests/sw_fsphere/sw_fsphere.swml (+0/-217)
tests/sw_fsphere/sw_fsphere.xml (+0/-37)
tests/sw_sphere/polarvtu2cartvtu.py (+0/-20)
tests/sw_sphere/src/sphere.geo (+0/-42)
tests/sw_sphere/src/sphere.msh (+0/-1969)
tests/sw_sphere/src/spheretools.py (+0/-30)
tests/sw_sphere/sw_sphere.swml (+0/-223)
tests/taylor-vortex-dg/src/grid_A.geo (+0/-12)
tests/taylor-vortex-dg/src/grid_B.geo (+0/-12)
tests/taylor-vortex-dg/src/grid_C.geo (+0/-12)
tests/taylor-vortex-dg/src/grid_D.geo (+0/-12)
tests/taylor-vortex-dg/src/grid_E.geo (+0/-12)
tests/test_advection_diffusion/Makefile (+0/-6)
tests/test_advection_diffusion/cdisk_adv.adml (+0/-123)
tests/test_advection_diffusion/cdisk_adv_diff.adml (+0/-134)
tests/test_advection_diffusion/cdisk_diff.adml (+0/-108)
tests/test_advection_diffusion/src/cdisk.geo (+0/-17)
tests/test_coupler/Makefile (+0/-19)
tests/test_coupler/domain.geo (+0/-12)
tests/test_coupler/domain_struct.geo (+0/-7)
tests/test_coupler/test_coupler.cml (+0/-61)
tests/test_coupler/test_coupler.xml (+0/-16)
tests/test_shallow_water/Makefile (+0/-8)
tests/test_shallow_water/balanced.mv2 (+0/-7624)
tests/test_shallow_water/balanced.swml (+0/-235)
tests/test_shallow_water/src/basin.geo (+0/-9)
tests/test_shallow_water/test_shallow_water.xml (+0/-25)
tests/tidal_channel_2d/Makefile (+0/-12)
tests/tidal_channel_2d/channel.flml (+0/-406)
tests/tidal_channel_2d/src/channel.geo (+0/-12)
tests/tidal_channel_2d/tidal_channel_2d.xml (+0/-35)
tests/tracer_gyre_dg/Makefile (+0/-5)
tests/tracer_gyre_dg/gyre.flml (+0/-183)
tests/tracer_gyre_dg/src/gyre.geo (+0/-17)
tests/tracer_gyre_dg/src/gyre.msh (+0/-3538)
tests/tracer_gyre_dg/tracer_gyre_dg.xml (+0/-15)
tests/tracer_inflow_2d_dg/Makefile (+0/-6)
tests/tracer_inflow_2d_dg/src/channel.geo (+0/-16)
tests/tracer_inflow_2d_dg/src/channel.msh (+0/-133)
tests/tracer_inflow_2d_dg/tracer.flml (+0/-172)
tests/viscosity_2d_p0_adaptive_serial/Makefile (+0/-5)
tests/viscosity_2d_p0_adaptive_serial/heat.flml (+0/-277)
tests/viscosity_2d_p0_adaptive_serial/src/square.geo (+0/-16)
tests/viscosity_2d_p0_adaptive_serial/src/square.msh (+0/-667)
tests/viscosity_2d_p0_adaptive_serial/viscosity_2d_p0_adaptive_serial.xml (+0/-85)
tests/water_collapse_pseudo2dadapt/Makefile (+0/-5)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square.ele (+0/-7488)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square.face (+0/-4942)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square.geo (+0/-17)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square.msh (+0/-14942)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square.node (+0/-2509)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_0.ele (+0/-3961)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_0.face (+0/-2640)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_0.halo (+0/-23)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_0.node (+0/-1357)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_1.ele (+0/-3968)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_1.face (+0/-2604)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_1.halo (+0/-23)
tests/water_collapse_pseudo2dadapt/src/pseudo2d_square_1.node (+0/-1355)
tests/water_collapse_pseudo2dadapt/water_collapse.flml (+0/-364)
tests/water_collapse_pseudo2dadapt/water_collapse_pseudo2dadapt.xml (+0/-28)
To merge this branch: bzr merge lp:~fluidity-core/fluidity/remove-unused-tests-for-4.1.1
Reviewer Review Type Date Requested Status
Jon Hill Approve
Review via email: mp+83605@code.launchpad.net

Description of the change

This merge will remove all the tests marked 'special' and all the tests which don't have .xml files from the trunk.

To post a comment you must log in.
Revision history for this message
Jon Hill (jon-hill) wrote :

Still waiting on the diff, but a look through the changes committed seems to be OK. It matches what was discussed in the bug report 894770.

It's probably worth sending a note around listing the removed tests, and the last revision so people can get the test back, fix it and merge it back into trunk

review: Approve
Revision history for this message
Jonathan Bull (j-bull08) wrote :

The backward_facing_step_3d test can be removed; it's now redundant because of the example. It didn't test anything anyway.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed directory 'tests/2d_periodic_p1p1_streamfunction'
=== removed file 'tests/2d_periodic_p1p1_streamfunction/2d_nonperiodic_p1p1_streamfunction.flml'
--- tests/2d_periodic_p1p1_streamfunction/2d_nonperiodic_p1p1_streamfunction.flml 2010-11-21 15:41:35 +0000
+++ tests/2d_periodic_p1p1_streamfunction/2d_nonperiodic_p1p1_streamfunction.flml 1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<fluidity_options>
3 <simulation_name>
4 <string_value lines="1">2d_nonperiodic_p1p1_streamfunction</string_value>
5 </simulation_name>
6 <problem_type>
7 <string_value lines="1">fluids</string_value>
8 </problem_type>
9 <geometry>
10 <dimension>
11 <integer_value rank="0">2</integer_value>
12 </dimension>
13 <mesh name="CoordinateMesh">
14 <from_file file_name="2d_square">
15 <format name="triangle"/>
16 <stat>
17 <include_in_stat/>
18 </stat>
19 </from_file>
20 </mesh>
21 <mesh name="VelocityMesh">
22 <from_mesh>
23 <mesh name="CoordinateMesh"/>
24 <stat>
25 <exclude_from_stat/>
26 </stat>
27 </from_mesh>
28 </mesh>
29 <mesh name="PressureMesh">
30 <from_mesh>
31 <mesh name="CoordinateMesh"/>
32 <stat>
33 <exclude_from_stat/>
34 </stat>
35 </from_mesh>
36 </mesh>
37 <quadrature>
38 <degree>
39 <integer_value rank="0">4</integer_value>
40 </degree>
41 </quadrature>
42 </geometry>
43 <io>
44 <dump_format>
45 <string_value>vtk</string_value>
46 </dump_format>
47 <dump_period>
48 <constant>
49 <real_value rank="0">1e27</real_value>
50 </constant>
51 </dump_period>
52 <output_mesh name="CoordinateMesh"/>
53 <stat/>
54 </io>
55 <timestepping>
56 <current_time>
57 <real_value rank="0">0.0</real_value>
58 </current_time>
59 <timestep>
60 <real_value rank="0">1</real_value>
61 </timestep>
62 <finish_time>
63 <real_value rank="0">20</real_value>
64 </finish_time>
65 <nonlinear_iterations>
66 <integer_value rank="0">2</integer_value>
67 </nonlinear_iterations>
68 </timestepping>
69 <physical_parameters/>
70 <material_phase name="water">
71 <equation_of_state>
72 <fluids>
73 <linear>
74 <reference_density>
75 <real_value rank="0">1.0</real_value>
76 </reference_density>
77 </linear>
78 </fluids>
79 </equation_of_state>
80 <vector_field name="Velocity" rank="1">
81 <prescribed>
82 <mesh name="VelocityMesh"/>
83 <value name="WholeMesh">
84 <python>
85 <string_value lines="20" type="python">def val(X,t):
86 return [X[1], 0.0]</string_value>
87 </python>
88 </value>
89 <output/>
90 <stat>
91 <include_in_stat/>
92 </stat>
93 <detectors>
94 <exclude_from_detectors/>
95 </detectors>
96 </prescribed>
97 </vector_field>
98 <scalar_field depends="Velocity" name="MultiplyConnectedStreamFunction" rank="0">
99 <prognostic>
100 <mesh name="VelocityMesh"/>
101 <solver>
102 <iterative_method name="gmres">
103 <restart>
104 <integer_value rank="0">30</integer_value>
105 </restart>
106 </iterative_method>
107 <preconditioner name="sor"/>
108 <relative_error>
109 <real_value rank="0">1e-7</real_value>
110 </relative_error>
111 <max_iterations>
112 <integer_value rank="0">3000</integer_value>
113 </max_iterations>
114 <never_ignore_solver_failures/>
115 <diagnostics>
116 <monitors/>
117 </diagnostics>
118 </solver>
119 <boundary_conditions name="bottom">
120 <surface_ids>
121 <integer_value shape="1" rank="1">7</integer_value>
122 </surface_ids>
123 <primary_boundary/>
124 <type name="dirichlet">
125 <internally_calculated/>
126 </type>
127 </boundary_conditions>
128 <boundary_conditions name="top">
129 <surface_ids>
130 <integer_value shape="1" rank="1">9</integer_value>
131 </surface_ids>
132 <secondary_boundary>
133 <primary_point>
134 <real_value shape="2" dim1="dim" rank="1">0.5 0.0</real_value>
135 </primary_point>
136 <secondary_point>
137 <real_value shape="2" dim1="dim" rank="1">0.5 1.0</real_value>
138 </secondary_point>
139 </secondary_boundary>
140 <type name="dirichlet">
141 <internally_calculated/>
142 </type>
143 </boundary_conditions>
144 <exclude_from_checkpointing/>
145 <output>
146 <include_previous_time_step/>
147 </output>
148 <stat/>
149 <detectors>
150 <include_in_detectors/>
151 </detectors>
152 <steady_state>
153 <include_in_steady_state/>
154 </steady_state>
155 <no_interpolation/>
156 </prognostic>
157 </scalar_field>
158 </material_phase>
159</fluidity_options>
1600
=== removed file 'tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.flml'
--- tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.flml 2010-11-21 15:41:35 +0000
+++ tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.flml 1970-01-01 00:00:00 +0000
@@ -1,204 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<fluidity_options>
3 <simulation_name>
4 <string_value lines="1">2d_periodic_p1p1_streamfunction</string_value>
5 </simulation_name>
6 <problem_type>
7 <string_value lines="1">fluids</string_value>
8 </problem_type>
9 <geometry>
10 <dimension>
11 <integer_value rank="0">2</integer_value>
12 </dimension>
13 <mesh name="CoordinateMesh">
14 <from_mesh>
15 <mesh name="periodic_boundaries"/>
16 <periodic_boundary_conditions name="east_west">
17 <physical_boundary_ids>
18 <integer_value shape="1" rank="1">10</integer_value>
19 </physical_boundary_ids>
20 <aliased_boundary_ids>
21 <integer_value shape="1" rank="1">8</integer_value>
22 </aliased_boundary_ids>
23 <coordinate_map>
24 <string_value lines="20" type="python">def val(x,t):
25 return [x[0]-1,x[1]]</string_value>
26 </coordinate_map>
27 <inverse_coordinate_map>
28 <string_value lines="20" type="python">def val(x,t):
29 return [x[0]+1,x[1]]</string_value>
30 </inverse_coordinate_map>
31 <remove_periodicity/>
32 </periodic_boundary_conditions>
33 <stat>
34 <exclude_from_stat/>
35 </stat>
36 </from_mesh>
37 </mesh>
38 <mesh name="VelocityMesh">
39 <from_mesh>
40 <mesh name="periodic_boundaries"/>
41 <stat>
42 <exclude_from_stat/>
43 </stat>
44 </from_mesh>
45 </mesh>
46 <mesh name="PressureMesh">
47 <from_mesh>
48 <mesh name="periodic_boundaries"/>
49 <stat>
50 <exclude_from_stat/>
51 </stat>
52 </from_mesh>
53 </mesh>
54 <mesh name="2D_mesh">
55 <from_file file_name="2d_square">
56 <format name="triangle"/>
57 <stat>
58 <include_in_stat/>
59 </stat>
60 </from_file>
61 </mesh>
62 <mesh name="periodic_boundaries">
63 <from_mesh>
64 <mesh name="2D_mesh"/>
65 <periodic_boundary_conditions name="east_west">
66 <physical_boundary_ids>
67 <integer_value shape="1" rank="1">10</integer_value>
68 </physical_boundary_ids>
69 <aliased_boundary_ids>
70 <integer_value shape="1" rank="1">8</integer_value>
71 </aliased_boundary_ids>
72 <coordinate_map>
73 <string_value lines="20" type="python">def val(x,t):
74 return [x[0]-1,x[1]]</string_value>
75 </coordinate_map>
76 </periodic_boundary_conditions>
77 <stat>
78 <exclude_from_stat/>
79 </stat>
80 </from_mesh>
81 </mesh>
82 <quadrature>
83 <degree>
84 <integer_value rank="0">4</integer_value>
85 </degree>
86 </quadrature>
87 </geometry>
88 <io>
89 <dump_format>
90 <string_value>vtk</string_value>
91 </dump_format>
92 <dump_period>
93 <constant>
94 <real_value rank="0">1e27</real_value>
95 </constant>
96 </dump_period>
97 <output_mesh name="CoordinateMesh"/>
98 <stat/>
99 </io>
100 <timestepping>
101 <current_time>
102 <real_value rank="0">0.0</real_value>
103 </current_time>
104 <timestep>
105 <real_value rank="0">1</real_value>
106 </timestep>
107 <finish_time>
108 <real_value rank="0">20</real_value>
109 </finish_time>
110 <nonlinear_iterations>
111 <integer_value rank="0">2</integer_value>
112 </nonlinear_iterations>
113 </timestepping>
114 <physical_parameters/>
115 <material_phase name="water">
116 <equation_of_state>
117 <fluids>
118 <linear>
119 <reference_density>
120 <real_value rank="0">1.0</real_value>
121 </reference_density>
122 </linear>
123 </fluids>
124 </equation_of_state>
125 <vector_field name="Velocity" rank="1">
126 <prescribed>
127 <mesh name="VelocityMesh"/>
128 <value name="WholeMesh">
129 <python>
130 <string_value lines="20" type="python">def val(X,t):
131 return [X[1], 0.0]</string_value>
132 </python>
133 </value>
134 <output/>
135 <stat>
136 <include_in_stat/>
137 </stat>
138 <detectors>
139 <exclude_from_detectors/>
140 </detectors>
141 </prescribed>
142 </vector_field>
143 <scalar_field depends="Velocity" name="MultiplyConnectedStreamFunction" rank="0">
144 <prognostic>
145 <mesh name="VelocityMesh"/>
146 <solver>
147 <iterative_method name="gmres">
148 <restart>
149 <integer_value rank="0">30</integer_value>
150 </restart>
151 </iterative_method>
152 <preconditioner name="sor"/>
153 <relative_error>
154 <real_value rank="0">1e-7</real_value>
155 </relative_error>
156 <max_iterations>
157 <integer_value rank="0">3000</integer_value>
158 </max_iterations>
159 <never_ignore_solver_failures/>
160 <diagnostics>
161 <monitors/>
162 </diagnostics>
163 </solver>
164 <boundary_conditions name="bottom">
165 <surface_ids>
166 <integer_value shape="1" rank="1">7</integer_value>
167 </surface_ids>
168 <primary_boundary/>
169 <type name="dirichlet">
170 <internally_calculated/>
171 </type>
172 </boundary_conditions>
173 <boundary_conditions name="top">
174 <surface_ids>
175 <integer_value shape="1" rank="1">9</integer_value>
176 </surface_ids>
177 <secondary_boundary>
178 <primary_point>
179 <real_value shape="2" dim1="dim" rank="1">0.5 0.0</real_value>
180 </primary_point>
181 <secondary_point>
182 <real_value shape="2" dim1="dim" rank="1">0.5 1.0</real_value>
183 </secondary_point>
184 </secondary_boundary>
185 <type name="dirichlet">
186 <internally_calculated/>
187 </type>
188 </boundary_conditions>
189 <exclude_from_checkpointing/>
190 <output>
191 <include_previous_time_step/>
192 </output>
193 <stat/>
194 <detectors>
195 <include_in_detectors/>
196 </detectors>
197 <steady_state>
198 <include_in_steady_state/>
199 </steady_state>
200 <no_interpolation/>
201 </prognostic>
202 </scalar_field>
203 </material_phase>
204</fluidity_options>
2050
=== removed file 'tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.xml'
--- tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.xml 2011-10-21 10:05:25 +0000
+++ tests/2d_periodic_p1p1_streamfunction/2d_periodic_p1p1_streamfunction.xml 1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2
3<testproblem>
4 <name>Periodic channel with streamfunction diagnostic check get correct boundary condition</name>
5 <owner userid="amcvicar"/>
6 <tags>flml zoltan parallel</tags>
7 <problem_definition length="special" nprocs="1">
8 <command_line> ../../bin/fluidity -v3 -l 2d_periodic_p1p1_streamfunction.flml &amp;&amp;
9 ../../bin/fluidity -v3 -l 2d_nonperiodic_p1p1_streamfunction.flml &amp;&amp;
10 mpiexec -np 4 ../../bin/fluidity -v3 -l 2d_periodic_p1p1_streamfunction_periodised_flredecomp.flml </command_line>
11 </problem_definition>
12 <variables>
13 <variable name="analytical_solution" language="python">
14# compute analytical solution
15import numpy
16u_bottom = 0.0
17u_top = 1.0
18#divisions=12.0
19#y=numpy.arange(0,(1+(u_top/divisions)),(u_top/divisions))
20#velocity is a function of y
21#x=[]
22#for i in y:
23# x.append((i**2)/2)
24analytical_solution=float((u_top**2.0)/2.0)
25 </variable>
26
27 <variable name="numerical_solution_periodic" language="python">
28import vtktools
29from fluidity_tools import stat_parser as stat
30from numpy import array
31# read in the .vtu
32data=vtktools.vtu("2d_periodic_p1p1_streamfunction_1.vtu")
33SF=data.GetField('MultiplyConnectedStreamFunction');
34numerical_solution_periodic=[0,0,0]
35numerical_solution_periodic[0]=max(abs(array(SF[:,0])));
36numerical_solution_periodic[1]=min((array(SF[:,0])));
37
38#final change in streamfunction
39#numerical_solution_periodic[2]=stat("2d_periodic_p1p1_streamfunction.stat")["water"]["MultiplyConnectedStreamFunction"]["l2norm"][-1]
40dt = stat("2d_periodic_p1p1_streamfunction.stat")["dt"]["value"][-1]
41numerical_solution_periodic[2] = max(abs(data.GetScalarField("MultiplyConnectedStreamFunction")-data.GetScalarField("OldMultiplyConnectedStreamFunction"))/dt)
42
43 </variable>
44 <variable name="numerical_solution_nonperiodic" language="python">
45import vtktools
46from fluidity_tools import stat_parser as stat
47from numpy import array
48# read in the .vtu
49data=vtktools.vtu("2d_nonperiodic_p1p1_streamfunction_1.vtu")
50SF=data.GetField('MultiplyConnectedStreamFunction');
51numerical_solution_nonperiodic=[0,0,0]
52numerical_solution_nonperiodic[0]=max(abs(array(SF[:,0])));
53numerical_solution_nonperiodic[1]=min((array(SF[:,0])));
54
55#final change in streamfunction
56#numerical_solution_nonperiodic[2]=stat("2d_nonperiodic_p1p1_streamfunction.stat")["water"]["MultiplyConnectedStreamFunction"]["l2norm"][-1]
57dt = stat("2d_nonperiodic_p1p1_streamfunction.stat")["dt"]["value"][-1]
58numerical_solution_nonperiodic[2] = max(abs(data.GetScalarField("MultiplyConnectedStreamFunction")-data.GetScalarField("OldMultiplyConnectedStreamFunction"))/dt)
59
60 </variable>
61
62 <variable name="numerical_solution_periodic_parallel" language="python">
63import vtktools
64from fluidity_tools import stat_parser as stat
65from numpy import array
66# read in the .vtu
67data=vtktools.vtu("2d_periodic_p1p1_streamfunction_parallel_1.pvtu")
68SF=data.GetField('MultiplyConnectedStreamFunction');
69numerical_solution_periodic_parallel=[0,0,0]
70numerical_solution_periodic_parallel[0]=max(abs(array(SF[:,0])));
71numerical_solution_periodic_parallel[1]=min((array(SF[:,0])));
72
73#final change in streamfunction
74#numerical_solution_periodic_parallel[2]=stat("2d_periodic_p1p1_streamfunction_parallel.stat")["water"]["MultiplyConnectedStreamFunction"]["l2norm"][-1]
75dt = stat("2d_periodic_p1p1_streamfunction_parallel.stat")["dt"]["value"][-1]
76numerical_solution_periodic_parallel[2] = max(abs(data.GetScalarField("MultiplyConnectedStreamFunction")-data.GetScalarField("OldMultiplyConnectedStreamFunction"))/dt)
77
78 </variable>
79
80 </variables>
81 <pass_tests>
82 <test name="Compare max error of nonperiodic with analytical solution" language="python">
83 assert abs(numerical_solution_periodic[0]-analytical_solution) &lt; 1e-6</test>
84 <test name="Compare min error of periodic " language="python">
85 assert abs(numerical_solution_periodic[1]) &lt; 1e-6 </test>
86 <test name="Compare L2norm of periodic" language="python">
87 assert abs(numerical_solution_periodic[2]) &lt; 1e-6 </test>
88
89 <test name="Compare max error of nonperiodic with analytical solution" language="python">
90 assert abs(numerical_solution_nonperiodic[0]-analytical_solution) &lt; 1e-6</test>
91 <test name="Compare min error of nonperiodic " language="python">
92 assert abs(numerical_solution_nonperiodic[1]) &lt; 1e-6 </test>
93 <test name="Compare L2norm of nonperiodic" language="python">
94 assert abs(numerical_solution_nonperiodic[2]) &lt; 1e-6 </test>
95
96 <test name="Compare max error of periodic parallel with analytical solution" language="python">
97 assert abs(numerical_solution_periodic_parallel[0]-analytical_solution) &lt; 1e-6</test>
98 <test name="Compare min error of periodic parallel" language="python">
99 assert abs(numerical_solution_periodic_parallel[1]) &lt; 1e-6 </test>
100 <test name="Compare L2norm of periodic parallel" language="python">
101 assert abs(numerical_solution_periodic_parallel[2]) &lt; 1e-6 </test>
102
103 </pass_tests>
104 <warn_tests>
105 </warn_tests>
106</testproblem>
1070
=== removed file 'tests/2d_periodic_p1p1_streamfunction/Makefile'
--- tests/2d_periodic_p1p1_streamfunction/Makefile 2011-10-21 10:05:25 +0000
+++ tests/2d_periodic_p1p1_streamfunction/Makefile 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1PROJECT = 2d_periodic_p1p1_streamfunction
2
3input: clean
4 gmsh -2 -o 2d_square.msh src/2d_square.geo
5 ../../bin/gmsh2triangle --2d 2d_square.msh
6
7
8 #set up parallel run
9 ../../bin/periodise 2d_periodic_p1p1_streamfunction.flml
10 mpiexec -np 4 ../../bin/flredecomp -i 1 -o 4 2d_periodic_p1p1_streamfunction_periodised 2d_periodic_p1p1_streamfunction_periodised_flredecomp
11 spud-set 2d_periodic_p1p1_streamfunction_periodised_flredecomp.flml /simulation_name 2d_periodic_p1p1_streamfunction_parallel
12
13
14clean:
15 rm -f *.stat
16 rm -f *vtu
17 rm -f fluidity* matrixdump*
18 rm -f *.ele *.face *.node *.edge
19 rm -f *.msh
20 rm -f *halo
21 rm -f *periodise*
22\ No newline at end of file0\ No newline at end of file
231
=== removed directory 'tests/2d_periodic_p1p1_streamfunction/src'
=== removed file 'tests/2d_periodic_p1p1_streamfunction/src/2d_square.geo'
--- tests/2d_periodic_p1p1_streamfunction/src/2d_square.geo 2010-06-13 13:10:46 +0000
+++ tests/2d_periodic_p1p1_streamfunction/src/2d_square.geo 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
1Point(1) = {0.0,0.0,0,0.08};
2Point(2) = {1.0,0.0,0,0.08};
3Point(3) = {1.0,1.0,0,0.08};
4Point(4) = {0.0,1.0,0,0.08};
5Line(1) = {1,2};
6Line(2) = {2,3};
7Line(3) = {3,4};
8Line(4) = {4,1};
9Line Loop(5) = {2,3,4,1};
10Plane Surface(6) = {5};
11// y const
12Physical Line(7) = {1};
13// x const
14Physical Line(8) = {2};
15// y const
16Physical Line(9) = {3};
17// x const
18Physical Line(10) = {4};
19// z const
20Physical Surface(11) = {6};
210
=== removed directory 'tests/IGW'
=== removed file 'tests/IGW/IGW.xml'
--- tests/IGW/IGW.xml 2011-10-21 10:05:25 +0000
+++ tests/IGW/IGW.xml 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2
3<testproblem>
4 <name>IGW</name>
5 <owner userid="colin"/>
6 <tags>flml</tags>
7 <problem_definition length="special" nprocs="1">
8 <command_line>../../bin/IGW square1 IGW.log &amp;&gt; IGW.log</command_line>
9 </problem_definition>
10 <variables>
11 <variable name="DeltaH" language="python">
12import vtktools
13start = vtktools.vtu("square1_0.vtu")
14end = vtktools.vtu("square1_1.vtu")
15DeltaH = max(start.GetScalarField("height") - end.GetScalarField("height"))
16 </variable>
17 </variables>
18 <pass_tests>
19 <!-- The height should not change -->
20 <test name="Height difference (1.0e-12)" language="python">
21assert DeltaH &lt; 1e-12
22 </test>
23 </pass_tests>
24 <warn_tests>
25 </warn_tests>
26</testproblem>
270
=== removed file 'tests/IGW/Makefile'
--- tests/IGW/Makefile 2011-10-21 10:05:25 +0000
+++ tests/IGW/Makefile 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1default: input
2
3input: clean
4 gmsh -2 square.geo > gmsh.log 2> gmsh_err.log
5 ../../bin/gmsh2triangle -2 square.msh
6
7clean:
8 rm -f *.ele *.edge *.face *.node *.vtu *.s *.stat *.log *.msh
90
=== removed file 'tests/IGW/basin.dat'
--- tests/IGW/basin.dat 2009-12-16 14:11:47 +0000
+++ tests/IGW/basin.dat 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1&IGW_data tmax=10.0, tdump=1.0, dt=0.01, fr=1.0, ro=0.1, u_degree=1,
2h_degree=2,u_cty=-1,steady_state=F, mesh="basin",
3u_input="basin_u.py", h_input="basin_h.py", get_streamfunction=F/
4\ No newline at end of file0\ No newline at end of file
51
=== removed file 'tests/IGW/basin.geo'
--- tests/IGW/basin.geo 2009-12-16 14:11:47 +0000
+++ tests/IGW/basin.geo 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1Point(1) = {2e5,0,0,1e4};
2Point(2) = {0,0,0,1e4};
3Point(3) = {-2e5,0,0,1e4};
4Circle(1) = {1,2,3};
5Circle(2) = {3,2,1};
6Physical Line(3) = {1,2};
7Line Loop(4) = {1,2};
8Plane Surface(5) = {4};
9Physical Surface(6) = {5};
100
=== removed file 'tests/IGW/basin_h.py'
--- tests/IGW/basin_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/basin_h.py 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1def val(X,t):
2 from math import exp
3 r0 = 0.5
4 r = ((X[0])**2 + (X[1]**2))**0.5
5 if(r>0.0001):
6 return exp((r-r0)/0.1)*X[0]/r
7 else:
8 return 0.0
90
=== removed file 'tests/IGW/basin_u.py'
--- tests/IGW/basin_u.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/basin_u.py 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1def val(X,t):
2 from math import exp
3 r0 = 0.5
4 g = [0.0,0.0]
5 r = ((X[0])**2 + (X[1])**2)**0.5
6 if(r>0.0001):
7 g[0] = -exp((r-r0)/0.1)*X[0]/r*X[1]/r
8 g[1] = exp((r-r0)/0.1)*X[0]/r*X[0]/r
9 return g
10\ No newline at end of file0\ No newline at end of file
111
=== removed file 'tests/IGW/channel.1_u.py'
--- tests/IGW/channel.1_u.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/channel.1_u.py 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1def val(X,t):
2 from math import exp
3 g = [0.0,0.0]
4 g[0] = 0.0
5 g[1] = exp(-X[0]/0.1)*exp(-(X[1]-5.0)**2)
6 return g
70
=== removed file 'tests/IGW/channel1.dat'
--- tests/IGW/channel1.dat 2009-12-16 14:11:47 +0000
+++ tests/IGW/channel1.dat 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1&IGW_data tmax=10.0, tdump=1.0, dt=0.01, fr=1.0, ro=0.1 /
2\ No newline at end of file0\ No newline at end of file
31
=== removed file 'tests/IGW/channel1_h.py'
--- tests/IGW/channel1_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/channel1_h.py 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1def val(X,t):
2 from math import exp
3 return -exp(-X[0]/0.1)*exp(-(X[1]-5.0)**2)
40
=== removed file 'tests/IGW/channel1_u.py'
--- tests/IGW/channel1_u.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/channel1_u.py 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1def val(X,t):
2 from math import exp
3 g = [0.0,0.0]
4 g[0] = 0.0
5 g[1] = exp(-X[0]/0.1)*exp(-(X[1]-5.0)**2)
6 return g
7\ No newline at end of file0\ No newline at end of file
81
=== removed file 'tests/IGW/gauss_h.py'
--- tests/IGW/gauss_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/gauss_h.py 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1def val(X,t):
2 from math import exp, pi, cos
3 x = X[0]
4 y = X[1]
5 rsq = (X[0]-0.5)**2 + (X[1]-0.5)**2
6 r0sq = 0.3**2
7 g = exp(-rsq/r0sq)
8 if x>0.999 or x<0.001 or y>0.999 or y<0.001:
9 g = 0.0
10
11 return g
120
=== removed file 'tests/IGW/kelvin.dat'
--- tests/IGW/kelvin.dat 2009-12-16 14:11:47 +0000
+++ tests/IGW/kelvin.dat 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1&IGW_data tmax=10.0, tdump=1.0, dt=0.001, fr=1.0, ro=0.1, u_degree=1,
2h_degree=2,u_cty=-1,balanced_u=F, steady_state=F, mesh="kelvin_mod",
3u_input="kelvin_u.py", h_input="kelvin_h.py",
4exact_h_input="kelvin_h.py", get_streamfunction=F,
5projection_test=F,compute_error=F, exact_u_input="kelvin_u.py" /
6\ No newline at end of file0\ No newline at end of file
71
=== removed file 'tests/IGW/kelvin.geo'
--- tests/IGW/kelvin.geo 2009-12-16 14:11:47 +0000
+++ tests/IGW/kelvin.geo 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1Point(1) = {-10,0,0,0.01};
2Point(2) = {10,0,0,0.01};
3Point(3) = {-10.0,1.0,0,0.01};
4Point(4) = {10.0,1.0,0,0.01};
5Line(1) = {1,2};
6Line(2) = {2,4};
7Line(4) = {3,1};
8Line(5) = {4,3};
9Line Loop(8) = {1,2,4,5};
10
11Plane Surface(9) = {8};
12Physical Surface(10) = {9};
130
=== removed file 'tests/IGW/kelvin_h.py'
--- tests/IGW/kelvin_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/kelvin_h.py 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1def val(X,t):
2 from math import exp
3 X0 = 5.0 - t
4 sig = 1.0
5 return exp(-X[1]/0.1)*exp(-(X[0]-X0)**2/(sig*sig))
60
=== removed file 'tests/IGW/kelvin_mod.geo'
--- tests/IGW/kelvin_mod.geo 2009-12-16 14:11:47 +0000
+++ tests/IGW/kelvin_mod.geo 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
1Point(1) = {-15,0,0,2.0};
2Point(2) = {15,0,0,2.0};
3Point(3) = {-15.0,3.0,0,2.0};
4Point(4) = {15.0,3.0,0,2.0};
5Point(5) = {-8,0,0,0.15};
6Point(6) = {8,0,0,0.15};
7Point(7) = {-8,0.6,0,0.15};
8Point(8) = {8,0.6,0,0.15};
9Line(1) = {1,5};
10Line(2) = {6,5};
11Line(3) = {6,2};
12Line(4) = {2,4};
13Line(5) = {4,3};
14Line(6) = {3,1};
15Line(7) = {5,7};
16Line(8) = {7,8};
17Line(9) = {8,6};
18Line Loop(10) = {5,6,1,7,8,9,3,4};
19Line Loop(11) = {8,9,2,7};
20Plane Surface(12) = {11};
21Plane Surface(13) = {10};
22Physical Line(14) = {5,6,1,2,3,4};
23Physical Surface(15) = {13,12};
240
=== removed file 'tests/IGW/kelvin_u.py'
--- tests/IGW/kelvin_u.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/kelvin_u.py 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1def val(X,t):
2 from math import exp
3 X0 = 5.0 - t
4 sig = 1.0
5 g = [0.0,0.0]
6 g[0] = exp(-X[1]/0.1)*exp(-(X[0]-X0)**2/(sig*sig))
7 return g
80
=== removed file 'tests/IGW/rand_h.py'
--- tests/IGW/rand_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/rand_h.py 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1def val(X,t):
2 from random import random
3
4 x = X[0]
5 y = X[1]
6
7 g = random()
8 if x>0.999 or x<0.001 or y>0.999 or y<0.001:
9 g = 0.0
10
11 return g
120
=== removed file 'tests/IGW/sin_h.py'
--- tests/IGW/sin_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/sin_h.py 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1def val(X,t):
2 from math import sin, pi
3 return sin(pi*X[0])*sin(pi*X[1])
40
=== removed file 'tests/IGW/square.geo'
--- tests/IGW/square.geo 2009-12-16 14:11:47 +0000
+++ tests/IGW/square.geo 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1Point(1) = {0,0,0,0.1};
2Point(2) = {1,0,0,0.1};
3Point(3) = {1,1,0,0.1};
4Point(4) = {0,1,0,0.1};
5Line(1) = {1,2};
6Line(2) = {2,3};
7Line(3) = {3,4};
8Line(4) = {4,1};
9Physical Line(5) = {4,3,2,1};
10Line Loop(6) = {3,4,1,2};
11Plane Surface(7) = {6};
12Physical Surface(8) = {7};
130
=== removed file 'tests/IGW/square1.dat'
--- tests/IGW/square1.dat 2009-12-16 14:11:47 +0000
+++ tests/IGW/square1.dat 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1&IGW_data tmax=10.01, tdump=10.0, dt=0.01, fr=1.0, ro=0.1, u_degree=1,
2h_degree=2,u_cty=-1,balanced_u=T,steady_state=T, mesh="square",
3u_input="square1_u.py", h_input="rand_h.py", get_streamfunction=F,
4projection_test=F, compute_error=F/
5\ No newline at end of file0\ No newline at end of file
61
=== removed file 'tests/IGW/square1_h.py'
--- tests/IGW/square1_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/square1_h.py 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1def val(X,t):
2 from random import random
3 if X[0]<0.0001 or X[0]>0.9999 or X[1]<0.0001 or X[1]>0.9999:
4 return 0.0
5 else:
6 return random()
70
=== removed file 'tests/IGW/square1_u.py'
--- tests/IGW/square1_u.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/square1_u.py 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1def val(X,t):
2 from math import exp
3 print "Hello, world"
4 x = X[0]
5 y = X[1]
6 g = [None, None]
7 g[0] = 0.555555555556*(y - 0.5)*exp(2.77777777778*(-(y - 0.5)**2 - (x - 0.5)**2))
8 g[1] = -0.555555555556*(x - 0.5)*exp(2.77777777778*(-(y - 0.5)**2 - (x - 0.5)**2))
9 return g
100
=== removed file 'tests/IGW/square_rnd_h.py'
--- tests/IGW/square_rnd_h.py 2009-12-16 14:11:47 +0000
+++ tests/IGW/square_rnd_h.py 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1def val(X,t):
2 from random import random
3 if X[0]<0.0001 or X[0]>0.9999 or X[1]<0.0001 or X[1]>0.9999:
4 return 0.0
5 else:
6 return random()
70
=== removed file 'tests/IGW/square_sin.dat'
--- tests/IGW/square_sin.dat 2009-12-16 14:11:47 +0000
+++ tests/IGW/square_sin.dat 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1&IGW_data tmax=1.0, tdump=0.1, dt=0.01, fr=1.0, ro=0.1, u_degree=1,
2h_degree=2,u_cty=-1,balanced_u=T,steady_state=T, mesh="square1",
3u_input="square1_u.py", h_input="sin_h.py" /
4\ No newline at end of file0\ No newline at end of file
51
=== removed file 'tests/IGW/square_weak.dat'
--- tests/IGW/square_weak.dat 2009-12-16 14:11:47 +0000
+++ tests/IGW/square_weak.dat 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1&IGW_data tmax=0.1, tdump=0.01, dt=0.01, fr=1.0, ro=0.1, u_degree=1,
2h_degree=2,u_cty=-1,balanced_u=T,steady_state=T, mesh="square.1",
3u_input="square1_u.py", h_input="square_weak_h.py", get_streamfunction=F,
4projection_test=F, compute_error=F/
50
=== removed file 'tests/IGW/squarep1p1.dat'
--- tests/IGW/squarep1p1.dat 2009-12-16 14:11:47 +0000
+++ tests/IGW/squarep1p1.dat 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1&IGW_data tmax=0.02, tdump=0.01, dt=0.01, fr=1.0, ro=0.1, u_degree=1,
2h_degree=2,u_cty=0,balanced_u=T,steady_state=T, mesh="square.1",
3u_input="square1_u.py", h_input="gauss_h.py", get_streamfunction=T/
4\ No newline at end of file0\ No newline at end of file
51
=== removed directory 'tests/Stokes_mms_p0p1cv'
=== removed file 'tests/Stokes_mms_p0p1cv/MMS_A.flml'
--- tests/Stokes_mms_p0p1cv/MMS_A.flml 2010-11-21 15:41:35 +0000
+++ tests/Stokes_mms_p0p1cv/MMS_A.flml 1970-01-01 00:00:00 +0000
@@ -1,478 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<fluidity_options>
3 <simulation_name>
4 <string_value lines="1">MMS_A</string_value>
5 </simulation_name>
6 <problem_type>
7 <string_value lines="1">fluids</string_value>
8 </problem_type>
9 <geometry>
10 <dimension>
11 <integer_value rank="0">2</integer_value>
12 </dimension>
13 <mesh name="CoordinateMesh">
14 <from_mesh>
15 <mesh name="InputMesh"/>
16 <stat>
17 <exclude_from_stat/>
18 </stat>
19 </from_mesh>
20 </mesh>
21 <mesh name="VelocityMesh">
22 <from_mesh>
23 <mesh name="InputMesh"/>
24 <mesh_shape>
25 <polynomial_degree>
26 <integer_value rank="0">0</integer_value>
27 </polynomial_degree>
28 </mesh_shape>
29 <mesh_continuity>
30 <string_value>discontinuous</string_value>
31 </mesh_continuity>
32 <stat>
33 <exclude_from_stat/>
34 </stat>
35 </from_mesh>
36 </mesh>
37 <mesh name="PressureMesh">
38 <from_mesh>
39 <mesh name="InputMesh"/>
40 <stat>
41 <exclude_from_stat/>
42 </stat>
43 </from_mesh>
44 </mesh>
45 <mesh name="InputMesh">
46 <from_file file_name="MMS_A">
47 <format name="triangle"/>
48 <stat>
49 <include_in_stat/>
50 </stat>
51 </from_file>
52 </mesh>
53 <quadrature>
54 <degree>
55 <integer_value rank="0">4</integer_value>
56 </degree>
57 </quadrature>
58 </geometry>
59 <io>
60 <dump_format>
61 <string_value>vtk</string_value>
62 </dump_format>
63 <dump_period>
64 <constant>
65 <real_value rank="0">15.0</real_value>
66 </constant>
67 </dump_period>
68 <output_mesh name="VelocityMesh"/>
69 <checkpointing>
70 <checkpoint_period_in_dumps>
71 <integer_value rank="0">10000</integer_value>
72 </checkpoint_period_in_dumps>
73 <checkpoint_at_end/>
74 </checkpointing>
75 <stat/>
76 </io>
77 <timestepping>
78 <current_time>
79 <real_value rank="0">0.0</real_value>
80 </current_time>
81 <timestep>
82 <real_value rank="0">0.0072673325013204136</real_value>
83 <comment>gives a max cfl number of 0.1</comment>
84 </timestep>
85 <finish_time>
86 <real_value rank="0">10.0</real_value>
87 <comment>10.0</comment>
88 </finish_time>
89 <steady_state>
90 <tolerance>
91 <real_value rank="0">1.E-8</real_value>
92 <infinity_norm/>
93 </tolerance>
94 </steady_state>
95 </timestepping>
96 <physical_parameters/>
97 <material_phase name="NS">
98 <equation_of_state>
99 <fluids>
100 <linear>
101 <reference_density>
102 <real_value rank="0">1.0</real_value>
103 </reference_density>
104 </linear>
105 </fluids>
106 </equation_of_state>
107 <scalar_field name="Pressure" rank="0">
108 <prognostic>
109 <mesh name="PressureMesh"/>
110 <spatial_discretisation>
111 <control_volumes/>
112 </spatial_discretisation>
113 <reference_node>
114 <integer_value rank="0">1</integer_value>
115 </reference_node>
116 <scheme>
117 <poisson_pressure_solution>
118 <string_value lines="1">never</string_value>
119 </poisson_pressure_solution>
120 <use_projection_method>
121 <full_schur_complement>
122 <inner_matrix name="FullMomentumMatrix">
123 <solver>
124 <iterative_method name="cg"/>
125 <preconditioner name="sor"/>
126 <relative_error>
127 <real_value rank="0">1E-10</real_value>
128 </relative_error>
129 <max_iterations>
130 <integer_value rank="0">10000</integer_value>
131 </max_iterations>
132 <start_from_zero/>
133 <never_ignore_solver_failures/>
134 <diagnostics>
135 <monitors/>
136 </diagnostics>
137 </solver>
138 </inner_matrix>
139 <preconditioner_matrix name="DiagonalSchurComplement"/>
140 </full_schur_complement>
141 </use_projection_method>
142 </scheme>
143 <solver>
144 <iterative_method name="fgmres"/>
145 <preconditioner name="mg"/>
146 <relative_error>
147 <real_value rank="0">1.0e-07</real_value>
148 </relative_error>
149 <max_iterations>
150 <integer_value rank="0">10000</integer_value>
151 </max_iterations>
152 <never_ignore_solver_failures/>
153 <diagnostics>
154 <monitors/>
155 </diagnostics>
156 </solver>
157 <output>
158 <include_previous_time_step/>
159 </output>
160 <stat/>
161 <convergence>
162 <include_in_convergence/>
163 </convergence>
164 <detectors>
165 <exclude_from_detectors/>
166 </detectors>
167 <steady_state>
168 <include_in_steady_state/>
169 </steady_state>
170 <consistent_interpolation/>
171 </prognostic>
172 </scalar_field>
173 <scalar_field name="Density" rank="0">
174 <diagnostic>
175 <algorithm name="Internal" material_phase_support="multiple"/>
176 <mesh name="VelocityMesh"/>
177 <output/>
178 <stat/>
179 <convergence>
180 <include_in_convergence/>
181 </convergence>
182 <detectors>
183 <include_in_detectors/>
184 </detectors>
185 <steady_state>
186 <include_in_steady_state/>
187 </steady_state>
188 </diagnostic>
189 </scalar_field>
190 <vector_field name="Velocity" rank="1">
191 <prognostic>
192 <mesh name="VelocityMesh"/>
193 <equation name="LinearMomentum"/>
194 <spatial_discretisation>
195 <discontinuous_galerkin>
196 <mass_terms>
197 <exclude_mass_terms/>
198 </mass_terms>
199 <viscosity_scheme>
200 <bassi_rebay/>
201 </viscosity_scheme>
202 <advection_scheme>
203 <none/>
204 <integrate_advection_by_parts>
205 <twice/>
206 </integrate_advection_by_parts>
207 </advection_scheme>
208 </discontinuous_galerkin>
209 <conservative_advection>
210 <real_value rank="0">0.0</real_value>
211 </conservative_advection>
212 </spatial_discretisation>
213 <temporal_discretisation>
214 <theta>
215 <real_value rank="0">1</real_value>
216 </theta>
217 <relaxation>
218 <real_value rank="0">1</real_value>
219 </relaxation>
220 </temporal_discretisation>
221 <solver>
222 <iterative_method name="cg"/>
223 <preconditioner name="eisenstat"/>
224 <relative_error>
225 <real_value rank="0">1.E-7</real_value>
226 </relative_error>
227 <max_iterations>
228 <integer_value rank="0">10000</integer_value>
229 </max_iterations>
230 <never_ignore_solver_failures/>
231 <diagnostics>
232 <monitors/>
233 </diagnostics>
234 </solver>
235 <initial_condition name="WholeMesh">
236 <constant>
237 <real_value shape="2" dim1="dim" rank="1">0.0 0.0</real_value>
238 </constant>
239 </initial_condition>
240 <boundary_conditions name="all_sides">
241 <surface_ids>
242 <integer_value shape="4" rank="1">7 8 9 10</integer_value>
243 </surface_ids>
244 <type name="dirichlet">
245 <apply_weakly/>
246 <align_bc_with_cartesian>
247 <x_component>
248 <python>
249 <string_value lines="20" type="python">def val(X,t):
250 from math import sin, cos
251 # Shear rotation about origin.
252 u = sin(X[0])*cos(X[1])
253 return u</string_value>
254 </python>
255 </x_component>
256 <y_component>
257 <python>
258 <string_value lines="20" type="python">def val(X,t):
259 from math import sin, cos
260 # Shear rotation about origin.
261 v = -1.0*cos(X[0])*sin(X[1])
262 return v</string_value>
263 </python>
264 </y_component>
265 </align_bc_with_cartesian>
266 </type>
267 </boundary_conditions>
268 <tensor_field name="Viscosity" rank="2">
269 <prescribed>
270 <value name="WholeMesh">
271 <isotropic>
272 <constant>
273 <real_value rank="0">0.7</real_value>
274 </constant>
275 </isotropic>
276 </value>
277 <output/>
278 </prescribed>
279 </tensor_field>
280 <vector_field name="Source" rank="1">
281 <prescribed>
282 <value name="WholeMesh">
283 <python>
284 <string_value lines="20" type="python">def val(XX, t):
285 from math import sin,cos
286 nu = 0.7;
287 adv = 0.0;
288 beta = 0.0;
289 mass = 0.0;
290 rho = 1.0;
291 x = XX[0];
292 y = XX[1];
293 Su = adv*rho*(cos(x)*sin(x)*sin(y)**2 + cos(x)*sin(x)*cos(y)**2) + 2*nu*sin(x)*cos(y) - sin(x)*cos(y)
294 Sv = adv*rho*(sin(x)**2*cos(y)*sin(y) + cos(x)**2*cos(y)*sin(y)) - 2*nu*cos(x)*sin(y) - cos(x)*sin(y)
295 return (Su, Sv)</string_value>
296 <comment>u(x,y,rho,beta,nu,adv,mass,t) = sin(x)*cos(y)&#13;
297v(x,y,rho,beta,nu,adv,masst) = -cos(x)*sin(y)
298p(x,y,rho,beta,nu,adv,mass,t) = cos(x)*cos(y)&#13;
299
300u_t = diff(u,t)
301v_t = diff(v,t)
302
303u_x = diff(u,x)&#13;
304u_y = diff(u,y)
305v_x = diff(v,x)
306v_y = diff(v,y)
307
308p_x = diff(p,x)
309p_y = diff(p,y)
310&#13;
311u_xx = diff(u_x,x)
312u_yy = diff(u_y,y)
313v_xx = diff(v_x,x)
314v_yy = diff(v_y,y)
315
316mass*rho*u_t + adv*rho*(u*u_x+v*u_y + beta*(u*u_x + u*v_y)) + p_x - nu*u_xx - nu*u_yy
317mass*rho*v_t + adv*rho*(u*v_x+v*v_y + beta*(v*u_x + v*v_y)) + p_y - nu*v_xx - nu*v_yy</comment>
318 </python>
319 </value>
320 <output/>
321 <stat>
322 <include_in_stat/>
323 </stat>
324 <detectors>
325 <exclude_from_detectors/>
326 </detectors>
327 </prescribed>
328 </vector_field>
329 <output>
330 <include_previous_time_step/>
331 </output>
332 <stat>
333 <include_in_stat/>
334 <previous_time_step>
335 <exclude_from_stat/>
336 </previous_time_step>
337 <nonlinear_field>
338 <exclude_from_stat/>
339 </nonlinear_field>
340 </stat>
341 <convergence>
342 <include_in_convergence/>
343 </convergence>
344 <detectors>
345 <include_in_detectors/>
346 </detectors>
347 <steady_state>
348 <include_in_steady_state/>
349 </steady_state>
350 <consistent_interpolation/>
351 </prognostic>
352 </vector_field>
353 <scalar_field name="CFLNumber" rank="0">
354 <diagnostic>
355 <algorithm name="Internal" material_phase_support="multiple"/>
356 <mesh name="VelocityMesh"/>
357 <output/>
358 <stat/>
359 <convergence>
360 <include_in_convergence/>
361 </convergence>
362 <detectors>
363 <include_in_detectors/>
364 </detectors>
365 <steady_state>
366 <include_in_steady_state/>
367 </steady_state>
368 </diagnostic>
369 </scalar_field>
370 <scalar_field name="PressureAnalytical" rank="0">
371 <prescribed>
372 <mesh name="PressureMesh"/>
373 <value name="WholeMesh">
374 <python>
375 <string_value lines="20" type="python">def val(X,t):
376 from math import cos
377 p = cos(X[0])*cos(X[1])
378 return p</string_value>
379 </python>
380 </value>
381 <output/>
382 <stat/>
383 <detectors>
384 <exclude_from_detectors/>
385 </detectors>
386 </prescribed>
387 </scalar_field>
388 <scalar_field name="ScalarAbsoluteDifference" rank="0">
389 <diagnostic field_name_b="Pressure" field_name_a="PressureAnalytical">
390 <algorithm name="Internal" material_phase_support="multiple"/>
391 <mesh name="PressureMesh"/>
392 <output/>
393 <stat/>
394 <convergence>
395 <include_in_convergence/>
396 </convergence>
397 <detectors>
398 <include_in_detectors/>
399 </detectors>
400 <steady_state>
401 <include_in_steady_state/>
402 </steady_state>
403 <relative_to_average/>
404 </diagnostic>
405 </scalar_field>
406 <scalar_field name="FiniteElementDivergence" rank="0">
407 <diagnostic field_name="Velocity">
408 <algorithm legacy="true" name="Internal" material_phase_support="multiple"/>
409 <mesh name="PressureMesh"/>
410 <integrate_divergence_by_parts/>
411 <solver>
412 <iterative_method name="cg"/>
413 <preconditioner name="sor"/>
414 <relative_error>
415 <real_value rank="0">1.E-10</real_value>
416 </relative_error>
417 <max_iterations>
418 <integer_value rank="0">10000</integer_value>
419 </max_iterations>
420 <never_ignore_solver_failures/>
421 <diagnostics>
422 <monitors/>
423 </diagnostics>
424 </solver>
425 <output/>
426 <stat/>
427 <convergence>
428 <include_in_convergence/>
429 </convergence>
430 <detectors>
431 <include_in_detectors/>
432 </detectors>
433 <steady_state>
434 <include_in_steady_state/>
435 </steady_state>
436 </diagnostic>
437 </scalar_field>
438 <vector_field name="VelocityAnalytical" rank="1">
439 <prescribed>
440 <mesh name="VelocityMesh"/>
441 <value name="WholeMesh">
442 <python>
443 <string_value lines="20" type="python">def val(X,t):
444 from math import sin, cos
445 # Shear rotation about origin.
446 return (sin(X[0])*cos(X[1]), -1.0*cos(X[0])*sin(X[1]))</string_value>
447 </python>
448 </value>
449 <output/>
450 <stat>
451 <include_in_stat/>
452 </stat>
453 <detectors>
454 <exclude_from_detectors/>
455 </detectors>
456 </prescribed>
457 </vector_field>
458 <vector_field name="VectorAbsoluteDifference" rank="1">
459 <diagnostic field_name_b="Velocity" field_name_a="VelocityAnalytical">
460 <algorithm name="Internal" material_phase_support="multiple"/>
461 <mesh name="VelocityMesh"/>
462 <output/>
463 <stat>
464 <include_in_stat/>
465 </stat>
466 <convergence>
467 <include_in_convergence/>
468 </convergence>
469 <detectors>
470 <include_in_detectors/>
471 </detectors>
472 <steady_state>
473 <include_in_steady_state/>
474 </steady_state>
475 </diagnostic>
476 </vector_field>
477 </material_phase>
478</fluidity_options>
4790
=== removed file 'tests/Stokes_mms_p0p1cv/MMS_B.flml'
--- tests/Stokes_mms_p0p1cv/MMS_B.flml 2010-11-21 15:41:35 +0000
+++ tests/Stokes_mms_p0p1cv/MMS_B.flml 1970-01-01 00:00:00 +0000
@@ -1,478 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<fluidity_options>
3 <simulation_name>
4 <string_value lines="1">MMS_B</string_value>
5 </simulation_name>
6 <problem_type>
7 <string_value lines="1">fluids</string_value>
8 </problem_type>
9 <geometry>
10 <dimension>
11 <integer_value rank="0">2</integer_value>
12 </dimension>
13 <mesh name="CoordinateMesh">
14 <from_mesh>
15 <mesh name="InputMesh"/>
16 <stat>
17 <exclude_from_stat/>
18 </stat>
19 </from_mesh>
20 </mesh>
21 <mesh name="VelocityMesh">
22 <from_mesh>
23 <mesh name="InputMesh"/>
24 <mesh_shape>
25 <polynomial_degree>
26 <integer_value rank="0">0</integer_value>
27 </polynomial_degree>
28 </mesh_shape>
29 <mesh_continuity>
30 <string_value>discontinuous</string_value>
31 </mesh_continuity>
32 <stat>
33 <exclude_from_stat/>
34 </stat>
35 </from_mesh>
36 </mesh>
37 <mesh name="PressureMesh">
38 <from_mesh>
39 <mesh name="InputMesh"/>
40 <stat>
41 <exclude_from_stat/>
42 </stat>
43 </from_mesh>
44 </mesh>
45 <mesh name="InputMesh">
46 <from_file file_name="MMS_B">
47 <format name="triangle"/>
48 <stat>
49 <include_in_stat/>
50 </stat>
51 </from_file>
52 </mesh>
53 <quadrature>
54 <degree>
55 <integer_value rank="0">4</integer_value>
56 </degree>
57 </quadrature>
58 </geometry>
59 <io>
60 <dump_format>
61 <string_value>vtk</string_value>
62 </dump_format>
63 <dump_period>
64 <constant>
65 <real_value rank="0">15.0</real_value>
66 </constant>
67 </dump_period>
68 <output_mesh name="VelocityMesh"/>
69 <checkpointing>
70 <checkpoint_period_in_dumps>
71 <integer_value rank="0">10000</integer_value>
72 </checkpoint_period_in_dumps>
73 <checkpoint_at_end/>
74 </checkpointing>
75 <stat/>
76 </io>
77 <timestepping>
78 <current_time>
79 <real_value rank="0">0.0</real_value>
80 </current_time>
81 <timestep>
82 <real_value rank="0">0.0040276830059454609</real_value>
83 <comment>gives a max cfl number of 0.1</comment>
84 </timestep>
85 <finish_time>
86 <real_value rank="0">10.0</real_value>
87 <comment>10.0</comment>
88 </finish_time>
89 <steady_state>
90 <tolerance>
91 <real_value rank="0">1.E-8</real_value>
92 <infinity_norm/>
93 </tolerance>
94 </steady_state>
95 </timestepping>
96 <physical_parameters/>
97 <material_phase name="NS">
98 <equation_of_state>
99 <fluids>
100 <linear>
101 <reference_density>
102 <real_value rank="0">1.0</real_value>
103 </reference_density>
104 </linear>
105 </fluids>
106 </equation_of_state>
107 <scalar_field name="Pressure" rank="0">
108 <prognostic>
109 <mesh name="PressureMesh"/>
110 <spatial_discretisation>
111 <control_volumes/>
112 </spatial_discretisation>
113 <reference_node>
114 <integer_value rank="0">1</integer_value>
115 </reference_node>
116 <scheme>
117 <poisson_pressure_solution>
118 <string_value lines="1">never</string_value>
119 </poisson_pressure_solution>
120 <use_projection_method>
121 <full_schur_complement>
122 <inner_matrix name="FullMomentumMatrix">
123 <solver>
124 <iterative_method name="cg"/>
125 <preconditioner name="sor"/>
126 <relative_error>
127 <real_value rank="0">1E-10</real_value>
128 </relative_error>
129 <max_iterations>
130 <integer_value rank="0">10000</integer_value>
131 </max_iterations>
132 <start_from_zero/>
133 <never_ignore_solver_failures/>
134 <diagnostics>
135 <monitors/>
136 </diagnostics>
137 </solver>
138 </inner_matrix>
139 <preconditioner_matrix name="DiagonalSchurComplement"/>
140 </full_schur_complement>
141 </use_projection_method>
142 </scheme>
143 <solver>
144 <iterative_method name="fgmres"/>
145 <preconditioner name="mg"/>
146 <relative_error>
147 <real_value rank="0">1.0e-07</real_value>
148 </relative_error>
149 <max_iterations>
150 <integer_value rank="0">10000</integer_value>
151 </max_iterations>
152 <never_ignore_solver_failures/>
153 <diagnostics>
154 <monitors/>
155 </diagnostics>
156 </solver>
157 <output>
158 <include_previous_time_step/>
159 </output>
160 <stat/>
161 <convergence>
162 <include_in_convergence/>
163 </convergence>
164 <detectors>
165 <exclude_from_detectors/>
166 </detectors>
167 <steady_state>
168 <include_in_steady_state/>
169 </steady_state>
170 <consistent_interpolation/>
171 </prognostic>
172 </scalar_field>
173 <scalar_field name="Density" rank="0">
174 <diagnostic>
175 <algorithm name="Internal" material_phase_support="multiple"/>
176 <mesh name="VelocityMesh"/>
177 <output/>
178 <stat/>
179 <convergence>
180 <include_in_convergence/>
181 </convergence>
182 <detectors>
183 <include_in_detectors/>
184 </detectors>
185 <steady_state>
186 <include_in_steady_state/>
187 </steady_state>
188 </diagnostic>
189 </scalar_field>
190 <vector_field name="Velocity" rank="1">
191 <prognostic>
192 <mesh name="VelocityMesh"/>
193 <equation name="LinearMomentum"/>
194 <spatial_discretisation>
195 <discontinuous_galerkin>
196 <mass_terms>
197 <exclude_mass_terms/>
198 </mass_terms>
199 <viscosity_scheme>
200 <bassi_rebay/>
201 </viscosity_scheme>
202 <advection_scheme>
203 <none/>
204 <integrate_advection_by_parts>
205 <twice/>
206 </integrate_advection_by_parts>
207 </advection_scheme>
208 </discontinuous_galerkin>
209 <conservative_advection>
210 <real_value rank="0">0.0</real_value>
211 </conservative_advection>
212 </spatial_discretisation>
213 <temporal_discretisation>
214 <theta>
215 <real_value rank="0">1</real_value>
216 </theta>
217 <relaxation>
218 <real_value rank="0">1</real_value>
219 </relaxation>
220 </temporal_discretisation>
221 <solver>
222 <iterative_method name="cg"/>
223 <preconditioner name="eisenstat"/>
224 <relative_error>
225 <real_value rank="0">1.E-07</real_value>
226 </relative_error>
227 <max_iterations>
228 <integer_value rank="0">10000</integer_value>
229 </max_iterations>
230 <never_ignore_solver_failures/>
231 <diagnostics>
232 <monitors/>
233 </diagnostics>
234 </solver>
235 <initial_condition name="WholeMesh">
236 <constant>
237 <real_value shape="2" dim1="dim" rank="1">0.0 0.0</real_value>
238 </constant>
239 </initial_condition>
240 <boundary_conditions name="all_sides">
241 <surface_ids>
242 <integer_value shape="4" rank="1">7 8 9 10</integer_value>
243 </surface_ids>
244 <type name="dirichlet">
245 <apply_weakly/>
246 <align_bc_with_cartesian>
247 <x_component>
248 <python>
249 <string_value lines="20" type="python">def val(X,t):
250 from math import sin, cos
251 # Shear rotation about origin.
252 u = sin(X[0])*cos(X[1])
253 return u</string_value>
254 </python>
255 </x_component>
256 <y_component>
257 <python>
258 <string_value lines="20" type="python">def val(X,t):
259 from math import sin, cos
260 # Shear rotation about origin.
261 v = -1.0*cos(X[0])*sin(X[1])
262 return v</string_value>
263 </python>
264 </y_component>
265 </align_bc_with_cartesian>
266 </type>
267 </boundary_conditions>
268 <tensor_field name="Viscosity" rank="2">
269 <prescribed>
270 <value name="WholeMesh">
271 <isotropic>
272 <constant>
273 <real_value rank="0">0.7</real_value>
274 </constant>
275 </isotropic>
276 </value>
277 <output/>
278 </prescribed>
279 </tensor_field>
280 <vector_field name="Source" rank="1">
281 <prescribed>
282 <value name="WholeMesh">
283 <python>
284 <string_value lines="20" type="python">def val(XX, t):
285 from math import sin,cos
286 nu = 0.7;
287 adv = 0.0;
288 beta = 0.0;
289 mass = 0.0;
290 rho = 1.0;
291 x = XX[0];
292 y = XX[1];
293 Su = adv*rho*(cos(x)*sin(x)*sin(y)**2 + cos(x)*sin(x)*cos(y)**2) + 2*nu*sin(x)*cos(y) - sin(x)*cos(y)
294 Sv = adv*rho*(sin(x)**2*cos(y)*sin(y) + cos(x)**2*cos(y)*sin(y)) - 2*nu*cos(x)*sin(y) - cos(x)*sin(y)
295 return (Su, Sv)</string_value>
296 <comment>u(x,y,rho,beta,nu,adv,mass,t) = sin(x)*cos(y)&#13;
297v(x,y,rho,beta,nu,adv,masst) = -cos(x)*sin(y)
298p(x,y,rho,beta,nu,adv,mass,t) = cos(x)*cos(y)&#13;
299
300u_t = diff(u,t)
301v_t = diff(v,t)
302
303u_x = diff(u,x)&#13;
304u_y = diff(u,y)
305v_x = diff(v,x)
306v_y = diff(v,y)
307
308p_x = diff(p,x)
309p_y = diff(p,y)
310&#13;
311u_xx = diff(u_x,x)
312u_yy = diff(u_y,y)
313v_xx = diff(v_x,x)
314v_yy = diff(v_y,y)
315
316mass*rho*u_t + adv*rho*(u*u_x+v*u_y + beta*(u*u_x + u*v_y)) + p_x - nu*u_xx - nu*u_yy
317mass*rho*v_t + adv*rho*(u*v_x+v*v_y + beta*(v*u_x + v*v_y)) + p_y - nu*v_xx - nu*v_yy</comment>
318 </python>
319 </value>
320 <output/>
321 <stat>
322 <include_in_stat/>
323 </stat>
324 <detectors>
325 <exclude_from_detectors/>
326 </detectors>
327 </prescribed>
328 </vector_field>
329 <output>
330 <include_previous_time_step/>
331 </output>
332 <stat>
333 <include_in_stat/>
334 <previous_time_step>
335 <exclude_from_stat/>
336 </previous_time_step>
337 <nonlinear_field>
338 <exclude_from_stat/>
339 </nonlinear_field>
340 </stat>
341 <convergence>
342 <include_in_convergence/>
343 </convergence>
344 <detectors>
345 <include_in_detectors/>
346 </detectors>
347 <steady_state>
348 <include_in_steady_state/>
349 </steady_state>
350 <consistent_interpolation/>
351 </prognostic>
352 </vector_field>
353 <scalar_field name="CFLNumber" rank="0">
354 <diagnostic>
355 <algorithm name="Internal" material_phase_support="multiple"/>
356 <mesh name="VelocityMesh"/>
357 <output/>
358 <stat/>
359 <convergence>
360 <include_in_convergence/>
361 </convergence>
362 <detectors>
363 <include_in_detectors/>
364 </detectors>
365 <steady_state>
366 <include_in_steady_state/>
367 </steady_state>
368 </diagnostic>
369 </scalar_field>
370 <scalar_field name="PressureAnalytical" rank="0">
371 <prescribed>
372 <mesh name="PressureMesh"/>
373 <value name="WholeMesh">
374 <python>
375 <string_value lines="20" type="python">def val(X,t):
376 from math import cos
377 p = cos(X[0])*cos(X[1])
378 return p</string_value>
379 </python>
380 </value>
381 <output/>
382 <stat/>
383 <detectors>
384 <exclude_from_detectors/>
385 </detectors>
386 </prescribed>
387 </scalar_field>
388 <scalar_field name="ScalarAbsoluteDifference" rank="0">
389 <diagnostic field_name_b="Pressure" field_name_a="PressureAnalytical">
390 <algorithm name="Internal" material_phase_support="multiple"/>
391 <mesh name="PressureMesh"/>
392 <output/>
393 <stat/>
394 <convergence>
395 <include_in_convergence/>
396 </convergence>
397 <detectors>
398 <include_in_detectors/>
399 </detectors>
400 <steady_state>
401 <include_in_steady_state/>
402 </steady_state>
403 <relative_to_average/>
404 </diagnostic>
405 </scalar_field>
406 <scalar_field name="FiniteElementDivergence" rank="0">
407 <diagnostic field_name="Velocity">
408 <algorithm legacy="true" name="Internal" material_phase_support="multiple"/>
409 <mesh name="PressureMesh"/>
410 <integrate_divergence_by_parts/>
411 <solver>
412 <iterative_method name="cg"/>
413 <preconditioner name="sor"/>
414 <relative_error>
415 <real_value rank="0">1.E-10</real_value>
416 </relative_error>
417 <max_iterations>
418 <integer_value rank="0">10000</integer_value>
419 </max_iterations>
420 <never_ignore_solver_failures/>
421 <diagnostics>
422 <monitors/>
423 </diagnostics>
424 </solver>
425 <output/>
426 <stat/>
427 <convergence>
428 <include_in_convergence/>
429 </convergence>
430 <detectors>
431 <include_in_detectors/>
432 </detectors>
433 <steady_state>
434 <include_in_steady_state/>
435 </steady_state>
436 </diagnostic>
437 </scalar_field>
438 <vector_field name="VelocityAnalytical" rank="1">
439 <prescribed>
440 <mesh name="VelocityMesh"/>
441 <value name="WholeMesh">
442 <python>
443 <string_value lines="20" type="python">def val(X,t):
444 from math import sin, cos
445 # Shear rotation about origin.
446 return (sin(X[0])*cos(X[1]), -1.0*cos(X[0])*sin(X[1]))</string_value>
447 </python>
448 </value>
449 <output/>
450 <stat>
451 <include_in_stat/>
452 </stat>
453 <detectors>
454 <exclude_from_detectors/>
455 </detectors>
456 </prescribed>
457 </vector_field>
458 <vector_field name="VectorAbsoluteDifference" rank="1">
459 <diagnostic field_name_b="Velocity" field_name_a="VelocityAnalytical">
460 <algorithm name="Internal" material_phase_support="multiple"/>
461 <mesh name="VelocityMesh"/>
462 <output/>
463 <stat>
464 <include_in_stat/>
465 </stat>
466 <convergence>
467 <include_in_convergence/>
468 </convergence>
469 <detectors>
470 <include_in_detectors/>
471 </detectors>
472 <steady_state>
473 <include_in_steady_state/>
474 </steady_state>
475 </diagnostic>
476 </vector_field>
477 </material_phase>
478</fluidity_options>
4790
=== removed file 'tests/Stokes_mms_p0p1cv/MMS_C.flml'
--- tests/Stokes_mms_p0p1cv/MMS_C.flml 2010-11-21 15:41:35 +0000
+++ tests/Stokes_mms_p0p1cv/MMS_C.flml 1970-01-01 00:00:00 +0000
@@ -1,478 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<fluidity_options>
3 <simulation_name>
4 <string_value lines="1">MMS_C</string_value>
5 </simulation_name>
6 <problem_type>
7 <string_value lines="1">fluids</string_value>
8 </problem_type>
9 <geometry>
10 <dimension>
11 <integer_value rank="0">2</integer_value>
12 </dimension>
13 <mesh name="CoordinateMesh">
14 <from_mesh>
15 <mesh name="InputMesh"/>
16 <stat>
17 <exclude_from_stat/>
18 </stat>
19 </from_mesh>
20 </mesh>
21 <mesh name="VelocityMesh">
22 <from_mesh>
23 <mesh name="InputMesh"/>
24 <mesh_shape>
25 <polynomial_degree>
26 <integer_value rank="0">0</integer_value>
27 </polynomial_degree>
28 </mesh_shape>
29 <mesh_continuity>
30 <string_value>discontinuous</string_value>
31 </mesh_continuity>
32 <stat>
33 <exclude_from_stat/>
34 </stat>
35 </from_mesh>
36 </mesh>
37 <mesh name="PressureMesh">
38 <from_mesh>
39 <mesh name="InputMesh"/>
40 <stat>
41 <exclude_from_stat/>
42 </stat>
43 </from_mesh>
44 </mesh>
45 <mesh name="InputMesh">
46 <from_file file_name="MMS_C">
47 <format name="triangle"/>
48 <stat>
49 <include_in_stat/>
50 </stat>
51 </from_file>
52 </mesh>
53 <quadrature>
54 <degree>
55 <integer_value rank="0">4</integer_value>
56 </degree>
57 </quadrature>
58 </geometry>
59 <io>
60 <dump_format>
61 <string_value>vtk</string_value>
62 </dump_format>
63 <dump_period>
64 <constant>
65 <real_value rank="0">15.0</real_value>
66 </constant>
67 </dump_period>
68 <output_mesh name="VelocityMesh"/>
69 <checkpointing>
70 <checkpoint_period_in_dumps>
71 <integer_value rank="0">10000</integer_value>
72 </checkpoint_period_in_dumps>
73 <checkpoint_at_end/>
74 </checkpointing>
75 <stat/>
76 </io>
77 <timestepping>
78 <current_time>
79 <real_value rank="0">0.0</real_value>
80 </current_time>
81 <timestep>
82 <real_value rank="0">0.0020011146041869813</real_value>
83 <comment>gives a max cfl number of 0.1</comment>
84 </timestep>
85 <finish_time>
86 <real_value rank="0">10.0</real_value>
87 <comment>10.0</comment>
88 </finish_time>
89 <steady_state>
90 <tolerance>
91 <real_value rank="0">1.E-8</real_value>
92 <infinity_norm/>
93 </tolerance>
94 </steady_state>
95 </timestepping>
96 <physical_parameters/>
97 <material_phase name="NS">
98 <equation_of_state>
99 <fluids>
100 <linear>
101 <reference_density>
102 <real_value rank="0">1.0</real_value>
103 </reference_density>
104 </linear>
105 </fluids>
106 </equation_of_state>
107 <scalar_field name="Pressure" rank="0">
108 <prognostic>
109 <mesh name="PressureMesh"/>
110 <spatial_discretisation>
111 <control_volumes/>
112 </spatial_discretisation>
113 <reference_node>
114 <integer_value rank="0">1</integer_value>
115 </reference_node>
116 <scheme>
117 <poisson_pressure_solution>
118 <string_value lines="1">never</string_value>
119 </poisson_pressure_solution>
120 <use_projection_method>
121 <full_schur_complement>
122 <inner_matrix name="FullMomentumMatrix">
123 <solver>
124 <iterative_method name="cg"/>
125 <preconditioner name="sor"/>
126 <relative_error>
127 <real_value rank="0">1E-10</real_value>
128 </relative_error>
129 <max_iterations>
130 <integer_value rank="0">10000</integer_value>
131 </max_iterations>
132 <start_from_zero/>
133 <never_ignore_solver_failures/>
134 <diagnostics>
135 <monitors/>
136 </diagnostics>
137 </solver>
138 </inner_matrix>
139 <preconditioner_matrix name="DiagonalSchurComplement"/>
140 </full_schur_complement>
141 </use_projection_method>
142 </scheme>
143 <solver>
144 <iterative_method name="fgmres"/>
145 <preconditioner name="mg"/>
146 <relative_error>
147 <real_value rank="0">1.0e-07</real_value>
148 </relative_error>
149 <max_iterations>
150 <integer_value rank="0">10000</integer_value>
151 </max_iterations>
152 <never_ignore_solver_failures/>
153 <diagnostics>
154 <monitors/>
155 </diagnostics>
156 </solver>
157 <output>
158 <include_previous_time_step/>
159 </output>
160 <stat/>
161 <convergence>
162 <include_in_convergence/>
163 </convergence>
164 <detectors>
165 <exclude_from_detectors/>
166 </detectors>
167 <steady_state>
168 <include_in_steady_state/>
169 </steady_state>
170 <consistent_interpolation/>
171 </prognostic>
172 </scalar_field>
173 <scalar_field name="Density" rank="0">
174 <diagnostic>
175 <algorithm name="Internal" material_phase_support="multiple"/>
176 <mesh name="VelocityMesh"/>
177 <output/>
178 <stat/>
179 <convergence>
180 <include_in_convergence/>
181 </convergence>
182 <detectors>
183 <include_in_detectors/>
184 </detectors>
185 <steady_state>
186 <include_in_steady_state/>
187 </steady_state>
188 </diagnostic>
189 </scalar_field>
190 <vector_field name="Velocity" rank="1">
191 <prognostic>
192 <mesh name="VelocityMesh"/>
193 <equation name="LinearMomentum"/>
194 <spatial_discretisation>
195 <discontinuous_galerkin>
196 <mass_terms>
197 <exclude_mass_terms/>
198 </mass_terms>
199 <viscosity_scheme>
200 <bassi_rebay/>
201 </viscosity_scheme>
202 <advection_scheme>
203 <none/>
204 <integrate_advection_by_parts>
205 <twice/>
206 </integrate_advection_by_parts>
207 </advection_scheme>
208 </discontinuous_galerkin>
209 <conservative_advection>
210 <real_value rank="0">0.0</real_value>
211 </conservative_advection>
212 </spatial_discretisation>
213 <temporal_discretisation>
214 <theta>
215 <real_value rank="0">1</real_value>
216 </theta>
217 <relaxation>
218 <real_value rank="0">1</real_value>
219 </relaxation>
220 </temporal_discretisation>
221 <solver>
222 <iterative_method name="cg"/>
223 <preconditioner name="eisenstat"/>
224 <relative_error>
225 <real_value rank="0">1.E-07</real_value>
226 </relative_error>
227 <max_iterations>
228 <integer_value rank="0">10000</integer_value>
229 </max_iterations>
230 <never_ignore_solver_failures/>
231 <diagnostics>
232 <monitors/>
233 </diagnostics>
234 </solver>
235 <initial_condition name="WholeMesh">
236 <constant>
237 <real_value shape="2" dim1="dim" rank="1">0.0 0.0</real_value>
238 </constant>
239 </initial_condition>
240 <boundary_conditions name="all_sides">
241 <surface_ids>
242 <integer_value shape="4" rank="1">7 8 9 10</integer_value>
243 </surface_ids>
244 <type name="dirichlet">
245 <apply_weakly/>
246 <align_bc_with_cartesian>
247 <x_component>
248 <python>
249 <string_value lines="20" type="python">def val(X,t):
250 from math import sin, cos
251 # Shear rotation about origin.
252 u = sin(X[0])*cos(X[1])
253 return u</string_value>
254 </python>
255 </x_component>
256 <y_component>
257 <python>
258 <string_value lines="20" type="python">def val(X,t):
259 from math import sin, cos
260 # Shear rotation about origin.
261 v = -1.0*cos(X[0])*sin(X[1])
262 return v</string_value>
263 </python>
264 </y_component>
265 </align_bc_with_cartesian>
266 </type>
267 </boundary_conditions>
268 <tensor_field name="Viscosity" rank="2">
269 <prescribed>
270 <value name="WholeMesh">
271 <isotropic>
272 <constant>
273 <real_value rank="0">0.7</real_value>
274 </constant>
275 </isotropic>
276 </value>
277 <output/>
278 </prescribed>
279 </tensor_field>
280 <vector_field name="Source" rank="1">
281 <prescribed>
282 <value name="WholeMesh">
283 <python>
284 <string_value lines="20" type="python">def val(XX, t):
285 from math import sin,cos
286 nu = 0.7;
287 adv = 0.0;
288 beta = 0.0;
289 mass = 0.0;
290 rho = 1.0;
291 x = XX[0];
292 y = XX[1];
293 Su = adv*rho*(cos(x)*sin(x)*sin(y)**2 + cos(x)*sin(x)*cos(y)**2) + 2*nu*sin(x)*cos(y) - sin(x)*cos(y)
294 Sv = adv*rho*(sin(x)**2*cos(y)*sin(y) + cos(x)**2*cos(y)*sin(y)) - 2*nu*cos(x)*sin(y) - cos(x)*sin(y)
295 return (Su, Sv)</string_value>
296 <comment>u(x,y,rho,beta,nu,adv,mass,t) = sin(x)*cos(y)&#13;
297v(x,y,rho,beta,nu,adv,masst) = -cos(x)*sin(y)
298p(x,y,rho,beta,nu,adv,mass,t) = cos(x)*cos(y)&#13;
299
300u_t = diff(u,t)
301v_t = diff(v,t)
302
303u_x = diff(u,x)&#13;
304u_y = diff(u,y)
305v_x = diff(v,x)
306v_y = diff(v,y)
307
308p_x = diff(p,x)
309p_y = diff(p,y)
310&#13;
311u_xx = diff(u_x,x)
312u_yy = diff(u_y,y)
313v_xx = diff(v_x,x)
314v_yy = diff(v_y,y)
315
316mass*rho*u_t + adv*rho*(u*u_x+v*u_y + beta*(u*u_x + u*v_y)) + p_x - nu*u_xx - nu*u_yy
317mass*rho*v_t + adv*rho*(u*v_x+v*v_y + beta*(v*u_x + v*v_y)) + p_y - nu*v_xx - nu*v_yy</comment>
318 </python>
319 </value>
320 <output/>
321 <stat>
322 <include_in_stat/>
323 </stat>
324 <detectors>
325 <exclude_from_detectors/>
326 </detectors>
327 </prescribed>
328 </vector_field>
329 <output>
330 <include_previous_time_step/>
331 </output>
332 <stat>
333 <include_in_stat/>
334 <previous_time_step>
335 <exclude_from_stat/>
336 </previous_time_step>
337 <nonlinear_field>
338 <exclude_from_stat/>
339 </nonlinear_field>
340 </stat>
341 <convergence>
342 <include_in_convergence/>
343 </convergence>
344 <detectors>
345 <include_in_detectors/>
346 </detectors>
347 <steady_state>
348 <include_in_steady_state/>
349 </steady_state>
350 <consistent_interpolation/>
351 </prognostic>
352 </vector_field>
353 <scalar_field name="CFLNumber" rank="0">
354 <diagnostic>
355 <algorithm name="Internal" material_phase_support="multiple"/>
356 <mesh name="VelocityMesh"/>
357 <output/>
358 <stat/>
359 <convergence>
360 <include_in_convergence/>
361 </convergence>
362 <detectors>
363 <include_in_detectors/>
364 </detectors>
365 <steady_state>
366 <include_in_steady_state/>
367 </steady_state>
368 </diagnostic>
369 </scalar_field>
370 <scalar_field name="PressureAnalytical" rank="0">
371 <prescribed>
372 <mesh name="PressureMesh"/>
373 <value name="WholeMesh">
374 <python>
375 <string_value lines="20" type="python">def val(X,t):
376 from math import cos
377 p = cos(X[0])*cos(X[1])
378 return p</string_value>
379 </python>
380 </value>
381 <output/>
382 <stat/>
383 <detectors>
384 <exclude_from_detectors/>
385 </detectors>
386 </prescribed>
387 </scalar_field>
388 <scalar_field name="ScalarAbsoluteDifference" rank="0">
389 <diagnostic field_name_b="Pressure" field_name_a="PressureAnalytical">
390 <algorithm name="Internal" material_phase_support="multiple"/>
391 <mesh name="PressureMesh"/>
392 <output/>
393 <stat/>
394 <convergence>
395 <include_in_convergence/>
396 </convergence>
397 <detectors>
398 <include_in_detectors/>
399 </detectors>
400 <steady_state>
401 <include_in_steady_state/>
402 </steady_state>
403 <relative_to_average/>
404 </diagnostic>
405 </scalar_field>
406 <scalar_field name="FiniteElementDivergence" rank="0">
407 <diagnostic field_name="Velocity">
408 <algorithm legacy="true" name="Internal" material_phase_support="multiple"/>
409 <mesh name="PressureMesh"/>
410 <integrate_divergence_by_parts/>
411 <solver>
412 <iterative_method name="cg"/>
413 <preconditioner name="sor"/>
414 <relative_error>
415 <real_value rank="0">1.E-10</real_value>
416 </relative_error>
417 <max_iterations>
418 <integer_value rank="0">10000</integer_value>
419 </max_iterations>
420 <never_ignore_solver_failures/>
421 <diagnostics>
422 <monitors/>
423 </diagnostics>
424 </solver>
425 <output/>
426 <stat/>
427 <convergence>
428 <include_in_convergence/>
429 </convergence>
430 <detectors>
431 <include_in_detectors/>
432 </detectors>
433 <steady_state>
434 <include_in_steady_state/>
435 </steady_state>
436 </diagnostic>
437 </scalar_field>
438 <vector_field name="VelocityAnalytical" rank="1">
439 <prescribed>
440 <mesh name="VelocityMesh"/>
441 <value name="WholeMesh">
442 <python>
443 <string_value lines="20" type="python">def val(X,t):
444 from math import sin, cos
445 # Shear rotation about origin.
446 return (sin(X[0])*cos(X[1]), -1.0*cos(X[0])*sin(X[1]))</string_value>
447 </python>
448 </value>
449 <output/>
450 <stat>
451 <include_in_stat/>
452 </stat>
453 <detectors>
454 <exclude_from_detectors/>
455 </detectors>
456 </prescribed>
457 </vector_field>
458 <vector_field name="VectorAbsoluteDifference" rank="1">
459 <diagnostic field_name_b="Velocity" field_name_a="VelocityAnalytical">
460 <algorithm name="Internal" material_phase_support="multiple"/>
461 <mesh name="VelocityMesh"/>
462 <output/>
463 <stat>
464 <include_in_stat/>
465 </stat>
466 <convergence>
467 <include_in_convergence/>
468 </convergence>
469 <detectors>
470 <include_in_detectors/>
471 </detectors>
472 <steady_state>
473 <include_in_steady_state/>
474 </steady_state>
475 </diagnostic>
476 </vector_field>
477 </material_phase>
478</fluidity_options>
4790
=== removed file 'tests/Stokes_mms_p0p1cv/MMS_D.flml'
--- tests/Stokes_mms_p0p1cv/MMS_D.flml 2010-11-21 15:41:35 +0000
+++ tests/Stokes_mms_p0p1cv/MMS_D.flml 1970-01-01 00:00:00 +0000
@@ -1,478 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<fluidity_options>
3 <simulation_name>
4 <string_value lines="1">MMS_D</string_value>
5 </simulation_name>
6 <problem_type>
7 <string_value lines="1">fluids</string_value>
8 </problem_type>
9 <geometry>
10 <dimension>
11 <integer_value rank="0">2</integer_value>
12 </dimension>
13 <mesh name="CoordinateMesh">
14 <from_mesh>
15 <mesh name="InputMesh"/>
16 <stat>
17 <exclude_from_stat/>
18 </stat>
19 </from_mesh>
20 </mesh>
21 <mesh name="VelocityMesh">
22 <from_mesh>
23 <mesh name="InputMesh"/>
24 <mesh_shape>
25 <polynomial_degree>
26 <integer_value rank="0">0</integer_value>
27 </polynomial_degree>
28 </mesh_shape>
29 <mesh_continuity>
30 <string_value>discontinuous</string_value>
31 </mesh_continuity>
32 <stat>
33 <exclude_from_stat/>
34 </stat>
35 </from_mesh>
36 </mesh>
37 <mesh name="PressureMesh">
38 <from_mesh>
39 <mesh name="InputMesh"/>
40 <stat>
41 <exclude_from_stat/>
42 </stat>
43 </from_mesh>
44 </mesh>
45 <mesh name="InputMesh">
46 <from_file file_name="MMS_D">
47 <format name="triangle"/>
48 <stat>
49 <include_in_stat/>
50 </stat>
51 </from_file>
52 </mesh>
53 <quadrature>
54 <degree>
55 <integer_value rank="0">4</integer_value>
56 </degree>
57 </quadrature>
58 </geometry>
59 <io>
60 <dump_format>
61 <string_value>vtk</string_value>
62 </dump_format>
63 <dump_period>
64 <constant>
65 <real_value rank="0">15.0</real_value>
66 </constant>
67 </dump_period>
68 <output_mesh name="VelocityMesh"/>
69 <checkpointing>
70 <checkpoint_period_in_dumps>
71 <integer_value rank="0">10000</integer_value>
72 </checkpoint_period_in_dumps>
73 <checkpoint_at_end/>
74 </checkpointing>
75 <stat/>
76 </io>
77 <timestepping>
78 <current_time>
79 <real_value rank="0">0.0</real_value>
80 </current_time>
81 <timestep>
82 <real_value rank="0">0.00073714354843638517</real_value>
83 <comment>gives a max cfl number of 0.1</comment>
84 </timestep>
85 <finish_time>
86 <real_value rank="0">10.0</real_value>
87 <comment>10.0</comment>
88 </finish_time>
89 <steady_state>
90 <tolerance>
91 <real_value rank="0">1.E-8</real_value>
92 <infinity_norm/>
93 </tolerance>
94 </steady_state>
95 </timestepping>
96 <physical_parameters/>
97 <material_phase name="NS">
98 <equation_of_state>
99 <fluids>
100 <linear>
101 <reference_density>
102 <real_value rank="0">1.0</real_value>
103 </reference_density>
104 </linear>
105 </fluids>
106 </equation_of_state>
107 <scalar_field name="Pressure" rank="0">
108 <prognostic>
109 <mesh name="PressureMesh"/>
110 <spatial_discretisation>
111 <control_volumes/>
112 </spatial_discretisation>
113 <reference_node>
114 <integer_value rank="0">1</integer_value>
115 </reference_node>
116 <scheme>
117 <poisson_pressure_solution>
118 <string_value lines="1">never</string_value>
119 </poisson_pressure_solution>
120 <use_projection_method>
121 <full_schur_complement>
122 <inner_matrix name="FullMomentumMatrix">
123 <solver>
124 <iterative_method name="cg"/>
125 <preconditioner name="sor"/>
126 <relative_error>
127 <real_value rank="0">1E-10</real_value>
128 </relative_error>
129 <max_iterations>
130 <integer_value rank="0">10000</integer_value>
131 </max_iterations>
132 <start_from_zero/>
133 <never_ignore_solver_failures/>
134 <diagnostics>
135 <monitors/>
136 </diagnostics>
137 </solver>
138 </inner_matrix>
139 <preconditioner_matrix name="DiagonalSchurComplement"/>
140 </full_schur_complement>
141 </use_projection_method>
142 </scheme>
143 <solver>
144 <iterative_method name="fgmres"/>
145 <preconditioner name="mg"/>
146 <relative_error>
147 <real_value rank="0">1.0e-07</real_value>
148 </relative_error>
149 <max_iterations>
150 <integer_value rank="0">10000</integer_value>
151 </max_iterations>
152 <never_ignore_solver_failures/>
153 <diagnostics>
154 <monitors/>
155 </diagnostics>
156 </solver>
157 <output>
158 <include_previous_time_step/>
159 </output>
160 <stat/>
161 <convergence>
162 <include_in_convergence/>
163 </convergence>
164 <detectors>
165 <exclude_from_detectors/>
166 </detectors>
167 <steady_state>
168 <include_in_steady_state/>
169 </steady_state>
170 <consistent_interpolation/>
171 </prognostic>
172 </scalar_field>
173 <scalar_field name="Density" rank="0">
174 <diagnostic>
175 <algorithm name="Internal" material_phase_support="multiple"/>
176 <mesh name="VelocityMesh"/>
177 <output/>
178 <stat/>
179 <convergence>
180 <include_in_convergence/>
181 </convergence>
182 <detectors>
183 <include_in_detectors/>
184 </detectors>
185 <steady_state>
186 <include_in_steady_state/>
187 </steady_state>
188 </diagnostic>
189 </scalar_field>
190 <vector_field name="Velocity" rank="1">
191 <prognostic>
192 <mesh name="VelocityMesh"/>
193 <equation name="LinearMomentum"/>
194 <spatial_discretisation>
195 <discontinuous_galerkin>
196 <mass_terms>
197 <exclude_mass_terms/>
198 </mass_terms>
199 <viscosity_scheme>
200 <bassi_rebay/>
201 </viscosity_scheme>
202 <advection_scheme>
203 <none/>
204 <integrate_advection_by_parts>
205 <twice/>
206 </integrate_advection_by_parts>
207 </advection_scheme>
208 </discontinuous_galerkin>
209 <conservative_advection>
210 <real_value rank="0">0.0</real_value>
211 </conservative_advection>
212 </spatial_discretisation>
213 <temporal_discretisation>
214 <theta>
215 <real_value rank="0">1</real_value>
216 </theta>
217 <relaxation>
218 <real_value rank="0">1</real_value>
219 </relaxation>
220 </temporal_discretisation>
221 <solver>
222 <iterative_method name="cg"/>
223 <preconditioner name="eisenstat"/>
224 <relative_error>
225 <real_value rank="0">1.E-07</real_value>
226 </relative_error>
227 <max_iterations>
228 <integer_value rank="0">10000</integer_value>
229 </max_iterations>
230 <never_ignore_solver_failures/>
231 <diagnostics>
232 <monitors/>
233 </diagnostics>
234 </solver>
235 <initial_condition name="WholeMesh">
236 <constant>
237 <real_value shape="2" dim1="dim" rank="1">0.0 0.0</real_value>
238 </constant>
239 </initial_condition>
240 <boundary_conditions name="all_sides">
241 <surface_ids>
242 <integer_value shape="4" rank="1">7 8 9 10</integer_value>
243 </surface_ids>
244 <type name="dirichlet">
245 <apply_weakly/>
246 <align_bc_with_cartesian>
247 <x_component>
248 <python>
249 <string_value lines="20" type="python">def val(X,t):
250 from math import sin, cos
251 # Shear rotation about origin.
252 u = sin(X[0])*cos(X[1])
253 return u</string_value>
254 </python>
255 </x_component>
256 <y_component>
257 <python>
258 <string_value lines="20" type="python">def val(X,t):
259 from math import sin, cos
260 # Shear rotation about origin.
261 v = -1.0*cos(X[0])*sin(X[1])
262 return v</string_value>
263 </python>
264 </y_component>
265 </align_bc_with_cartesian>
266 </type>
267 </boundary_conditions>
268 <tensor_field name="Viscosity" rank="2">
269 <prescribed>
270 <value name="WholeMesh">
271 <isotropic>
272 <constant>
273 <real_value rank="0">0.7</real_value>
274 </constant>
275 </isotropic>
276 </value>
277 <output/>
278 </prescribed>
279 </tensor_field>
280 <vector_field name="Source" rank="1">
281 <prescribed>
282 <value name="WholeMesh">
283 <python>
284 <string_value lines="20" type="python">def val(XX, t):
285 from math import sin,cos
286 nu = 0.7;
287 adv = 0.0;
288 beta = 0.0;
289 mass = 0.0;
290 rho = 1.0;
291 x = XX[0];
292 y = XX[1];
293 Su = adv*rho*(cos(x)*sin(x)*sin(y)**2 + cos(x)*sin(x)*cos(y)**2) + 2*nu*sin(x)*cos(y) - sin(x)*cos(y)
294 Sv = adv*rho*(sin(x)**2*cos(y)*sin(y) + cos(x)**2*cos(y)*sin(y)) - 2*nu*cos(x)*sin(y) - cos(x)*sin(y)
295 return (Su, Sv)</string_value>
296 <comment>u(x,y,rho,beta,nu,adv,mass,t) = sin(x)*cos(y)&#13;
297v(x,y,rho,beta,nu,adv,masst) = -cos(x)*sin(y)
298p(x,y,rho,beta,nu,adv,mass,t) = cos(x)*cos(y)&#13;
299
300u_t = diff(u,t)
301v_t = diff(v,t)
302
303u_x = diff(u,x)&#13;
304u_y = diff(u,y)
305v_x = diff(v,x)
306v_y = diff(v,y)
307
308p_x = diff(p,x)
309p_y = diff(p,y)
310&#13;
311u_xx = diff(u_x,x)
312u_yy = diff(u_y,y)
313v_xx = diff(v_x,x)
314v_yy = diff(v_y,y)
315
316mass*rho*u_t + adv*rho*(u*u_x+v*u_y + beta*(u*u_x + u*v_y)) + p_x - nu*u_xx - nu*u_yy
317mass*rho*v_t + adv*rho*(u*v_x+v*v_y + beta*(v*u_x + v*v_y)) + p_y - nu*v_xx - nu*v_yy</comment>
318 </python>
319 </value>
320 <output/>
321 <stat>
322 <include_in_stat/>
323 </stat>
324 <detectors>
325 <exclude_from_detectors/>
326 </detectors>
327 </prescribed>
328 </vector_field>
329 <output>
330 <include_previous_time_step/>
331 </output>
332 <stat>
333 <include_in_stat/>
334 <previous_time_step>
335 <exclude_from_stat/>
336 </previous_time_step>
337 <nonlinear_field>
338 <exclude_from_stat/>
339 </nonlinear_field>
340 </stat>
341 <convergence>
342 <include_in_convergence/>
343 </convergence>
344 <detectors>
345 <include_in_detectors/>
346 </detectors>
347 <steady_state>
348 <include_in_steady_state/>
349 </steady_state>
350 <consistent_interpolation/>
351 </prognostic>
352 </vector_field>
353 <scalar_field name="CFLNumber" rank="0">
354 <diagnostic>
355 <algorithm name="Internal" material_phase_support="multiple"/>
356 <mesh name="VelocityMesh"/>
357 <output/>
358 <stat/>
359 <convergence>
360 <include_in_convergence/>
361 </convergence>
362 <detectors>
363 <include_in_detectors/>
364 </detectors>
365 <steady_state>
366 <include_in_steady_state/>
367 </steady_state>
368 </diagnostic>
369 </scalar_field>
370 <scalar_field name="PressureAnalytical" rank="0">
371 <prescribed>
372 <mesh name="PressureMesh"/>
373 <value name="WholeMesh">
374 <python>
375 <string_value lines="20" type="python">def val(X,t):
376 from math import cos
377 p = cos(X[0])*cos(X[1])
378 return p</string_value>
379 </python>
380 </value>
381 <output/>
382 <stat/>
383 <detectors>
384 <exclude_from_detectors/>
385 </detectors>
386 </prescribed>
387 </scalar_field>
388 <scalar_field name="ScalarAbsoluteDifference" rank="0">
389 <diagnostic field_name_b="Pressure" field_name_a="PressureAnalytical">
390 <algorithm name="Internal" material_phase_support="multiple"/>
391 <mesh name="PressureMesh"/>
392 <output/>
393 <stat/>
394 <convergence>
395 <include_in_convergence/>
396 </convergence>
397 <detectors>
398 <include_in_detectors/>
399 </detectors>
400 <steady_state>
401 <include_in_steady_state/>
402 </steady_state>
403 <relative_to_average/>
404 </diagnostic>
405 </scalar_field>
406 <scalar_field name="FiniteElementDivergence" rank="0">
407 <diagnostic field_name="Velocity">
408 <algorithm legacy="true" name="Internal" material_phase_support="multiple"/>
409 <mesh name="PressureMesh"/>
410 <integrate_divergence_by_parts/>
411 <solver>
412 <iterative_method name="cg"/>
413 <preconditioner name="sor"/>
414 <relative_error>
415 <real_value rank="0">1.E-10</real_value>
416 </relative_error>
417 <max_iterations>
418 <integer_value rank="0">10000</integer_value>
419 </max_iterations>
420 <never_ignore_solver_failures/>
421 <diagnostics>
422 <monitors/>
423 </diagnostics>
424 </solver>
425 <output/>
426 <stat/>
427 <convergence>
428 <include_in_convergence/>
429 </convergence>
430 <detectors>
431 <include_in_detectors/>
432 </detectors>
433 <steady_state>
434 <include_in_steady_state/>
435 </steady_state>
436 </diagnostic>
437 </scalar_field>
438 <vector_field name="VelocityAnalytical" rank="1">
439 <prescribed>
440 <mesh name="VelocityMesh"/>
441 <value name="WholeMesh">
442 <python>
443 <string_value lines="20" type="python">def val(X,t):
444 from math import sin, cos
445 # Shear rotation about origin.
446 return (sin(X[0])*cos(X[1]), -1.0*cos(X[0])*sin(X[1]))</string_value>
447 </python>
448 </value>
449 <output/>
450 <stat>
451 <include_in_stat/>
452 </stat>
453 <detectors>
454 <exclude_from_detectors/>
455 </detectors>
456 </prescribed>
457 </vector_field>
458 <vector_field name="VectorAbsoluteDifference" rank="1">
459 <diagnostic field_name_b="Velocity" field_name_a="VelocityAnalytical">
460 <algorithm name="Internal" material_phase_support="multiple"/>
461 <mesh name="VelocityMesh"/>
462 <output/>
463 <stat>
464 <include_in_stat/>
465 </stat>
466 <convergence>
467 <include_in_convergence/>
468 </convergence>
469 <detectors>
470 <include_in_detectors/>
471 </detectors>
472 <steady_state>
473 <include_in_steady_state/>
474 </steady_state>
475 </diagnostic>
476 </vector_field>
477 </material_phase>
478</fluidity_options>
4790
=== removed file 'tests/Stokes_mms_p0p1cv/Makefile'
--- tests/Stokes_mms_p0p1cv/Makefile 2011-10-21 10:05:25 +0000
+++ tests/Stokes_mms_p0p1cv/Makefile 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1input: clean
2 ../../bin/gmsh2triangle --2d src/MMS_A.msh
3 ../../bin/gmsh2triangle --2d src/MMS_B.msh
4 ../../bin/gmsh2triangle --2d src/MMS_C.msh
5 ../../bin/gmsh2triangle --2d src/MMS_D.msh
6
7clean:
8 rm -f *.vtu *.stat *.s *.log *.node *.ele *.edge *checkpoint*
90
=== removed file 'tests/Stokes_mms_p0p1cv/Stokes_mms_p0p1cv.xml'
--- tests/Stokes_mms_p0p1cv/Stokes_mms_p0p1cv.xml 2011-10-21 10:05:25 +0000
+++ tests/Stokes_mms_p0p1cv/Stokes_mms_p0p1cv.xml 1970-01-01 00:00:00 +0000
@@ -1,301 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<testproblem>
3 <name>p0p1cv stokes spatial convergence test</name>
4 <owner userid="rhodrid"/>
5 <tags>flml</tags>
6 <problem_definition length="special" nprocs="1">
7 <command_line>fluidity -v2 -l MMS_A.flml &amp;&amp; fluidity MMS_B.flml &amp;&amp; fluidity MMS_C.flml &amp;&amp; fluidity MMS_D.flml </command_line>
8 </problem_definition>
9 <variables>
10 <variable name="ab_convergence_vel" language="python">
11from fluidity_tools import stat_parser as stat
12from math import log
13
14a_error_x = stat("MMS_A.stat")["NS"]["VectorAbsoluteDifference%1"]["l2norm"][-1]
15b_error_x = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%1"]["l2norm"][-1]
16a_error_y = stat("MMS_A.stat")["NS"]["VectorAbsoluteDifference%2"]["l2norm"][-1]
17b_error_y = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%2"]["l2norm"][-1]
18
19a_error_inf_x = stat("MMS_A.stat")["NS"]["VectorAbsoluteDifference%1"]["max"][-1]
20b_error_inf_x = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%1"]["max"][-1]
21a_error_inf_y = stat("MMS_A.stat")["NS"]["VectorAbsoluteDifference%2"]["max"][-1]
22b_error_inf_y = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%2"]["max"][-1]
23
24print a_error_x
25print b_error_x
26print a_error_y
27print b_error_y
28
29print a_error_inf_x
30print b_error_inf_x
31print a_error_inf_y
32print b_error_inf_y
33
34ab_ratio_x = a_error_x / b_error_x
35ab_ratio_y = a_error_y / b_error_y
36ab_ratio_inf_x = a_error_inf_x / b_error_inf_x
37ab_ratio_inf_y = a_error_inf_y / b_error_inf_y
38ab_convergence_vel = [[log(ab_ratio_x, 2), log(ab_ratio_inf_x, 2)], [log(ab_ratio_y, 2), log(ab_ratio_inf_y, 2)]]
39 </variable>
40 <variable name="ab_convergence_p" language="python">
41from fluidity_tools import stat_parser as stat
42from math import log
43
44a_error = stat("MMS_A.stat")["NS"]["ScalarAbsoluteDifference"]["l2norm"][-1]
45b_error = stat("MMS_B.stat")["NS"]["ScalarAbsoluteDifference"]["l2norm"][-1]
46
47a_error_inf = stat("MMS_A.stat")["NS"]["ScalarAbsoluteDifference"]["max"][-1]
48b_error_inf = stat("MMS_B.stat")["NS"]["ScalarAbsoluteDifference"]["max"][-1]
49
50print a_error
51print b_error
52
53print a_error_inf
54print b_error_inf
55
56ab_ratio = a_error / b_error
57ab_ratio_inf = a_error_inf / b_error_inf
58ab_convergence_p = [log(ab_ratio, 2), log(ab_ratio_inf, 2)]
59 </variable>
60 <variable name="bc_convergence_vel" language="python">
61from fluidity_tools import stat_parser as stat
62from math import log
63
64b_error_x = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%1"]["l2norm"][-1]
65c_error_x = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%1"]["l2norm"][-1]
66b_error_y = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%2"]["l2norm"][-1]
67c_error_y = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%2"]["l2norm"][-1]
68
69b_error_inf_x = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%1"]["max"][-1]
70c_error_inf_x = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%1"]["max"][-1]
71b_error_inf_y = stat("MMS_B.stat")["NS"]["VectorAbsoluteDifference%2"]["max"][-1]
72c_error_inf_y = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%2"]["max"][-1]
73
74print b_error_x
75print c_error_x
76print b_error_y
77print c_error_y
78
79print b_error_inf_x
80print c_error_inf_x
81print b_error_inf_y
82print c_error_inf_y
83
84bc_ratio_x = b_error_x / c_error_x
85bc_ratio_y = b_error_y / c_error_y
86bc_ratio_inf_x = b_error_inf_x / c_error_inf_x
87bc_ratio_inf_y = b_error_inf_y / c_error_inf_y
88bc_convergence_vel = [[log(bc_ratio_x, 2), log(bc_ratio_inf_x, 2)], [log(bc_ratio_y, 2), log(bc_ratio_inf_y, 2)]]
89 </variable>
90 <variable name="bc_convergence_p" language="python">
91from fluidity_tools import stat_parser as stat
92from math import log
93
94b_error = stat("MMS_B.stat")["NS"]["ScalarAbsoluteDifference"]["l2norm"][-1]
95c_error = stat("MMS_C.stat")["NS"]["ScalarAbsoluteDifference"]["l2norm"][-1]
96
97b_error_inf = stat("MMS_B.stat")["NS"]["ScalarAbsoluteDifference"]["max"][-1]
98c_error_inf = stat("MMS_C.stat")["NS"]["ScalarAbsoluteDifference"]["max"][-1]
99
100print b_error
101print c_error
102
103print b_error_inf
104print c_error_inf
105
106bc_ratio = b_error / c_error
107bc_ratio_inf = b_error_inf / c_error_inf
108bc_convergence_p = [log(bc_ratio, 2), log(bc_ratio_inf, 2)]
109 </variable>
110 <variable name="cd_convergence_vel" language="python">
111from fluidity_tools import stat_parser as stat
112from math import log
113
114c_error_x = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%1"]["l2norm"][-1]
115d_error_x = stat("MMS_D.stat")["NS"]["VectorAbsoluteDifference%1"]["l2norm"][-1]
116c_error_y = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%2"]["l2norm"][-1]
117d_error_y = stat("MMS_D.stat")["NS"]["VectorAbsoluteDifference%2"]["l2norm"][-1]
118
119c_error_inf_x = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%1"]["max"][-1]
120d_error_inf_x = stat("MMS_D.stat")["NS"]["VectorAbsoluteDifference%1"]["max"][-1]
121c_error_inf_y = stat("MMS_C.stat")["NS"]["VectorAbsoluteDifference%2"]["max"][-1]
122d_error_inf_y = stat("MMS_D.stat")["NS"]["VectorAbsoluteDifference%2"]["max"][-1]
123
124print c_error_x
125print d_error_x
126print c_error_y
127print d_error_y
128
129print c_error_inf_x
130print d_error_inf_x
131print c_error_inf_y
132print d_error_inf_y
133
134cd_ratio_x = c_error_x / d_error_x
135cd_ratio_y = c_error_y / d_error_y
136cd_ratio_inf_x = c_error_inf_x / d_error_inf_x
137cd_ratio_inf_y = c_error_inf_y / d_error_inf_y
138cd_convergence_vel = [[log(cd_ratio_x, 2), log(cd_ratio_inf_x, 2)], [log(cd_ratio_y, 2), log(cd_ratio_inf_y, 2)]]
139 </variable>
140 <variable name="cd_convergence_p" language="python">
141from fluidity_tools import stat_parser as stat
142from math import log
143
144c_error = stat("MMS_C.stat")["NS"]["ScalarAbsoluteDifference"]["l2norm"][-1]
145d_error = stat("MMS_D.stat")["NS"]["ScalarAbsoluteDifference"]["l2norm"][-1]
146
147c_error_inf = stat("MMS_C.stat")["NS"]["ScalarAbsoluteDifference"]["max"][-1]
148d_error_inf = stat("MMS_D.stat")["NS"]["ScalarAbsoluteDifference"]["max"][-1]
149
150print c_error
151print d_error
152
153print c_error_inf
154print d_error_inf
155
156cd_ratio = c_error / d_error
157cd_ratio_inf = c_error_inf / d_error_inf
158cd_convergence_p = [log(cd_ratio, 2), log(cd_ratio_inf, 2)]
159 </variable>
160 <variable name="a_finish_time" language="python">
161from fluidity_tools import stat_parser as stat
162a_finish_time = stat("MMS_A.stat")["ElapsedTime"]["value"][-1]
163 </variable>
164 <variable name="b_finish_time" language="python">
165from fluidity_tools import stat_parser as stat
166b_finish_time = stat("MMS_B.stat")["ElapsedTime"]["value"][-1]
167 </variable>
168 <variable name="c_finish_time" language="python">
169from fluidity_tools import stat_parser as stat
170c_finish_time = stat("MMS_C.stat")["ElapsedTime"]["value"][-1]
171 </variable>
172 <variable name="d_finish_time" language="python">
173from fluidity_tools import stat_parser as stat
174d_finish_time = stat("MMS_D.stat")["ElapsedTime"]["value"][-1]
175 </variable>
176 <variable name="a_final_change_vel" language="python">
177import vtktools
178from fluidity_tools import stat_parser as stat
179vtu = vtktools.vtu("MMS_A_1.vtu")
180dt = stat("MMS_A.stat")["dt"]["value"][-1]
181a_final_change_vel = max(max(abs(vtu.GetVectorField("Velocity")[:,0]-vtu.GetVectorField("OldVelocity")[:,0])/dt), max(abs(vtu.GetVectorField("Velocity")[:,1]-vtu.GetVectorField("OldVelocity")[:,1])/dt))
182 </variable>
183 <variable name="b_final_change_vel" language="python">
184import vtktools
185from fluidity_tools import stat_parser as stat
186vtu = vtktools.vtu("MMS_B_1.vtu")
187dt = stat("MMS_B.stat")["dt"]["value"][-1]
188b_final_change_vel = max(max(abs(vtu.GetVectorField("Velocity")[:,0]-vtu.GetVectorField("OldVelocity")[:,0])/dt), max(abs(vtu.GetVectorField("Velocity")[:,1]-vtu.GetVectorField("OldVelocity")[:,1])/dt))
189 </variable>
190 <variable name="c_final_change_vel" language="python">
191import vtktools
192from fluidity_tools import stat_parser as stat
193vtu = vtktools.vtu("MMS_C_1.vtu")
194dt = stat("MMS_C.stat")["dt"]["value"][-1]
195c_final_change_vel = max(max(abs(vtu.GetVectorField("Velocity")[:,0]-vtu.GetVectorField("OldVelocity")[:,0])/dt), max(abs(vtu.GetVectorField("Velocity")[:,1]-vtu.GetVectorField("OldVelocity")[:,1])/dt))
196 </variable>
197 <variable name="d_final_change_vel" language="python">
198import vtktools
199from fluidity_tools import stat_parser as stat
200vtu = vtktools.vtu("MMS_D_1.vtu")
201dt = stat("MMS_D.stat")["dt"]["value"][-1]
202d_final_change_vel = max(max(abs(vtu.GetVectorField("Velocity")[:,0]-vtu.GetVectorField("OldVelocity")[:,0])/dt), max(abs(vtu.GetVectorField("Velocity")[:,1]-vtu.GetVectorField("OldVelocity")[:,1])/dt))
203 </variable>
204 <variable name="a_final_change_p" language="python">
205import vtktools
206from fluidity_tools import stat_parser as stat
207vtu = vtktools.vtu("MMS_A_1.vtu")
208dt = stat("MMS_A.stat")["dt"]["value"][-1]
209a_final_change_p = max(abs(vtu.GetScalarField("Pressure")-vtu.GetScalarField("OldPressure"))/dt)
210 </variable>
211 <variable name="b_final_change_p" language="python">
212import vtktools
213from fluidity_tools import stat_parser as stat
214vtu = vtktools.vtu("MMS_B_1.vtu")
215dt = stat("MMS_B.stat")["dt"]["value"][-1]
216b_final_change_p = max(abs(vtu.GetScalarField("Pressure")-vtu.GetScalarField("OldPressure"))/dt)
217 </variable>
218 <variable name="c_final_change_p" language="python">
219import vtktools
220from fluidity_tools import stat_parser as stat
221vtu = vtktools.vtu("MMS_C_1.vtu")
222dt = stat("MMS_C.stat")["dt"]["value"][-1]
223c_final_change_p = max(abs(vtu.GetScalarField("Pressure")-vtu.GetScalarField("OldPressure"))/dt)
224 </variable>
225 <variable name="d_final_change_p" language="python">
226import vtktools
227from fluidity_tools import stat_parser as stat
228vtu = vtktools.vtu("MMS_D_1.vtu")
229dt = stat("MMS_D.stat")["dt"]["value"][-1]
230d_final_change_p = max(abs(vtu.GetScalarField("Pressure")-vtu.GetScalarField("OldPressure"))/dt)
231 </variable>
232 </variables>
233 <pass_tests>
234 <test name="ab_convergence_vel_x: L2 order > 0.9" language="python">
235assert(ab_convergence_vel[0][0] &gt; 0.9)
236 </test>
237 <test name="ab_convergence_vel_y: L2 order > 0.9" language="python">
238assert(ab_convergence_vel[1][0] &gt; 0.9)
239 </test>
240 <test name="ab_convergence_p: L2 order > 0.9" language="python">
241assert(ab_convergence_p[0] &gt; 0.9)
242 </test>
243 <test name="bc_convergence_vel_x: L2 order > 0.9" language="python">
244assert(bc_convergence_vel[0][0] &gt; 0.9)
245 </test>
246 <test name="bc_convergence_vel_y: L2 order > 0.9" language="python">
247assert(bc_convergence_vel[1][0] &gt; 0.9)
248 </test>
249 <test name="bc_convergence_p: L2 order > 0.9" language="python">
250assert(bc_convergence_p[0] &gt; 0.9)
251 </test>
252 <test name="cd_convergence_vel_x: L2 order > 0.9" language="python">
253assert(cd_convergence_vel[0][0] &gt; 0.9)
254 </test>
255 <test name="cd_convergence_vel_y: L2 order > 0.9" language="python">
256assert(cd_convergence_vel[1][0] &gt; 0.9)
257 </test>
258 <test name="cd_convergence_p: L2 order > 0.9" language="python">
259assert(cd_convergence_p[0] &gt; 0.9)
260 </test>
261 <test name="checking A finished in less than 0.03" language="python">
262assert(a_finish_time -0.03 &lt; 1.E-10)
263 </test>
264 <test name="checking B finished in less than 0.03" language="python">
265assert(b_finish_time -0.03 &lt; 1.E-10)
266 </test>
267 <test name="checking C finished in less than 0.03" language="python">
268assert(c_finish_time -0.03 &lt; 1.E-10)
269 </test>
270 <test name="checking D finished in less than 0.03" language="python">
271assert(d_finish_time -0.03 &lt; 1.E-10)
272 </test>
273 <test name="checking steady state was reached in A vel" language="python">
274assert(a_final_change_vel &lt; 1.E-3)
275 </test>
276 <test name="checking steady state was reached in B vel" language="python">
277assert(b_final_change_vel &lt; 1.E-3)
278 </test>
279 <test name="checking steady state was reached in C vel" language="python">
280assert(c_final_change_vel &lt; 1.E-3)
281 </test>
282 <test name="checking steady state was reached in D vel" language="python">
283assert(d_final_change_vel &lt; 1.E-3)
284 </test>
285 <test name="checking steady state was reached in A p" language="python">
286assert(a_final_change_p &lt; 1.E-3)
287 </test>
288 <test name="checking steady state was reached in B p" language="python">
289assert(b_final_change_p &lt; 1.E-3)
290 </test>
291 <test name="checking steady state was reached in C p" language="python">
292assert(c_final_change_p &lt; 1.E-3)
293 </test>
294 <test name="checking steady state was reached in D p" language="python">
295assert(d_final_change_p &lt; 1.E-3)
296 </test>
297 </pass_tests>
298 <warn_tests>
299 </warn_tests>
300</testproblem>
301
3020
=== removed directory 'tests/Stokes_mms_p0p1cv/src'
=== removed file 'tests/Stokes_mms_p0p1cv/src/MMS_A.geo'
--- tests/Stokes_mms_p0p1cv/src/MMS_A.geo 2010-05-07 20:23:24 +0000
+++ tests/Stokes_mms_p0p1cv/src/MMS_A.geo 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1Point(1) = {0.0,0.0,0,0.32};
2Point(2) = {3.1415926535897931,0.0,0,0.32};
3Point(3) = {3.1415926535897931,3.1415926535897931,0,0.32};
4Point(4) = {0.0,3.1415926535897931,0,0.32};
5Line(1) = {4,3};
6Line(2) = {3,2};
7Line(3) = {2,1};
8Line(4) = {1,4};
9Line Loop(5) = {1,2,3,4};
10Plane Surface(6) = {5};
11Physical Line(7) = {3};
12Physical Line(8) = {2};
13Physical Line(9) = {1};
14Physical Line(10) = {4};
15Physical Surface(12) = {6};
160
=== removed file 'tests/Stokes_mms_p0p1cv/src/MMS_A.msh'
--- tests/Stokes_mms_p0p1cv/src/MMS_A.msh 2010-05-07 20:23:24 +0000
+++ tests/Stokes_mms_p0p1cv/src/MMS_A.msh 1970-01-01 00:00:00 +0000
@@ -1,373 +0,0 @@
1$MeshFormat
22 0 8
3$EndMeshFormat
4$Nodes
5122
61 0 0 0
72 3.141592653589793 0 0
83 3.141592653589793 3.141592653589793 0
94 0 3.141592653589793 0
105 0.349065850398648 3.141592653589793 0
116 0.698131700797296 3.141592653589793 0
127 1.04719755119647 3.141592653589793 0
138 1.39626340159582 3.141592653589793 0
149 1.745329251995478 3.141592653589793 0
1510 2.094395102395445 3.141592653589793 0
1611 2.443460952794795 3.141592653589793 0
1712 2.792526803192294 3.141592653589793 0
1813 3.141592653589793 2.79252680319031 0
1914 3.141592653589793 2.443460952790828 0
2015 3.141592653589793 2.094395102391345 0
2116 3.141592653589793 1.745329251991862 0
2217 3.141592653589793 1.39626340159238 0
2318 3.141592653589793 1.047197551192897 0
2419 3.141592653589793 0.6981317007940313 0
2520 3.141592653589793 0.3490658503970154 0
2621 2.79252680319031 0 0
2722 2.443460952790828 0 0
2823 2.094395102391345 0 0
2924 1.745329251991862 0 0
3025 1.39626340159238 0 0
3126 1.047197551192897 0 0
3227 0.6981317007940313 0 0
3328 0.3490658503970154 0 0
3429 0 0.349065850398648 0
3530 0 0.698131700797296 0
3631 0 1.04719755119647 0
3732 0 1.39626340159582 0
3833 0 1.745329251995478 0
3934 0 2.094395102395445 0
4035 0 2.443460952794795 0
4136 0 2.792526803192294 0
4237 2.245331016203158 2.237477093448061 0
4338 1.939212850091832 1.488667447826441 0
4439 0.4805987052845769 1.481941171402636 0
4540 1.375039289697466 2.531093011873753 0
4641 1.748454674281334 2.006877314733054 0
4742 1.8413234790713 0.3414603770972079 0
4843 0.2647906118507061 0.8690486946178108 0
4944 1.171580759472431 1.202053915551927 0
5045 2.010303042677967 2.681011374302387 0
5146 2.782496476113133 2.551712022195696 0
5247 0.7850460661416393 2.837550150787113 0
5348 0.9124421070782256 2.132069388734857 0
5449 0.2226014046652034 1.958442683592825 0
5550 0.241860467851656 2.553231261758386 0
5651 2.493755826600072 1.399197545233538 0
5752 1.684307131411933 1.652051739326319 0
5853 2.123029470445046 1.995647508820058 0
5954 0.2350335459538366 1.491064457657457 0
6055 0.9804807296768365 1.51485526305302 0
6156 0.5363395983201773 1.993552794837632 0
6257 1.435777128333467 2.876001160134476 0
6358 1.346020536528309 2.147871846007586 0
6459 1.947386564510164 2.369844994536343 0
6560 0.8436424848152182 2.513204947469001 0
6661 1.458433528545092 1.815345563296753 0
6762 2.527862670756731 1.082068937537555 0
6863 2.024545858803479 1.172807122982141 0
6964 2.537203282389552 2.241741256935653 0
7065 2.845190229270507 0.9032782271684311 0
7166 2.196647011217093 0.2907308185295358 0
7267 2.26945679302129 0.9079902985898242 0
7368 0.3812530977240584 0.6134794414300975 0
7469 2.360921103780199 1.720989337040876 0
7570 0.3607654427034569 2.885456200345249 0
7671 0.2761773190375531 2.274367702446057 0
7772 1.375582385360377 1.506097837016471 0
7873 0.3203185168137341 1.203516306009632 0
7974 0.3494632020933188 1.71876393612117 0
8075 0.6738549898012032 1.297248441378809 0
8176 1.684217955851304 2.70643444402808 0
8277 1.599991567676058 2.377063147082594 0
8378 1.126113714829085 2.43915168813852 0
8479 0.7728374833067017 0.6267909252667454 0
8580 1.689420976530337 1.29367521559253 0
8681 2.822497879170552 1.272041449704428 0
8782 2.281684470019294 1.140700436727976 0
8883 2.214421965622866 1.410336338841596 0
8984 2.369606313367625 2.018880092251258 0
9085 2.535355324434343 0.7496541746228972 0
9186 1.110636296117287 0.5848766808981929 0
9287 1.730037176915837 0.7344628669538847 0
9388 1.18185425377986 0.2541827504744055 0
9489 1.505061768143136 0.2283365892598895 0
9590 2.696800710726369 1.603790382737259 0
9691 2.058874293757006 1.684998687961457 0
9792 2.629210384431764 1.92457545984789 0
9893 2.339377584302134 2.540772651868505 0
9994 0.5162073646051875 2.568841404134913 0
10095 1.152327727137135 2.79629955199542 0
10196 0.5923536438084981 0.9208652715981994 0
10297 2.855494253163295 2.181711512090013 0
10398 0.6716279419198647 1.657495117542256 0
10499 1.160478616613587 1.835174145137185 0
105100 1.453686683434912 0.5069572601828125 0
106101 0.5810966210891484 2.297418966154744 0
107102 2.809070899053095 0.218901494312215 0
108103 2.487657761817074 0.4163827666359571 0
109104 2.223176270471563 2.864617743636775 0
110105 1.913747817514841 2.918272375122196 0
111106 1.793906512578577 1.003757118136154 0
112107 0.9804986137608793 0.9008312905398148 0
113108 0.8938343370954145 0.3066847625821323 0
114109 2.829593115791567 0.5600474173912698 0
115110 2.898634635889831 2.889041028524417 0
116111 2.581080305526595 2.829905597609742 0
117112 0.8407956278336383 1.849857759732165 0
118113 2.905913288695151 1.835562116980959 0
119114 1.561116438886176 1.039730365788334 0
120115 0.53725735778748 0.2993180933067856 0
121116 2.004220755858769 0.8385154074300597 0
122117 2.93579076722317 1.546198917550701 0
123118 1.422474588967255 1.215876736816864 0
124119 2.139327863413657 0.5942903098409081 0
125120 0.8765942977129461 1.137678729790205 0
126121 1.323189517933578 0.9135733591372802 0
127122 0.199019453500453 0.2759548735034221 0
128$EndNodes
129$Elements
130242
1311 1 3 9 1 0 4 5
1322 1 3 9 1 0 5 6
1333 1 3 9 1 0 6 7
1344 1 3 9 1 0 7 8
1355 1 3 9 1 0 8 9
1366 1 3 9 1 0 9 10
1377 1 3 9 1 0 10 11
1388 1 3 9 1 0 11 12
1399 1 3 9 1 0 12 3
14010 1 3 8 2 0 3 13
14111 1 3 8 2 0 13 14
14212 1 3 8 2 0 14 15
14313 1 3 8 2 0 15 16
14414 1 3 8 2 0 16 17
14515 1 3 8 2 0 17 18
14616 1 3 8 2 0 18 19
14717 1 3 8 2 0 19 20
14818 1 3 8 2 0 20 2
14919 1 3 7 3 0 2 21
15020 1 3 7 3 0 21 22
15121 1 3 7 3 0 22 23
15222 1 3 7 3 0 23 24
15323 1 3 7 3 0 24 25
15424 1 3 7 3 0 25 26
15525 1 3 7 3 0 26 27
15626 1 3 7 3 0 27 28
15727 1 3 7 3 0 28 1
15828 1 3 10 4 0 1 29
15929 1 3 10 4 0 29 30
16030 1 3 10 4 0 30 31
16131 1 3 10 4 0 31 32
16232 1 3 10 4 0 32 33
16333 1 3 10 4 0 33 34
16434 1 3 10 4 0 34 35
16535 1 3 10 4 0 35 36
16636 1 3 10 4 0 36 4
16737 2 3 12 6 0 24 42 23
16838 2 3 12 6 0 43 30 31
16939 2 3 12 6 0 47 6 7
17040 2 3 12 6 0 34 49 33
17141 2 3 12 6 0 41 61 58
17242 2 3 12 6 0 61 41 52
17343 2 3 12 6 0 70 36 4
17444 2 3 12 6 0 36 50 35
17545 2 3 12 6 0 36 70 50
17646 2 3 12 6 0 32 33 54
17747 2 3 12 6 0 4 5 70
17848 2 3 12 6 0 71 49 34
17949 2 3 12 6 0 73 43 31
18050 2 3 12 6 0 74 54 33
18151 2 3 12 6 0 49 74 33
18252 2 3 12 6 0 38 80 52
18353 2 3 12 6 0 62 81 65
18454 2 3 12 6 0 82 62 67
18555 2 3 12 6 0 84 53 37
18656 2 3 12 6 0 64 84 37
18757 2 3 12 6 0 37 93 64
18858 2 3 12 6 0 94 50 70
18959 2 3 12 6 0 95 7 8
19060 2 3 12 6 0 57 95 8
19161 2 3 12 6 0 96 68 43
19262 2 3 12 6 0 97 14 15
19363 2 3 12 6 0 8 9 57
19464 2 3 12 6 0 76 57 9
19565 2 3 12 6 0 5 6 70
19666 2 3 12 6 0 49 71 56
19767 2 3 12 6 0 72 44 55
19868 2 3 12 6 0 72 61 52
19969 2 3 12 6 0 80 72 52
20070 2 3 12 6 0 39 73 54
20171 2 3 12 6 0 39 75 73
20272 2 3 12 6 0 74 39 54
20373 2 3 12 6 0 74 49 56
20474 2 3 12 6 0 76 40 57
20575 2 3 12 6 0 77 40 76
20676 2 3 12 6 0 76 45 59
20777 2 3 12 6 0 59 77 76
20878 2 3 12 6 0 40 77 58
20979 2 3 12 6 0 41 77 59
21080 2 3 12 6 0 77 41 58
21181 2 3 12 6 0 78 40 58
21282 2 3 12 6 0 78 48 60
21383 2 3 12 6 0 48 78 58
21484 2 3 12 6 0 68 96 79
21585 2 3 12 6 0 80 38 63
21686 2 3 12 6 0 51 81 62
21787 2 3 12 6 0 51 90 81
21888 2 3 12 6 0 82 51 62
21989 2 3 12 6 0 83 51 82
22090 2 3 12 6 0 63 83 82
22191 2 3 12 6 0 82 67 63
22292 2 3 12 6 0 38 83 63
22393 2 3 12 6 0 38 91 83
22494 2 3 12 6 0 51 83 69
22595 2 3 12 6 0 91 69 83
22696 2 3 12 6 0 53 84 69
22797 2 3 12 6 0 92 69 84
22898 2 3 12 6 0 23 42 66
22999 2 3 12 6 0 17 18 81
230100 2 3 12 6 0 18 65 81
231101 2 3 12 6 0 62 85 67
232102 2 3 12 6 0 85 62 65
233103 2 3 12 6 0 25 26 88
234104 2 3 12 6 0 89 25 88
235105 2 3 12 6 0 90 51 69
236106 2 3 12 6 0 69 92 90
237107 2 3 12 6 0 91 38 52
238108 2 3 12 6 0 91 53 69
239109 2 3 12 6 0 91 41 53
240110 2 3 12 6 0 41 91 52
241111 2 3 12 6 0 94 47 60
242112 2 3 12 6 0 94 71 50
243113 2 3 12 6 0 31 32 73
244114 2 3 12 6 0 32 54 73
245115 2 3 12 6 0 24 25 89
246116 2 3 12 6 0 42 24 89
247117 2 3 12 6 0 95 47 7
248118 2 3 12 6 0 40 95 57
249119 2 3 12 6 0 40 78 95
250120 2 3 12 6 0 18 19 65
251121 2 3 12 6 0 46 97 64
252122 2 3 12 6 0 97 46 14
253123 2 3 12 6 0 34 35 71
254124 2 3 12 6 0 35 50 71
255125 2 3 12 6 0 99 61 72
256126 2 3 12 6 0 55 99 72
257127 2 3 12 6 0 86 100 88
258128 2 3 12 6 0 100 89 88
259129 2 3 12 6 0 94 101 71
260130 2 3 12 6 0 101 56 71
261131 2 3 12 6 0 2 102 20
262132 2 3 12 6 0 102 2 21
263133 2 3 12 6 0 39 98 75
264134 2 3 12 6 0 98 55 75
265135 2 3 12 6 0 93 46 64
266136 2 3 12 6 0 45 104 93
267137 2 3 12 6 0 99 48 58
268138 2 3 12 6 0 61 99 58
269139 2 3 12 6 0 48 101 60
270140 2 3 12 6 0 101 48 56
271141 2 3 12 6 0 101 94 60
272142 2 3 12 6 0 104 10 11
273143 2 3 12 6 0 9 105 76
274144 2 3 12 6 0 45 105 104
275145 2 3 12 6 0 105 45 76
276146 2 3 12 6 0 27 108 26
277147 2 3 12 6 0 108 88 26
278148 2 3 12 6 0 20 109 19
279149 2 3 12 6 0 110 12 3
280150 2 3 12 6 0 13 110 3
281151 2 3 12 6 0 93 111 46
282152 2 3 12 6 0 92 84 64
283153 2 3 12 6 0 97 92 64
284154 2 3 12 6 0 98 39 74
285155 2 3 12 6 0 56 98 74
286156 2 3 12 6 0 63 106 80
287157 2 3 12 6 0 79 107 86
288158 2 3 12 6 0 88 108 86
289159 2 3 12 6 0 108 79 86
290160 2 3 12 6 0 9 10 105
291161 2 3 12 6 0 10 104 105
292162 2 3 12 6 0 48 112 56
293163 2 3 12 6 0 112 98 56
294164 2 3 12 6 0 108 115 79
295165 2 3 12 6 0 115 68 79
296166 2 3 12 6 0 43 73 96
297167 2 3 12 6 0 75 96 73
298168 2 3 12 6 0 107 79 96
299169 2 3 12 6 0 100 87 42
300170 2 3 12 6 0 42 89 100
301171 2 3 12 6 0 109 85 65
302172 2 3 12 6 0 19 109 65
303173 2 3 12 6 0 12 111 11
304174 2 3 12 6 0 111 104 11
305175 2 3 12 6 0 104 111 93
306176 2 3 12 6 0 112 48 99
307177 2 3 12 6 0 55 112 99
308178 2 3 12 6 0 112 55 98
309179 2 3 12 6 0 113 97 15
310180 2 3 12 6 0 97 113 92
311181 2 3 12 6 0 16 113 15
312182 2 3 12 6 0 113 90 92
313183 2 3 12 6 0 67 116 63
314184 2 3 12 6 0 116 106 63
315185 2 3 12 6 0 117 17 81
316186 2 3 12 6 0 117 90 113
317187 2 3 12 6 0 90 117 81
318188 2 3 12 6 0 85 109 103
319189 2 3 12 6 0 110 111 12
320190 2 3 12 6 0 111 110 46
321191 2 3 12 6 0 68 30 43
322192 2 3 12 6 0 106 114 80
323193 2 3 12 6 0 87 114 106
324194 2 3 12 6 0 116 87 106
325195 2 3 12 6 0 16 17 117
326196 2 3 12 6 0 113 16 117
327197 2 3 12 6 0 118 72 80
328198 2 3 12 6 0 114 118 80
329199 2 3 12 6 0 72 118 44
330200 2 3 12 6 0 21 22 102
331201 2 3 12 6 0 109 20 102
332202 2 3 12 6 0 109 102 103
333203 2 3 12 6 0 46 13 14
334204 2 3 12 6 0 13 46 110
335205 2 3 12 6 0 115 27 28
336206 2 3 12 6 0 115 108 27
337207 2 3 12 6 0 119 103 66
338208 2 3 12 6 0 103 119 85
339209 2 3 12 6 0 67 119 116
340210 2 3 12 6 0 119 67 85
341211 2 3 12 6 0 119 42 87
342212 2 3 12 6 0 42 119 66
343213 2 3 12 6 0 116 119 87
344214 2 3 12 6 0 75 120 96
345215 2 3 12 6 0 120 107 96
346216 2 3 12 6 0 44 121 107
347217 2 3 12 6 0 103 22 66
348218 2 3 12 6 0 22 103 102
349219 2 3 12 6 0 23 66 22
350220 2 3 12 6 0 44 120 55
351221 2 3 12 6 0 120 44 107
352222 2 3 12 6 0 120 75 55
353223 2 3 12 6 0 100 121 87
354224 2 3 12 6 0 86 121 100
355225 2 3 12 6 0 121 114 87
356226 2 3 12 6 0 107 121 86
357227 2 3 12 6 0 118 121 44
358228 2 3 12 6 0 118 114 121
359229 2 3 12 6 0 60 95 78
360230 2 3 12 6 0 95 60 47
361231 2 3 12 6 0 59 93 37
362232 2 3 12 6 0 93 59 45
363233 2 3 12 6 0 47 70 6
364234 2 3 12 6 0 70 47 94
365235 2 3 12 6 0 53 59 37
366236 2 3 12 6 0 41 59 53
367237 2 3 12 6 0 122 28 1
368238 2 3 12 6 0 29 122 1
369239 2 3 12 6 0 122 29 30
370240 2 3 12 6 0 122 115 28
371241 2 3 12 6 0 122 68 115
372242 2 3 12 6 0 68 122 30
373$EndElements
3740
=== removed file 'tests/Stokes_mms_p0p1cv/src/MMS_B.geo'
--- tests/Stokes_mms_p0p1cv/src/MMS_B.geo 2010-05-07 20:23:24 +0000
+++ tests/Stokes_mms_p0p1cv/src/MMS_B.geo 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1Point(1) = {0.0,0.0,0,0.16};
2Point(2) = {3.1415926535897931,0.0,0,0.16};
3Point(3) = {3.1415926535897931,3.1415926535897931,0,0.16};
4Point(4) = {0.0,3.1415926535897931,0,0.16};
5Line(1) = {4,3};
6Line(2) = {3,2};
7Line(3) = {2,1};
8Line(4) = {1,4};
9Line Loop(5) = {1,2,3,4};
10Plane Surface(6) = {5};
11Physical Line(7) = {3};
12Physical Line(8) = {2};
13Physical Line(9) = {1};
14Physical Line(10) = {4};
15Physical Surface(12) = {6};
160
=== removed file 'tests/Stokes_mms_p0p1cv/src/MMS_B.msh'
--- tests/Stokes_mms_p0p1cv/src/MMS_B.msh 2010-05-07 20:23:24 +0000
+++ tests/Stokes_mms_p0p1cv/src/MMS_B.msh 1970-01-01 00:00:00 +0000
@@ -1,1291 +0,0 @@
1$MeshFormat
22 0 8
3$EndMeshFormat
4$Nodes
5428
61 0 0 0
72 3.141592653589793 0 0
83 3.141592653589793 3.141592653589793 0
94 0 3.141592653589793 0
105 0.1653469817677806 3.141592653589793 0
116 0.3306939635355612 3.141592653589793 0
127 0.4960409453033418 3.141592653589793 0
138 0.6613879270711225 3.141592653589793 0
149 0.8267349088389864 3.141592653589793 0
1510 0.9920818906070992 3.141592653589793 0
1611 1.157428872375212 3.141592653589793 0
1712 1.322775854143325 3.141592653589793 0
1813 1.488122835911438 3.141592653589793 0
1914 1.653469817679697 3.141592653589793 0
2015 1.818816799448103 3.141592653589793 0
2116 1.984163781216508 3.141592653589793 0
2217 2.149510762984913 3.141592653589793 0
2318 2.314857744753318 3.141592653589793 0
2419 2.480204726520847 3.141592653589793 0
2520 2.645551708288084 3.141592653589793 0
2621 2.81089869005532 3.141592653589793 0
2722 2.976245671822556 3.141592653589793 0
2823 3.141592653589793 2.976245671821617 0
2924 3.141592653589793 2.810898690053441 0
3025 3.141592653589793 2.645551708285265 0
3126 3.141592653589793 2.480204726517089 0
3227 3.141592653589793 2.314857744748913 0
3328 3.141592653589793 2.149510762980737 0
3429 3.141592653589793 1.984163781212561 0
3530 3.141592653589793 1.818816799444385 0
3631 3.141592653589793 1.653469817676209 0
3732 3.141592653589793 1.488122835908033 0
3833 3.141592653589793 1.322775854139857 0
3934 3.141592653589793 1.157428872371681 0
4035 3.141592653589793 0.9920818906035049 0
4136 3.141592653589793 0.8267349088353289 0
4237 3.141592653589793 0.6613879270680294 0
4338 3.141592653589793 0.4960409453010217 0
4439 3.141592653589793 0.3306939635340145 0
4540 3.141592653589793 0.1653469817670068 0
4641 2.976245671821617 0 0
4742 2.810898690053441 0 0
4843 2.645551708285265 0 0
4944 2.480204726517089 0 0
5045 2.314857744748913 0 0
5146 2.149510762980737 0 0
5247 1.984163781212561 0 0
5348 1.818816799444385 0 0
5449 1.653469817676209 0 0
5550 1.488122835908033 0 0
5651 1.322775854139857 0 0
5752 1.157428872371681 0 0
5853 0.9920818906035049 0 0
5954 0.8267349088353289 0 0
6055 0.6613879270680294 0 0
6156 0.4960409453010217 0 0
6257 0.3306939635340145 0 0
6358 0.1653469817670068 0 0
6459 0 0.1653469817677806 0
6560 0 0.3306939635355612 0
6661 0 0.4960409453033418 0
6762 0 0.6613879270711225 0
6863 0 0.8267349088389864 0
6964 0 0.9920818906070992 0
7065 0 1.157428872375212 0
7166 0 1.322775854143325 0
7267 0 1.488122835911438 0
7368 0 1.653469817679697 0
7469 0 1.818816799448103 0
7570 0 1.984163781216508 0
7671 0 2.149510762984913 0
7772 0 2.314857744753318 0
7873 0 2.480204726520847 0
7974 0 2.645551708288084 0
8075 0 2.81089869005532 0
8176 0 2.976245671822556 0
8277 2.710154345613917 0.7124035191059989 0
8378 1.335705447144501 1.537291746312253 0
8479 0.7792697275134636 0.99155755697381 0
8580 0.473361672149427 0.5418702562722421 0
8681 2.823087642901273 0.3079710975474592 0
8782 2.767078285855207 2.593662908315215 0
8883 1.658230909855657 0.6993179675070205 0
8984 2.477046825221157 0.8983989183155836 0
9085 2.286546527540184 0.5291155451054952 0
9186 2.763441830817289 0.1540079993047146 0
9287 0.9310433468591642 0.3631462188368522 0
9388 2.880590855368471 0.1914635091263185 0
9489 2.044444915452922 2.598831894750799 0
9590 2.453220504963881 2.694332345363849 0
9691 2.942829198104365 2.488434356447135 0
9792 2.540561744397069 2.974795387608982 0
9893 0.1671901984448033 2.205538451778842 0
9994 0.9240428927373574 2.055219669428184 0
10095 1.564809982517981 1.831524450922345 0
10196 2.206327931818251 2.138406934106811 0
10297 0.9811357034587043 2.441202898590433 0
10398 1.632942267552848 2.193404877477654 0
10499 1.299583009832575 1.039221487677734 0
105100 0.3035032222759849 1.695110777719873 0
106101 1.96947052174502 1.144479511012929 0
107102 1.58269508073549 1.26184070387476 0
108103 2.425109744138061 1.180221257733585 0
109104 2.723716816817247 0.979342777164218 0
110105 2.095691154277549 0.7791856729143436 0
111106 2.353379159360377 0.8459424898903043 0
112107 2.515199651387261 0.7244646397736486 0
113108 2.553648424475276 1.050966575365818 0
114109 1.11071832585682 0.9840325084045711 0
115110 0.9289740643403908 0.1585447704921896 0
116111 2.294460657733453 2.476400761853999 0
117112 1.951287116773943 2.283306621468514 0
118113 2.109760924474123 1.791468361544839 0
119114 2.688912087705139 1.892009783199424 0
120115 2.401227236877782 2.577292805750611 0
121116 2.640159959712249 2.433090295279496 0
122117 0.1090382934827166 1.900967598307153 0
123118 0.4678553322226026 2.405625195819564 0
124119 1.089494724561111 1.752787835249928 0
125120 0.7176582363183167 2.304965125626813 0
126121 0.1694144837145111 2.746174807704512 0
127122 2.888436227529274 0.9062277134744589 0
128123 2.243924545238765 0.7838910206692115 0
129124 0.1669969730218628 1.421715088176076 0
130125 0.5914734535192498 1.021337589027003 0
131126 2.66972695866243 0.2910078877299449 0
132127 0.1652780543481153 1.085153939649221 0
133128 2.884253770498661 0.7470890018964499 0
134129 3.002027911171429 1.718940992262709 0
135130 2.15761823550225 2.918575049244855 0
136131 2.181887167942433 2.734039762339985 0
137132 2.35433176432498 2.980987417517035 0
138133 2.661778219387621 2.859399783359583 0
139134 2.695772180708321 2.270698610323994 0
140135 2.938604072962539 2.932107199689162 0
141136 2.969844772018041 2.63124359395824 0
142137 3.036448711113867 3.032732175523536 0
143138 3.022534085109895 2.76676177911272 0
144139 1.686607241758467 2.790087479645788 0
145140 1.533433507278696 2.441656265951141 0
146141 1.919822703006044 1.727223384093773 0
147142 1.813923339990162 1.976987356695722 0
148143 1.455707771832521 2.070047537570578 0
149144 1.995978352592519 2.091349223262582 0
150145 2.108298862994522 2.423650675329858 0
151146 2.284547605920695 1.869199921200383 0
152147 1.345235098133746 2.66114913664867 0
153148 1.604268139703333 2.612495845366983 0
154149 0.7480073345023147 2.496672244404683 0
155150 0.9157863229348679 2.255055440610529 0
156151 1.44274325799834 0.2630952735574613 0
157152 1.607676446880413 0.5385375169385637 0
158153 0.9346302377518008 1.871397278260167 0
159154 0.3745910538022397 2.261605443231008 0
160155 0.7456713452935297 2.124121853483894 0
161156 2.115804446734388 1.094312619518252 0
162157 1.66238584006893 1.553670206395838 0
163158 2.253275892353718 1.163631830974447 0
164159 2.736922052829414 1.120090998796195 0
165160 2.60352163203479 1.216270600568891 0
166161 2.454186324495676 0.536611096451201 0
167162 1.285133235198161 1.223330086912121 0
168163 2.315756432187607 2.671310410452097 0
169164 2.812657142602099 2.396292962413941 0
170165 0.136852048977916 2.034883063678378 0
171166 0.5418281626293912 2.308493077677789 0
172167 0.443536649234231 2.545627860579855 0
173168 1.100311822943816 1.946022059238785 0
174169 0.8539321934869285 2.40197529637043 0
175170 1.186237453043325 2.288334197967351 0
176171 0.7652856616157222 1.943984178166221 0
177172 0.6098194245086899 2.985574538487605 0
178173 2.539456843526181 2.031240610128277 0
179174 1.833344553071007 0.898979730527855 0
180175 1.769719959305706 1.194304879895215 0
181176 1.518261546581936 0.408405483080395 0
182177 1.408367353727112 1.353815562665538 0
183178 1.932180696962042 0.7459977838391768 0
184179 2.3420997702715 0.6759969493163754 0
185180 2.211904838264805 0.9456172545347595 0
186181 2.182619609175662 0.6338366984510819 0
187182 0.6660988608060098 0.8519320040293099 0
188183 2.824632978175203 0.5699197156284113 0
189184 2.615721458511351 0.5489570794216285 0
190185 2.196430927761531 2.591538455810981 0
191186 2.0240788720558 2.772637017881345 0
192187 2.465862732904224 2.420217185392864 0
193188 2.568220559737175 2.600182804832682 0
194189 0.3687128050060238 2.783987860321025 0
195190 2.988992031784484 0.1172880830341935 0
196191 0.3059174942391116 0.1417643898823577 0
197192 0.126996997968816 0.329995198176525 0
198193 3.006955753660114 2.306404028916538 0
199194 0.1425553326982193 2.924554374540718 0
200195 0.2907902169237725 2.895253588119128 0
201196 2.153054405587897 0.465094686595338 0
202197 0.3155916798373833 0.5015827428176055 0
203198 0.179903986983802 1.250989382466576 0
204199 0.5315144135057466 0.7232508287032177 0
205200 0.5079504532573573 0.8928950868888056 0
206201 0.3449217198866198 0.8610334168910246 0
207202 2.579334723265651 0.1766533029758535 0
208203 2.414110454944511 2.820266676899157 0
209204 2.69212459811774 2.724412480751462 0
210205 2.711428055510238 2.099743093885627 0
211206 1.805763900278314 2.146832042461267 0
212207 1.353056848686425 2.455241293224084 0
213208 1.613843243420686 2.333732165484082 0
214209 1.84944905926157 2.781396682077941 0
215210 1.96323967183751 1.89679428432906 0
216211 2.040658004318893 1.602334017109482 0
217212 1.843169709479856 1.534817886649233 0
218213 2.161738227762281 1.484011418071472 0
219214 1.646199642992884 2.037888001505255 0
220215 1.729033014210835 1.730430744173156 0
221216 1.456899565782772 2.279117622191337 0
222217 2.340388289307997 2.006693281832478 0
223218 2.084450381363953 2.244585644332628 0
224219 2.135363929179332 1.960323208439774 0
225220 1.588628191525907 2.964236847596425 0
226221 1.470144871603232 2.575409651244652 0
227222 1.268170660571357 2.004953917311955 0
228223 1.254028559084924 0.2715361565992326 0
229224 0.1470838008660966 1.764796140457005 0
230225 0.1593462005375125 1.586491973739174 0
231226 0.4352774855837946 1.792906898802827 0
232227 0.3507362945887816 1.359618152516893 0
233228 0.3395649867638134 1.517021777660599 0
234229 0.3066316055909449 2.068973059576606 0
235230 0.2737261496659326 1.865906700757079 0
236231 0.5613504165317504 1.170292178863893 0
237232 0.4563596603613842 2.097353188592915 0
238233 2.007728511021513 0.9549956123321318 0
239234 0.7267482545634016 2.834948776194259 0
240235 0.3253391498805185 2.624366646627285 0
241236 2.358627197546403 1.010584251933394 0
242237 2.336460474883364 1.472537901961013 0
243238 2.479946954196146 1.342373798035041 0
244239 2.407160364816117 1.639950922364161 0
245240 0.7774898959576743 2.997773012818021 0
246241 0.429755363134886 2.968536834507562 0
247242 0.841700969612011 0.5402764443878689 0
248243 1.074292031581404 2.990127302842237 0
249244 0.1649770749113588 2.37846011276108 0
250245 0.4294893176197124 1.025176751379064 0
251246 2.769865645042701 0.8425557550515876 0
252247 1.19722712608645 1.365215187482435 0
253248 1.41888751620493 1.178776675558878 0
254249 1.01600305704664 1.61892336628441 0
255250 1.023299239274799 1.099376148391514 0
256251 0.7094616098701299 1.146355733472533 0
257252 0.8375570011288848 1.30017994094187 0
258253 1.40046851928461 0.8850515394496341 0
259254 0.7574604210817141 1.75807980481268 0
260255 0.5369151619932577 1.450604254046114 0
261256 1.084158188555139 0.2569001986084773 0
262257 0.5776611781110469 2.531623442938306 0
263258 1.102251000331462 2.14688264034314 0
264259 2.56613476204501 2.178438629672458 0
265260 2.551233083018216 1.754393000862182 0
266261 2.718645215727205 1.713386235550407 0
267262 1.828158880816279 1.343316234877889 0
268263 1.499290546069746 1.549275088469224 0
269264 1.520749295326505 1.008432435162344 0
270265 1.549142593648994 0.8185190690796893 0
271266 1.708851074954128 1.030162227796758 0
272267 2.451621018712137 2.26069077209076 0
273268 0.1444235686033272 0.2104049248412986 0
274269 0.2820022552685038 0.3230138617005892 0
275270 0.1839590994501898 0.4510570537117202 0
276271 0.3425521250128601 0.6690147704806004 0
277272 2.287412426038745 2.819484384956406 0
278273 2.724785911251578 2.989319848466447 0
279274 2.824932499814135 2.789116392863983 0
280275 2.565990396946163 2.764732077967902 0
281276 3.009808231531253 1.886577471600333 0
282277 3.056007070619947 2.897572887613173 0
283278 2.917628401610219 1.188558014457213 0
284279 2.122722288949147 0.302574109213219 0
285280 2.763165731824999 1.268594204164478 0
286281 1.958000548259156 2.961262599328205 0
287282 0.1553356301265957 2.548246547728349 0
288283 1.777702181350695 2.330116968837266 0
289284 1.680292733716306 2.472177953840805 0
290285 1.851499212068124 2.52467123334242 0
291286 1.20814977253769 2.578169806855605 0
292287 1.392352206339733 1.876937404819547 0
293288 0.499890186166176 1.292292622650896 0
294289 0.7542572053621431 1.451695067728285 0
295290 0.6546138884760674 1.305862776640875 0
296291 0.5548962248034992 2.193629241092517 0
297292 0.6027882673202325 2.017601331865698 0
298293 0.4910627065190025 2.662288043412755 0
299294 2.273005319549937 1.747779133720325 0
300295 0.5530824535235275 2.815412226353714 0
301296 0.7620380704874339 0.2589209365668249 0
302297 0.7364730363668714 0.6900940035646084 0
303298 0.9246022946897132 3.001030182296128 0
304299 0.3200299973484256 2.455228633808153 0
305300 0.9290423920253242 1.726431709340246 0
306301 1.150718936248786 1.568604424763654 0
307302 0.8914629311843184 1.131937106054937 0
308303 1.154664763582443 1.170138034437028 0
309304 0.854665300346682 1.597275241603588 0
310305 1.410721445098315 0.5629256465494171 0
311306 0.6104694414399311 2.411542658017817 0
312307 2.466514684951866 1.889882086334573 0
313308 1.93806535792229 1.283000199568838 0
314309 1.987488134914787 1.429230321501737 0
315310 1.568284230829065 1.416113341296378 0
316311 1.855891735188512 1.057798544484445 0
317312 1.619632038141906 1.14129891089492 0
318313 2.565965918470776 2.296260696734317 0
319314 2.321016000401902 2.288575618181463 0
320315 2.663087866447886 1.411312838732698 0
321316 2.532811941169788 0.3710875147649104 0
322317 2.895052860809531 3.048501750156999 0
323318 2.856541782263733 1.791395735065057 0
324319 2.617749083627754 0.8845501063299834 0
325320 2.697219297628306 0.4193152077994686 0
326321 0.2556832434807254 3.021145788653913 0
327322 1.296685312196859 2.331677341888401 0
328323 1.06237936441321 2.31677290980887 0
329324 1.500729908018818 2.77335675278342 0
330325 1.391049094471233 0.7417524850937569 0
331326 2.232065711744161 1.356021105282206 0
332327 1.674107597316582 0.8822445806230195 0
333328 1.54675580061779 0.6830568032054767 0
334329 0.1757174282502098 0.7559230239156856 0
335330 0.15932529930038 0.9227960540648468 0
336331 2.862262164284501 1.038203126666982 0
337332 2.056605044693401 0.135847050210787 0
338333 1.16067571736549 0.1156698764675235 0
339334 1.292857304692313 2.181632517433974 0
340335 1.57977957601495 1.692703976734909 0
341336 0.8534573824871737 2.687797426763937 0
342337 1.002271508751479 2.825548258824476 0
343338 0.3604143317251066 1.173606927815346 0
344339 0.5992769246286508 1.860392519688679 0
345340 0.4493439884107928 1.950759679505188 0
346341 2.203956420728705 1.644102800232776 0
347342 0.6067093771829247 0.1585828075188501 0
348343 0.772738374189719 0.1182309707316591 0
349344 0.9790361305650853 1.454463681016988 0
350345 1.018552862012585 1.259424765306716 0
351346 1.342362599820749 0.4050057887797586 0
352347 2.395551665363852 1.787227490965682 0
353348 1.708996837581472 1.373603827058711 0
354349 2.383805587455049 2.142898858986513 0
355350 0.8472755822110353 0.8317564635518965 0
356351 3.002774439871097 2.082169293500771 0
357352 2.853641435177462 2.192865411227553 0
358353 2.614364464430576 1.59544094010444 0
359354 2.887648503285594 0.4213835509232221 0
360355 2.238690472772636 0.1694610244221905 0
361356 1.34488922768415 2.842534551691272 0
362357 2.203849954645166 2.321222635808788 0
363358 2.326131458112737 0.3696924785243472 0
364359 0.681666871544073 1.60125037665294 0
365360 1.110042668600366 0.6632433477829441 0
366361 2.995988225231864 1.543180837001202 0
367362 1.357893380725764 0.1296425574983743 0
368363 1.890369584957931 2.6503947001601 0
369364 1.752366164911217 2.623376405020105 0
370365 1.958274883400448 2.448185981660364 0
371366 2.029390110009729 0.5919371397059507 0
372367 1.246647941414314 2.986884284685245 0
373368 1.150594164092547 2.436245361905836 0
374369 2.345167919667988 1.315368777794578 0
375370 2.096965906954571 1.311378914074521 0
376371 0.2903550052120112 1.015410723538438 0
377372 3.002292328422895 1.021277073295557 0
378373 1.047673625418839 2.622397830087023 0
379374 1.176985830813522 2.791365555264978 0
380375 0.8728091635283713 2.877755689978193 0
381376 0.4816092231819856 1.632254565845142 0
382377 0.4292873395726138 0.3956349384765626 0
383378 0.7513490314779386 0.4234232354093667 0
384379 0.6341042373478326 0.568270478040689 0
385380 1.22234407148227 0.8300171394864007 0
386381 2.857623085556361 1.988197178704509 0
387382 2.507158237500938 1.472652862906713 0
388383 2.409527621986015 0.1859400598560078 0
389384 1.764698773955381 2.965686815609694 0
390385 0.8997417750110508 2.54443163563051 0
391386 1.416793031411793 2.979766293462839 0
392387 1.525513981616164 0.1449723232592194 0
393388 0.6733841155748304 2.649380725568614 0
394389 1.031423079732368 0.5247476212108881 0
395390 0.9314933951417547 0.6653814442277431 0
396391 1.266624125517718 0.6623633819621698 0
397392 2.817746465499031 1.601336967556995 0
398393 1.614530770409514 0.2710620393770625 0
399394 1.71636688628676 0.1396713013247922 0
400395 1.282708898714251 1.7174725730963 0
401396 1.447212987524484 1.711750206278115 0
402397 0.5767722250337984 1.731728970816225 0
403398 0.5913272474677719 0.3732866975702252 0
404399 2.989585509747945 0.3005544744224926 0
405400 1.783426395629271 0.7390310606086292 0
406401 0.1939614271025184 0.6024078510995812 0
407402 0.9372148501050993 0.9811426585705684 0
408403 2.864348317610181 1.399970656621234 0
409404 1.754522340738722 0.4587208708514305 0
410405 1.150300942140853 0.3994409683546766 0
411406 1.023248075413499 0.817594015684914 0
412407 1.242779111659225 1.859539070769294 0
413408 0.4486014544794452 0.2439224749890189 0
414409 3.015503673251204 0.4990226676685885 0
415410 3.019697961286836 0.8619059836157521 0
416411 3.030260467539848 1.34333347067228 0
417412 1.996468216947338 0.4138691345250425 0
418413 1.778567667136346 0.2808503494953919 0
419414 1.868562216861688 0.5618806000914466 0
420415 1.663393210490735 0.3902015376645016 0
421416 1.218439071129093 0.5384544506519755 0
422417 3.011265819676178 0.6931410673899771 0
423418 1.942644646849937 0.2488856793463607 0
424419 1.880570585646719 0.369815449419561 0
425420 1.537037228489016 1.950578716018899 0
426421 2.221266302057239 3.045599411745064 0
427422 1.829599455239953 1.83583038649709 0
428423 0.1027025713541935 3.046990539861628 0
429424 1.684157697788862 1.899067369585522 0
430425 1.729317902377592 0.5907287518243273 0
431426 0.4493613937975903 0.1108083172592962 0
432427 2.086150493609806 3.040684625350802 0
433428 1.879303317923693 0.1245686623238263 0
434$EndNodes
435$Elements
436854
4371 1 3 9 1 0 4 5
4382 1 3 9 1 0 5 6
4393 1 3 9 1 0 6 7
4404 1 3 9 1 0 7 8
4415 1 3 9 1 0 8 9
4426 1 3 9 1 0 9 10
4437 1 3 9 1 0 10 11
4448 1 3 9 1 0 11 12
4459 1 3 9 1 0 12 13
44610 1 3 9 1 0 13 14
44711 1 3 9 1 0 14 15
44812 1 3 9 1 0 15 16
44913 1 3 9 1 0 16 17
45014 1 3 9 1 0 17 18
45115 1 3 9 1 0 18 19
45216 1 3 9 1 0 19 20
45317 1 3 9 1 0 20 21
45418 1 3 9 1 0 21 22
45519 1 3 9 1 0 22 3
45620 1 3 8 2 0 3 23
45721 1 3 8 2 0 23 24
45822 1 3 8 2 0 24 25
45923 1 3 8 2 0 25 26
46024 1 3 8 2 0 26 27
46125 1 3 8 2 0 27 28
46226 1 3 8 2 0 28 29
46327 1 3 8 2 0 29 30
46428 1 3 8 2 0 30 31
46529 1 3 8 2 0 31 32
46630 1 3 8 2 0 32 33
46731 1 3 8 2 0 33 34
46832 1 3 8 2 0 34 35
46933 1 3 8 2 0 35 36
47034 1 3 8 2 0 36 37
47135 1 3 8 2 0 37 38
47236 1 3 8 2 0 38 39
47337 1 3 8 2 0 39 40
47438 1 3 8 2 0 40 2
47539 1 3 7 3 0 2 41
47640 1 3 7 3 0 41 42
47741 1 3 7 3 0 42 43
47842 1 3 7 3 0 43 44
47943 1 3 7 3 0 44 45
48044 1 3 7 3 0 45 46
48145 1 3 7 3 0 46 47
48246 1 3 7 3 0 47 48
48347 1 3 7 3 0 48 49
48448 1 3 7 3 0 49 50
48549 1 3 7 3 0 50 51
48650 1 3 7 3 0 51 52
48751 1 3 7 3 0 52 53
48852 1 3 7 3 0 53 54
48953 1 3 7 3 0 54 55
49054 1 3 7 3 0 55 56
49155 1 3 7 3 0 56 57
49256 1 3 7 3 0 57 58
49357 1 3 7 3 0 58 1
49458 1 3 10 4 0 1 59
49559 1 3 10 4 0 59 60
49660 1 3 10 4 0 60 61
49761 1 3 10 4 0 61 62
49862 1 3 10 4 0 62 63
49963 1 3 10 4 0 63 64
50064 1 3 10 4 0 64 65
50165 1 3 10 4 0 65 66
50266 1 3 10 4 0 66 67
50367 1 3 10 4 0 67 68
50468 1 3 10 4 0 68 69
50569 1 3 10 4 0 69 70
50670 1 3 10 4 0 70 71
50771 1 3 10 4 0 71 72
50872 1 3 10 4 0 72 73
50973 1 3 10 4 0 73 74
51074 1 3 10 4 0 74 75
51175 1 3 10 4 0 75 76
51276 1 3 10 4 0 76 4
51377 2 3 12 6 0 81 88 86
51478 2 3 12 6 0 92 19 20
51579 2 3 12 6 0 137 22 3
51680 2 3 12 6 0 23 137 3
51781 2 3 12 6 0 53 54 110
51882 2 3 12 6 0 126 81 86
51983 2 3 12 6 0 31 129 30
52084 2 3 12 6 0 18 19 132
52185 2 3 12 6 0 19 92 132
52286 2 3 12 6 0 136 91 82
52387 2 3 12 6 0 69 70 117
52488 2 3 12 6 0 25 138 24
52589 2 3 12 6 0 138 25 136
52690 2 3 12 6 0 116 164 134
52791 2 3 12 6 0 165 117 70
52892 2 3 12 6 0 118 166 154
52993 2 3 12 6 0 168 119 153
53094 2 3 12 6 0 120 169 150
53195 2 3 12 6 0 169 120 149
53296 2 3 12 6 0 169 97 150
53397 2 3 12 6 0 171 94 153
53498 2 3 12 6 0 94 171 155
53599 2 3 12 6 0 90 188 115
536100 2 3 12 6 0 26 193 91
537101 2 3 12 6 0 195 121 194
538102 2 3 12 6 0 200 125 182
539103 2 3 12 6 0 183 184 77
540104 2 3 12 6 0 183 77 128
541105 2 3 12 6 0 190 41 42
542106 2 3 12 6 0 42 86 88
543107 2 3 12 6 0 88 190 42
544108 2 3 12 6 0 159 104 108
545109 2 3 12 6 0 108 160 159
546110 2 3 12 6 0 103 160 108
547111 2 3 12 6 0 85 179 161
548112 2 3 12 6 0 64 65 127
549113 2 3 12 6 0 163 90 115
550114 2 3 12 6 0 111 163 115
551115 2 3 12 6 0 111 185 163
552116 2 3 12 6 0 185 131 163
553117 2 3 12 6 0 205 114 173
554118 2 3 12 6 0 85 181 179
555119 2 3 12 6 0 106 179 123
556120 2 3 12 6 0 181 123 179
557121 2 3 12 6 0 107 161 179
558122 2 3 12 6 0 105 180 123
559123 2 3 12 6 0 180 106 123
560124 2 3 12 6 0 181 105 123
561125 2 3 12 6 0 125 79 182
562126 2 3 12 6 0 77 184 107
563127 2 3 12 6 0 185 89 131
564128 2 3 12 6 0 89 185 145
565129 2 3 12 6 0 185 111 145
566130 2 3 12 6 0 89 186 131
567131 2 3 12 6 0 131 186 130
568132 2 3 12 6 0 187 111 115
569133 2 3 12 6 0 116 188 82
570134 2 3 12 6 0 116 187 188
571135 2 3 12 6 0 187 115 188
572136 2 3 12 6 0 2 190 40
573137 2 3 12 6 0 190 2 41
574138 2 3 12 6 0 191 57 58
575139 2 3 12 6 0 60 61 192
576140 2 3 12 6 0 27 193 26
577141 2 3 12 6 0 75 76 194
578142 2 3 12 6 0 121 75 194
579143 2 3 12 6 0 195 189 121
580144 2 3 12 6 0 198 127 65
581145 2 3 12 6 0 66 198 65
582146 2 3 12 6 0 42 43 86
583147 2 3 12 6 0 202 86 43
584148 2 3 12 6 0 202 126 86
585149 2 3 12 6 0 92 203 132
586150 2 3 12 6 0 163 203 90
587151 2 3 12 6 0 188 204 82
588152 2 3 12 6 0 70 71 165
589153 2 3 12 6 0 74 75 121
590154 2 3 12 6 0 221 140 207
591155 2 3 12 6 0 147 221 207
592156 2 3 12 6 0 117 224 69
593157 2 3 12 6 0 225 124 67
594158 2 3 12 6 0 93 229 165
595159 2 3 12 6 0 233 156 180
596160 2 3 12 6 0 105 233 180
597161 2 3 12 6 0 158 236 180
598162 2 3 12 6 0 236 106 180
599163 2 3 12 6 0 122 246 104
600164 2 3 12 6 0 162 247 177
601165 2 3 12 6 0 247 78 177
602166 2 3 12 6 0 248 162 177
603167 2 3 12 6 0 162 248 99
604168 2 3 12 6 0 125 251 79
605169 2 3 12 6 0 173 259 205
606170 2 3 12 6 0 259 134 205
607171 2 3 12 6 0 192 269 268
608172 2 3 12 6 0 269 191 268
609173 2 3 12 6 0 131 272 163
610174 2 3 12 6 0 272 203 163
611175 2 3 12 6 0 273 92 20
612176 2 3 12 6 0 92 273 133
613177 2 3 12 6 0 90 275 188
614178 2 3 12 6 0 275 204 188
615179 2 3 12 6 0 44 202 43
616180 2 3 12 6 0 158 180 156
617181 2 3 12 6 0 184 161 107
618182 2 3 12 6 0 85 196 181
619183 2 3 12 6 0 199 200 182
620184 2 3 12 6 0 164 82 91
621185 2 3 12 6 0 164 116 82
622186 2 3 12 6 0 7 8 172
623187 2 3 12 6 0 172 241 7
624188 2 3 12 6 0 210 113 141
625189 2 3 12 6 0 219 113 210
626190 2 3 12 6 0 144 219 210
627191 2 3 12 6 0 113 211 141
628192 2 3 12 6 0 208 98 216
629193 2 3 12 6 0 207 140 216
630194 2 3 12 6 0 140 208 216
631195 2 3 12 6 0 218 96 144
632196 2 3 12 6 0 218 112 145
633197 2 3 12 6 0 96 219 144
634198 2 3 12 6 0 113 219 146
635199 2 3 12 6 0 140 221 148
636200 2 3 12 6 0 230 100 224
637201 2 3 12 6 0 100 228 225
638202 2 3 12 6 0 100 230 226
639203 2 3 12 6 0 198 124 227
640204 2 3 12 6 0 229 93 154
641205 2 3 12 6 0 154 232 229
642206 2 3 12 6 0 251 125 231
643207 2 3 12 6 0 233 101 156
644208 2 3 12 6 0 172 240 234
645209 2 3 12 6 0 189 235 121
646210 2 3 12 6 0 103 236 158
647211 2 3 12 6 0 236 103 108
648212 2 3 12 6 0 236 84 106
649213 2 3 12 6 0 84 236 108
650214 2 3 12 6 0 103 238 160
651215 2 3 12 6 0 240 8 9
652216 2 3 12 6 0 8 240 172
653217 2 3 12 6 0 244 93 72
654218 2 3 12 6 0 125 200 245
655219 2 3 12 6 0 231 125 245
656220 2 3 12 6 0 200 201 245
657221 2 3 12 6 0 77 246 128
658222 2 3 12 6 0 246 122 128
659223 2 3 12 6 0 99 264 253
660224 2 3 12 6 0 87 256 110
661225 2 3 12 6 0 167 257 118
662226 2 3 12 6 0 258 94 150
663227 2 3 12 6 0 114 261 260
664228 2 3 12 6 0 30 276 29
665229 2 3 12 6 0 268 191 58
666230 2 3 12 6 0 192 270 269
667231 2 3 12 6 0 270 197 269
668232 2 3 12 6 0 59 60 268
669233 2 3 12 6 0 60 192 268
670234 2 3 12 6 0 67 68 225
671235 2 3 12 6 0 61 270 192
672236 2 3 12 6 0 66 67 124
673237 2 3 12 6 0 198 66 124
674238 2 3 12 6 0 197 271 80
675239 2 3 12 6 0 271 199 80
676240 2 3 12 6 0 272 130 132
677241 2 3 12 6 0 130 272 131
678242 2 3 12 6 0 203 272 132
679243 2 3 12 6 0 204 133 274
680244 2 3 12 6 0 274 136 82
681245 2 3 12 6 0 204 274 82
682246 2 3 12 6 0 203 275 90
683247 2 3 12 6 0 275 203 92
684248 2 3 12 6 0 275 133 204
685249 2 3 12 6 0 133 275 92
686250 2 3 12 6 0 129 276 30
687251 2 3 12 6 0 24 277 23
688252 2 3 12 6 0 74 282 73
689253 2 3 12 6 0 283 98 208
690254 2 3 12 6 0 140 284 208
691255 2 3 12 6 0 166 291 154
692256 2 3 12 6 0 291 232 154
693257 2 3 12 6 0 235 293 167
694258 2 3 12 6 0 298 9 10
695259 2 3 12 6 0 243 298 10
696260 2 3 12 6 0 299 118 154
697261 2 3 12 6 0 300 153 119
698262 2 3 12 6 0 249 300 119
699263 2 3 12 6 0 249 304 300
700264 2 3 12 6 0 304 254 300
701265 2 3 12 6 0 306 166 118
702266 2 3 12 6 0 257 306 118
703267 2 3 12 6 0 308 101 175
704268 2 3 12 6 0 262 308 175
705269 2 3 12 6 0 310 102 177
706270 2 3 12 6 0 101 311 175
707271 2 3 12 6 0 311 266 175
708272 2 3 12 6 0 312 102 175
709273 2 3 12 6 0 266 312 175
710274 2 3 12 6 0 313 134 259
711275 2 3 12 6 0 267 313 259
712276 2 3 12 6 0 317 21 22
713277 2 3 12 6 0 138 277 24
714278 2 3 12 6 0 298 240 9
715279 2 3 12 6 0 137 317 22
716280 2 3 12 6 0 137 135 317
717281 2 3 12 6 0 277 137 23
718282 2 3 12 6 0 135 137 277
719283 2 3 12 6 0 241 6 7
720284 2 3 12 6 0 135 138 274
721285 2 3 12 6 0 135 277 138
722286 2 3 12 6 0 136 274 138
723287 2 3 12 6 0 195 241 189
724288 2 3 12 6 0 293 235 189
725289 2 3 12 6 0 241 295 189
726290 2 3 12 6 0 71 93 165
727291 2 3 12 6 0 93 71 72
728292 2 3 12 6 0 124 225 228
729293 2 3 12 6 0 227 124 228
730294 2 3 12 6 0 248 264 99
731295 2 3 12 6 0 177 102 248
732296 2 3 12 6 0 288 227 255
733297 2 3 12 6 0 255 227 228
734298 2 3 12 6 0 264 265 253
735299 2 3 12 6 0 273 20 21
736300 2 3 12 6 0 21 317 273
737301 2 3 12 6 0 274 133 273
738302 2 3 12 6 0 273 135 274
739303 2 3 12 6 0 317 135 273
740304 2 3 12 6 0 159 280 278
741305 2 3 12 6 0 160 280 159
742306 2 3 12 6 0 160 315 280
743307 2 3 12 6 0 121 282 74
744308 2 3 12 6 0 282 121 235
745309 2 3 12 6 0 206 98 283
746310 2 3 12 6 0 112 206 283
747311 2 3 12 6 0 284 140 148
748312 2 3 12 6 0 222 143 287
749313 2 3 12 6 0 252 290 289
750314 2 3 12 6 0 291 120 155
751315 2 3 12 6 0 120 291 166
752316 2 3 12 6 0 155 292 291
753317 2 3 12 6 0 292 232 291
754318 2 3 12 6 0 171 292 155
755319 2 3 12 6 0 294 113 146
756320 2 3 12 6 0 172 295 241
757321 2 3 12 6 0 234 295 172
758322 2 3 12 6 0 296 87 110
759323 2 3 12 6 0 297 199 182
760324 2 3 12 6 0 167 118 299
761325 2 3 12 6 0 299 235 167
762326 2 3 12 6 0 282 235 299
763327 2 3 12 6 0 299 244 282
764328 2 3 12 6 0 301 249 119
765329 2 3 12 6 0 109 303 99
766330 2 3 12 6 0 303 109 250
767331 2 3 12 6 0 303 162 99
768332 2 3 12 6 0 176 305 152
769333 2 3 12 6 0 120 306 149
770334 2 3 12 6 0 306 120 166
771335 2 3 12 6 0 306 257 149
772336 2 3 12 6 0 173 307 217
773337 2 3 12 6 0 217 307 146
774338 2 3 12 6 0 309 212 211
775339 2 3 12 6 0 262 212 309
776340 2 3 12 6 0 157 310 263
777341 2 3 12 6 0 311 101 233
778342 2 3 12 6 0 174 311 233
779343 2 3 12 6 0 311 174 266
780344 2 3 12 6 0 102 312 248
781345 2 3 12 6 0 264 312 266
782346 2 3 12 6 0 312 264 248
783347 2 3 12 6 0 134 313 116
784348 2 3 12 6 0 313 187 116
785349 2 3 12 6 0 187 313 267
786350 2 3 12 6 0 267 314 187
787351 2 3 12 6 0 314 111 187
788352 2 3 12 6 0 315 160 238
789353 2 3 12 6 0 316 126 202
790354 2 3 12 6 0 316 161 184
791355 2 3 12 6 0 318 261 114
792356 2 3 12 6 0 129 318 276
793357 2 3 12 6 0 319 84 108
794358 2 3 12 6 0 104 319 108
795359 2 3 12 6 0 320 316 184
796360 2 3 12 6 0 316 320 126
797361 2 3 12 6 0 321 6 241
798362 2 3 12 6 0 195 321 241
799363 2 3 12 6 0 323 170 258
800364 2 3 12 6 0 150 323 258
801365 2 3 12 6 0 148 324 139
802366 2 3 12 6 0 325 253 265
803367 2 3 12 6 0 327 265 264
804368 2 3 12 6 0 266 327 264
805369 2 3 12 6 0 152 328 83
806370 2 3 12 6 0 328 265 83
807371 2 3 12 6 0 329 62 63
808372 2 3 12 6 0 64 330 63
809373 2 3 12 6 0 331 104 159
810374 2 3 12 6 0 278 331 159
811375 2 3 12 6 0 334 216 143
812376 2 3 12 6 0 215 335 95
813377 2 3 12 6 0 335 215 157
814378 2 3 12 6 0 245 338 231
815379 2 3 12 6 0 338 288 231
816380 2 3 12 6 0 254 339 171
817381 2 3 12 6 0 339 292 171
818382 2 3 12 6 0 341 211 113
819383 2 3 12 6 0 294 341 113
820384 2 3 12 6 0 54 343 110
821385 2 3 12 6 0 343 296 110
822386 2 3 12 6 0 347 294 146
823387 2 3 12 6 0 307 347 146
824388 2 3 12 6 0 96 349 217
825389 2 3 12 6 0 349 96 314
826390 2 3 12 6 0 353 260 261
827391 2 3 12 6 0 247 301 78
828392 2 3 12 6 0 162 303 247
829393 2 3 12 6 0 303 345 247
830394 2 3 12 6 0 302 79 251
831395 2 3 12 6 0 290 252 251
832396 2 3 12 6 0 302 251 252
833397 2 3 12 6 0 290 251 231
834398 2 3 12 6 0 281 130 186
835399 2 3 12 6 0 209 281 186
836400 2 3 12 6 0 52 333 51
837401 2 3 12 6 0 286 147 207
838402 2 3 12 6 0 290 288 255
839403 2 3 12 6 0 255 289 290
840404 2 3 12 6 0 290 231 288
841405 2 3 12 6 0 257 167 293
842406 2 3 12 6 0 295 293 189
843407 2 3 12 6 0 73 244 72
844408 2 3 12 6 0 244 73 282
845409 2 3 12 6 0 243 10 11
846410 2 3 12 6 0 262 309 308
847411 2 3 12 6 0 246 319 104
848412 2 3 12 6 0 319 107 84
849413 2 3 12 6 0 319 77 107
850414 2 3 12 6 0 246 77 319
851415 2 3 12 6 0 6 321 5
852416 2 3 12 6 0 194 321 195
853417 2 3 12 6 0 216 322 207
854418 2 3 12 6 0 216 334 322
855419 2 3 12 6 0 97 323 150
856420 2 3 12 6 0 326 213 237
857421 2 3 12 6 0 174 327 266
858422 2 3 12 6 0 327 83 265
859423 2 3 12 6 0 127 330 64
860424 2 3 12 6 0 331 122 104
861425 2 3 12 6 0 52 53 333
862426 2 3 12 6 0 333 256 223
863427 2 3 12 6 0 298 243 337
864428 2 3 12 6 0 338 227 288
865429 2 3 12 6 0 227 338 198
866430 2 3 12 6 0 341 213 211
867431 2 3 12 6 0 213 341 237
868432 2 3 12 6 0 239 341 294
869433 2 3 12 6 0 341 239 237
870434 2 3 12 6 0 296 343 342
871435 2 3 12 6 0 344 249 301
872436 2 3 12 6 0 249 344 304
873437 2 3 12 6 0 151 346 176
874438 2 3 12 6 0 346 151 223
875439 2 3 12 6 0 346 305 176
876440 2 3 12 6 0 239 347 260
877441 2 3 12 6 0 347 239 294
878442 2 3 12 6 0 347 307 260
879443 2 3 12 6 0 102 348 175
880444 2 3 12 6 0 348 102 310
881445 2 3 12 6 0 348 262 175
882446 2 3 12 6 0 348 157 212
883447 2 3 12 6 0 157 348 310
884448 2 3 12 6 0 262 348 212
885449 2 3 12 6 0 79 350 182
886450 2 3 12 6 0 350 297 182
887451 2 3 12 6 0 351 29 276
888452 2 3 12 6 0 351 28 29
889453 2 3 12 6 0 134 352 205
890454 2 3 12 6 0 352 134 164
891455 2 3 12 6 0 353 239 260
892456 2 3 12 6 0 46 355 45
893457 2 3 12 6 0 332 279 355
894458 2 3 12 6 0 357 145 111
895459 2 3 12 6 0 314 357 111
896460 2 3 12 6 0 359 304 289
897461 2 3 12 6 0 304 359 254
898462 2 3 12 6 0 364 285 284
899463 2 3 12 6 0 148 364 284
900464 2 3 12 6 0 145 365 89
901465 2 3 12 6 0 365 285 89
902466 2 3 12 6 0 367 11 12
903467 2 3 12 6 0 238 369 237
904468 2 3 12 6 0 369 326 237
905469 2 3 12 6 0 330 371 201
906470 2 3 12 6 0 371 245 201
907471 2 3 12 6 0 375 240 298
908472 2 3 12 6 0 337 375 298
909473 2 3 12 6 0 228 376 255
910474 2 3 12 6 0 199 379 80
911475 2 3 12 6 0 379 199 297
912476 2 3 12 6 0 238 382 315
913477 2 3 12 6 0 382 353 315
914478 2 3 12 6 0 202 383 316
915479 2 3 12 6 0 212 141 211
916480 2 3 12 6 0 13 14 220
917481 2 3 12 6 0 284 283 208
918482 2 3 12 6 0 284 285 283
919483 2 3 12 6 0 211 213 309
920484 2 3 12 6 0 370 309 213
921485 2 3 12 6 0 326 370 213
922486 2 3 12 6 0 81 126 320
923487 2 3 12 6 0 354 81 320
924488 2 3 12 6 0 183 320 184
925489 2 3 12 6 0 354 320 183
926490 2 3 12 6 0 305 328 152
927491 2 3 12 6 0 328 325 265
928492 2 3 12 6 0 305 325 328
929493 2 3 12 6 0 329 201 271
930494 2 3 12 6 0 329 330 201
931495 2 3 12 6 0 330 329 63
932496 2 3 12 6 0 51 362 50
933497 2 3 12 6 0 143 222 334
934498 2 3 12 6 0 170 334 258
935499 2 3 12 6 0 170 322 334
936500 2 3 12 6 0 335 157 263
937501 2 3 12 6 0 226 340 339
938502 2 3 12 6 0 340 292 339
939503 2 3 12 6 0 232 340 229
940504 2 3 12 6 0 340 232 292
941505 2 3 12 6 0 173 349 259
942506 2 3 12 6 0 349 173 217
943507 2 3 12 6 0 349 267 259
944508 2 3 12 6 0 314 267 349
945509 2 3 12 6 0 345 302 252
946510 2 3 12 6 0 345 250 302
947511 2 3 12 6 0 250 345 303
948512 2 3 12 6 0 357 218 145
949513 2 3 12 6 0 218 357 96
950514 2 3 12 6 0 357 314 96
951515 2 3 12 6 0 358 85 161
952516 2 3 12 6 0 316 358 161
953517 2 3 12 6 0 383 358 316
954518 2 3 12 6 0 31 361 129
955519 2 3 12 6 0 361 31 32
956520 2 3 12 6 0 362 51 333
957521 2 3 12 6 0 223 362 333
958522 2 3 12 6 0 362 223 151
959523 2 3 12 6 0 186 89 363
960524 2 3 12 6 0 89 285 363
961525 2 3 12 6 0 363 209 186
962526 2 3 12 6 0 139 364 148
963527 2 3 12 6 0 364 139 209
964528 2 3 12 6 0 209 363 364
965529 2 3 12 6 0 363 285 364
966530 2 3 12 6 0 112 365 145
967531 2 3 12 6 0 365 112 283
968532 2 3 12 6 0 285 365 283
969533 2 3 12 6 0 196 366 181
970534 2 3 12 6 0 11 367 243
971535 2 3 12 6 0 368 170 323
972536 2 3 12 6 0 368 322 170
973537 2 3 12 6 0 368 286 207
974538 2 3 12 6 0 322 368 207
975539 2 3 12 6 0 97 368 323
976540 2 3 12 6 0 369 103 158
977541 2 3 12 6 0 103 369 238
978542 2 3 12 6 0 326 369 158
979543 2 3 12 6 0 370 308 309
980544 2 3 12 6 0 101 308 370
981545 2 3 12 6 0 326 158 370
982546 2 3 12 6 0 156 370 158
983547 2 3 12 6 0 101 370 156
984548 2 3 12 6 0 127 371 330
985549 2 3 12 6 0 245 371 338
986550 2 3 12 6 0 372 122 331
987551 2 3 12 6 0 35 372 34
988552 2 3 12 6 0 278 372 331
989553 2 3 12 6 0 372 278 34
990554 2 3 12 6 0 368 97 373
991555 2 3 12 6 0 336 337 373
992556 2 3 12 6 0 286 368 373
993557 2 3 12 6 0 375 234 240
994558 2 3 12 6 0 234 375 336
995559 2 3 12 6 0 375 337 336
996560 2 3 12 6 0 100 376 228
997561 2 3 12 6 0 100 226 376
998562 2 3 12 6 0 377 269 197
999563 2 3 12 6 0 80 377 197
1000564 2 3 12 6 0 54 55 343
1001565 2 3 12 6 0 55 342 343
1002566 2 3 12 6 0 296 378 87
1003567 2 3 12 6 0 99 380 109
1004568 2 3 12 6 0 99 253 380
1005569 2 3 12 6 0 380 253 325
1006570 2 3 12 6 0 318 381 276
1007571 2 3 12 6 0 381 318 114
1008572 2 3 12 6 0 381 351 276
1009573 2 3 12 6 0 205 381 114
1010574 2 3 12 6 0 27 28 193
1011575 2 3 12 6 0 382 237 239
1012576 2 3 12 6 0 237 382 238
1013577 2 3 12 6 0 353 382 239
1014578 2 3 12 6 0 44 383 202
1015579 2 3 12 6 0 46 47 332
1016580 2 3 12 6 0 355 46 332
1017581 2 3 12 6 0 384 139 220
1018582 2 3 12 6 0 385 336 373
1019583 2 3 12 6 0 336 385 149
1020584 2 3 12 6 0 97 385 373
1021585 2 3 12 6 0 386 13 220
1022586 2 3 12 6 0 387 50 362
1023587 2 3 12 6 0 151 387 362
1024588 2 3 12 6 0 388 149 257
1025589 2 3 12 6 0 149 388 336
1026590 2 3 12 6 0 390 360 389
1027591 2 3 12 6 0 242 390 389
1028592 2 3 12 6 0 391 360 380
1029593 2 3 12 6 0 325 391 380
1030594 2 3 12 6 0 392 261 318
1031595 2 3 12 6 0 393 151 176
1032596 2 3 12 6 0 151 393 387
1033597 2 3 12 6 0 301 395 78
1034598 2 3 12 6 0 95 396 287
1035599 2 3 12 6 0 396 95 335
1036600 2 3 12 6 0 339 397 226
1037601 2 3 12 6 0 397 376 226
1038602 2 3 12 6 0 398 377 80
1039603 2 3 12 6 0 169 385 97
1040604 2 3 12 6 0 169 149 385
1041605 2 3 12 6 0 117 165 230
1042606 2 3 12 6 0 224 117 230
1043607 2 3 12 6 0 229 230 165
1044608 2 3 12 6 0 229 340 230
1045609 2 3 12 6 0 340 226 230
1046610 2 3 12 6 0 344 345 252
1047611 2 3 12 6 0 289 255 359
1048612 2 3 12 6 0 376 359 255
1049613 2 3 12 6 0 374 337 243
1050614 2 3 12 6 0 367 374 243
1051615 2 3 12 6 0 286 374 147
1052616 2 3 12 6 0 286 373 374
1053617 2 3 12 6 0 373 337 374
1054618 2 3 12 6 0 139 384 209
1055619 2 3 12 6 0 384 281 209
1056620 2 3 12 6 0 13 386 12
1057621 2 3 12 6 0 350 390 297
1058622 2 3 12 6 0 390 242 297
1059623 2 3 12 6 0 305 391 325
1060624 2 3 12 6 0 394 48 49
1061625 2 3 12 6 0 119 395 301
1062626 2 3 12 6 0 254 397 339
1063627 2 3 12 6 0 397 254 359
1064628 2 3 12 6 0 376 397 359
1065629 2 3 12 6 0 398 296 342
1066630 2 3 12 6 0 378 296 398
1067631 2 3 12 6 0 399 39 40
1068632 2 3 12 6 0 399 88 81
1069633 2 3 12 6 0 354 399 81
1070634 2 3 12 6 0 190 399 40
1071635 2 3 12 6 0 88 399 190
1072636 2 3 12 6 0 174 400 327
1073637 2 3 12 6 0 400 174 178
1074638 2 3 12 6 0 400 83 327
1075639 2 3 12 6 0 401 271 197
1076640 2 3 12 6 0 271 401 329
1077641 2 3 12 6 0 402 302 250
1078642 2 3 12 6 0 406 390 350
1079643 2 3 12 6 0 407 222 287
1080644 2 3 12 6 0 395 407 287
1081645 2 3 12 6 0 408 398 342
1082646 2 3 12 6 0 354 409 399
1083647 2 3 12 6 0 68 69 224
1084648 2 3 12 6 0 68 224 225
1085649 2 3 12 6 0 100 225 224
1086650 2 3 12 6 0 378 242 87
1087651 2 3 12 6 0 389 87 242
1088652 2 3 12 6 0 374 367 356
1089653 2 3 12 6 0 374 356 147
1090654 2 3 12 6 0 242 379 297
1091655 2 3 12 6 0 242 378 379
1092656 2 3 12 6 0 379 398 80
1093657 2 3 12 6 0 379 378 398
1094658 2 3 12 6 0 388 295 234
1095659 2 3 12 6 0 295 388 293
1096660 2 3 12 6 0 388 234 336
1097661 2 3 12 6 0 388 257 293
1098662 2 3 12 6 0 393 394 387
1099663 2 3 12 6 0 396 395 287
1100664 2 3 12 6 0 396 335 263
1101665 2 3 12 6 0 383 45 355
1102666 2 3 12 6 0 45 383 44
1103667 2 3 12 6 0 402 79 302
1104668 2 3 12 6 0 79 402 350
1105669 2 3 12 6 0 403 280 315
1106670 2 3 12 6 0 223 405 346
1107671 2 3 12 6 0 256 405 223
1108672 2 3 12 6 0 406 360 390
1109673 2 3 12 6 0 406 380 360
1110674 2 3 12 6 0 380 406 109
1111675 2 3 12 6 0 49 50 387
1112676 2 3 12 6 0 394 49 387
1113677 2 3 12 6 0 168 407 119
1114678 2 3 12 6 0 407 168 222
1115679 2 3 12 6 0 407 395 119
1116680 2 3 12 6 0 377 408 269
1117681 2 3 12 6 0 408 377 398
1118682 2 3 12 6 0 408 191 269
1119683 2 3 12 6 0 38 409 37
1120684 2 3 12 6 0 409 354 183
1121685 2 3 12 6 0 410 122 372
1122686 2 3 12 6 0 411 33 34
1123687 2 3 12 6 0 278 411 34
1124688 2 3 12 6 0 342 55 56
1125689 2 3 12 6 0 220 139 324
1126690 2 3 12 6 0 324 221 147
1127691 2 3 12 6 0 356 324 147
1128692 2 3 12 6 0 221 324 148
1129693 2 3 12 6 0 392 353 261
1130694 2 3 12 6 0 403 392 361
1131695 2 3 12 6 0 401 61 62
1132696 2 3 12 6 0 61 401 270
1133697 2 3 12 6 0 62 329 401
1134698 2 3 12 6 0 270 401 197
1135699 2 3 12 6 0 250 109 402
1136700 2 3 12 6 0 406 402 109
1137701 2 3 12 6 0 402 406 350
1138702 2 3 12 6 0 38 39 409
1139703 2 3 12 6 0 39 399 409
1140704 2 3 12 6 0 14 15 384
1141705 2 3 12 6 0 220 14 384
1142706 2 3 12 6 0 410 128 122
1143707 2 3 12 6 0 35 36 410
1144708 2 3 12 6 0 372 35 410
1145709 2 3 12 6 0 411 32 33
1146710 2 3 12 6 0 412 366 196
1147711 2 3 12 6 0 414 366 412
1148712 2 3 12 6 0 279 412 196
1149713 2 3 12 6 0 413 394 393
1150714 2 3 12 6 0 393 415 413
1151715 2 3 12 6 0 414 178 366
1152716 2 3 12 6 0 400 178 414
1153717 2 3 12 6 0 415 176 152
1154718 2 3 12 6 0 176 415 393
1155719 2 3 12 6 0 404 415 152
1156720 2 3 12 6 0 416 305 346
1157721 2 3 12 6 0 305 416 391
1158722 2 3 12 6 0 405 416 346
1159723 2 3 12 6 0 360 416 389
1160724 2 3 12 6 0 416 360 391
1161725 2 3 12 6 0 416 405 389
1162726 2 3 12 6 0 366 105 181
1163727 2 3 12 6 0 105 366 178
1164728 2 3 12 6 0 98 143 216
1165729 2 3 12 6 0 143 98 214
1166730 2 3 12 6 0 254 153 300
1167731 2 3 12 6 0 153 254 171
1168732 2 3 12 6 0 214 206 142
1169733 2 3 12 6 0 206 214 98
1170734 2 3 12 6 0 307 114 260
1171735 2 3 12 6 0 114 307 173
1172736 2 3 12 6 0 338 127 198
1173737 2 3 12 6 0 127 338 371
1174738 2 3 12 6 0 355 358 383
1175739 2 3 12 6 0 358 355 279
1176740 2 3 12 6 0 381 352 351
1177741 2 3 12 6 0 352 381 205
1178742 2 3 12 6 0 168 94 258
1179743 2 3 12 6 0 94 168 153
1180744 2 3 12 6 0 222 258 334
1181745 2 3 12 6 0 258 222 168
1182746 2 3 12 6 0 196 358 279
1183747 2 3 12 6 0 358 196 85
1184748 2 3 12 6 0 177 263 310
1185749 2 3 12 6 0 263 177 78
1186750 2 3 12 6 0 78 396 263
1187751 2 3 12 6 0 396 78 395
1188752 2 3 12 6 0 405 87 389
1189753 2 3 12 6 0 87 405 256
1190754 2 3 12 6 0 155 150 94
1191755 2 3 12 6 0 155 120 150
1192756 2 3 12 6 0 217 219 96
1193757 2 3 12 6 0 217 146 219
1194758 2 3 12 6 0 178 233 105
1195759 2 3 12 6 0 178 174 233
1196760 2 3 12 6 0 107 106 84
1197761 2 3 12 6 0 107 179 106
1198762 2 3 12 6 0 112 144 206
1199763 2 3 12 6 0 218 144 112
1200764 2 3 12 6 0 193 164 91
1201765 2 3 12 6 0 352 164 193
1202766 2 3 12 6 0 386 367 12
1203767 2 3 12 6 0 386 356 367
1204768 2 3 12 6 0 417 128 410
1205769 2 3 12 6 0 143 420 287
1206770 2 3 12 6 0 420 143 214
1207771 2 3 12 6 0 420 95 287
1208772 2 3 12 6 0 421 18 132
1209773 2 3 12 6 0 130 421 132
1210774 2 3 12 6 0 18 421 17
1211775 2 3 12 6 0 210 422 142
1212776 2 3 12 6 0 215 422 141
1213777 2 3 12 6 0 422 210 141
1214778 2 3 12 6 0 423 76 4
1215779 2 3 12 6 0 76 423 194
1216780 2 3 12 6 0 5 423 4
1217781 2 3 12 6 0 95 424 215
1218782 2 3 12 6 0 142 424 214
1219783 2 3 12 6 0 321 423 5
1220784 2 3 12 6 0 321 194 423
1221785 2 3 12 6 0 422 424 142
1222786 2 3 12 6 0 422 215 424
1223787 2 3 12 6 0 420 424 95
1224788 2 3 12 6 0 420 214 424
1225789 2 3 12 6 0 318 129 392
1226790 2 3 12 6 0 129 361 392
1227791 2 3 12 6 0 128 417 183
1228792 2 3 12 6 0 409 417 37
1229793 2 3 12 6 0 417 409 183
1230794 2 3 12 6 0 36 37 417
1231795 2 3 12 6 0 410 36 417
1232796 2 3 12 6 0 332 418 279
1233797 2 3 12 6 0 418 412 279
1234798 2 3 12 6 0 419 412 418
1235799 2 3 12 6 0 413 419 418
1236800 2 3 12 6 0 419 404 414
1237801 2 3 12 6 0 412 419 414
1238802 2 3 12 6 0 404 413 415
1239803 2 3 12 6 0 413 404 419
1240804 2 3 12 6 0 142 144 210
1241805 2 3 12 6 0 144 142 206
1242806 2 3 12 6 0 83 425 152
1243807 2 3 12 6 0 404 425 414
1244808 2 3 12 6 0 425 404 152
1245809 2 3 12 6 0 56 426 342
1246810 2 3 12 6 0 408 426 191
1247811 2 3 12 6 0 426 408 342
1248812 2 3 12 6 0 427 16 17
1249813 2 3 12 6 0 427 130 281
1250814 2 3 12 6 0 16 427 281
1251815 2 3 12 6 0 421 427 17
1252816 2 3 12 6 0 421 130 427
1253817 2 3 12 6 0 400 425 83
1254818 2 3 12 6 0 400 414 425
1255819 2 3 12 6 0 56 57 426
1256820 2 3 12 6 0 57 191 426
1257821 2 3 12 6 0 48 428 47
1258822 2 3 12 6 0 428 48 394
1259823 2 3 12 6 0 413 428 394
1260824 2 3 12 6 0 413 418 428
1261825 2 3 12 6 0 428 332 47
1262826 2 3 12 6 0 418 332 428
1263827 2 3 12 6 0 344 247 345
1264828 2 3 12 6 0 247 344 301
1265829 2 3 12 6 0 386 324 356
1266830 2 3 12 6 0 324 386 220
1267831 2 3 12 6 0 315 392 403
1268832 2 3 12 6 0 392 315 353
1269833 2 3 12 6 0 411 361 32
1270834 2 3 12 6 0 361 411 403
1271835 2 3 12 6 0 244 154 93
1272836 2 3 12 6 0 154 244 299
1273837 2 3 12 6 0 351 193 28
1274838 2 3 12 6 0 193 351 352
1275839 2 3 12 6 0 110 333 53
1276840 2 3 12 6 0 333 110 256
1277841 2 3 12 6 0 15 281 384
1278842 2 3 12 6 0 16 281 15
1279843 2 3 12 6 0 136 26 91
1280844 2 3 12 6 0 26 136 25
1281845 2 3 12 6 0 215 212 157
1282846 2 3 12 6 0 212 215 141
1283847 2 3 12 6 0 201 199 271
1284848 2 3 12 6 0 199 201 200
1285849 2 3 12 6 0 344 289 304
1286850 2 3 12 6 0 289 344 252
1287851 2 3 12 6 0 278 403 411
1288852 2 3 12 6 0 403 278 280
1289853 2 3 12 6 0 59 58 1
1290854 2 3 12 6 0 58 59 268
1291$EndElements
12920
=== removed file 'tests/Stokes_mms_p0p1cv/src/MMS_C.geo'
--- tests/Stokes_mms_p0p1cv/src/MMS_C.geo 2010-05-07 20:23:24 +0000
+++ tests/Stokes_mms_p0p1cv/src/MMS_C.geo 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1Point(1) = {0.0,0.0,0,0.08};
2Point(2) = {3.1415926535897931,0.0,0,0.08};
3Point(3) = {3.1415926535897931,3.1415926535897931,0,0.08};
4Point(4) = {0.0,3.1415926535897931,0,0.08};
5Line(1) = {4,3};
6Line(2) = {3,2};
7Line(3) = {2,1};
8Line(4) = {1,4};
9Line Loop(5) = {1,2,3,4};
10Plane Surface(6) = {5};
11Physical Line(7) = {3};
12Physical Line(8) = {2};
13Physical Line(9) = {1};
14Physical Line(10) = {4};
15Physical Surface(12) = {6};
160
=== removed file 'tests/Stokes_mms_p0p1cv/src/MMS_C.msh'
--- tests/Stokes_mms_p0p1cv/src/MMS_C.msh 2010-05-07 20:23:24 +0000
+++ tests/Stokes_mms_p0p1cv/src/MMS_C.msh 1970-01-01 00:00:00 +0000
@@ -1,4828 +0,0 @@
1$MeshFormat
22 0 8
3$EndMeshFormat
4$Nodes
51607
61 0 0 0
72 3.141592653589793 0 0
83 3.141592653589793 3.141592653589793 0
94 0 3.141592653589793 0
105 0.08055365778430337 3.141592653589793 0
116 0.1611073155686067 3.141592653589793 0
127 0.2416609733529101 3.141592653589793 0
138 0.3222146311372135 3.141592653589793 0
149 0.4027682889215169 3.141592653589793 0
1510 0.4833219467058202 3.141592653589793 0
1611 0.5638756044901236 3.141592653589793 0
1712 0.644429262274427 3.141592653589793 0
1813 0.7249829200587304 3.141592653589793 0
1914 0.8055365778430743 3.141592653589793 0
2015 0.8860902356275395 3.141592653589793 0
2116 0.9666438934120049 3.141592653589793 0
2217 1.04719755119647 3.141592653589793 0
2318 1.127751208980936 3.141592653589793 0
2419 1.208304866765401 3.141592653589793 0
2520 1.288858524549866 3.141592653589793 0
2621 1.369412182334331 3.141592653589793 0
2722 1.449965840118797 3.141592653589793 0
2823 1.530519497903262 3.141592653589793 0
2924 1.611073155687799 3.141592653589793 0
3025 1.691626813472406 3.141592653589793 0
3126 1.772180471257014 3.141592653589793 0
3227 1.852734129041621 3.141592653589793 0
3328 1.933287786826229 3.141592653589793 0
3429 2.013841444610837 3.141592653589793 0
3530 2.094395102395445 3.141592653589793 0
3631 2.174948760180052 3.141592653589793 0
3732 2.25550241796466 3.141592653589793 0
3833 2.336056075749267 3.141592653589793 0
3934 2.416609733533448 3.141592653589793 0
4035 2.497163391317486 3.141592653589793 0
4136 2.577717049101525 3.141592653589793 0
4237 2.658270706885563 3.141592653589793 0
4338 2.738824364669601 3.141592653589793 0
4439 2.81937802245364 3.141592653589793 0
4540 2.899931680237678 3.141592653589793 0
4641 2.980485338021716 3.141592653589793 0
4742 3.061038995805755 3.141592653589793 0
4843 3.141592653589793 3.061038995805297 0
4944 3.141592653589793 2.980485338020801 0
5045 3.141592653589793 2.899931680236305 0
5146 3.141592653589793 2.819378022451809 0
5247 3.141592653589793 2.738824364667313 0
5348 3.141592653589793 2.658270706882817 0
5449 3.141592653589793 2.577717049098321 0
5550 3.141592653589793 2.497163391313825 0
5651 3.141592653589793 2.416609733529329 0
5752 3.141592653589793 2.336056075744833 0
5853 3.141592653589793 2.255502417960337 0
5954 3.141592653589793 2.174948760175841 0
6055 3.141592653589793 2.094395102391345 0
6156 3.141592653589793 2.013841444606849 0
6257 3.141592653589793 1.933287786822353 0
6358 3.141592653589793 1.852734129037857 0
6459 3.141592653589793 1.772180471253361 0
6560 3.141592653589793 1.691626813468865 0
6661 3.141592653589793 1.611073155684369 0
6762 3.141592653589793 1.530519497899874 0
6863 3.141592653589793 1.449965840115377 0
6964 3.141592653589793 1.369412182330881 0
7065 3.141592653589793 1.288858524546385 0
7166 3.141592653589793 1.208304866761889 0
7267 3.141592653589793 1.127751208977393 0
7368 3.141592653589793 1.047197551192897 0
7469 3.141592653589793 0.966643893408401 0
7570 3.141592653589793 0.8860902356239051 0
7671 3.141592653589793 0.8055365778394092 0
7772 3.141592653589793 0.7249829200553402 0
7873 3.141592653589793 0.6444292622714136 0
7974 3.141592653589793 0.5638756044874866 0
8075 3.141592653589793 0.4833219467035597 0
8176 3.141592653589793 0.4027682889196336 0
8277 3.141592653589793 0.3222146311357066 0
8378 3.141592653589793 0.2416609733517801 0
8479 3.141592653589793 0.1611073155678531 0
8580 3.141592653589793 0.08055365778392698 0
8681 3.061038995805297 0 0
8782 2.980485338020801 0 0
8883 2.899931680236305 0 0
8984 2.819378022451809 0 0
9085 2.738824364667313 0 0
9186 2.658270706882817 0 0
9287 2.577717049098321 0 0
9388 2.497163391313825 0 0
9489 2.416609733529329 0 0
9590 2.336056075744833 0 0
9691 2.255502417960337 0 0
9792 2.174948760175841 0 0
9893 2.094395102391345 0 0
9994 2.013841444606849 0 0
10095 1.933287786822353 0 0
10196 1.852734129037857 0 0
10297 1.772180471253361 0 0
10398 1.691626813468865 0 0
10499 1.611073155684369 0 0
105100 1.530519497899874 0 0
106101 1.449965840115377 0 0
107102 1.369412182330881 0 0
108103 1.288858524546385 0 0
109104 1.208304866761889 0 0
110105 1.127751208977393 0 0
111106 1.047197551192897 0 0
112107 0.966643893408401 0 0
113108 0.8860902356239051 0 0
114109 0.8055365778394092 0 0
115110 0.7249829200553402 0 0
116111 0.6444292622714136 0 0
117112 0.5638756044874866 0 0
118113 0.4833219467035597 0 0
119114 0.4027682889196336 0 0
120115 0.3222146311357066 0 0
121116 0.2416609733517801 0 0
122117 0.1611073155678531 0 0
123118 0.08055365778392698 0 0
124119 0 0.08055365778430337 0
125120 0 0.1611073155686067 0
126121 0 0.2416609733529101 0
127122 0 0.3222146311372135 0
128123 0 0.4027682889215169 0
129124 0 0.4833219467058202 0
The diff has been truncated for viewing.