From: Baerbel Jannsen Date: Thu, 18 Mar 2010 15:37:26 +0000 (+0000) Subject: some output removed X-Git-Tag: v8.0.0~6308 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b671d04114ba16ef60ee5e15bdfa9ea3cc4749;p=dealii.git some output removed git-svn-id: https://svn.dealii.org/trunk@20846 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/multigrid/mg_output/cmp/generic b/tests/multigrid/mg_output/cmp/generic index 62655b5d54..6f28dea42e 100644 --- a/tests/multigrid/mg_output/cmp/generic +++ b/tests/multigrid/mg_output/cmp/generic @@ -1,6 +1,5 @@ DEAL::FESystem<2>[FE_Q<2>(1)^4] -DEAL::Prebuilt copy_to_mg DEAL:: DEAL::Level 0 DEAL:: 176797 176868 176940 177011 178965 179036 179107 179179 181280 181352 181423 181494 183449 183520 183591 183662 @@ -17,8 +16,7 @@ DEAL:: 3213 3214 3215 3217 6446 6448 6451 6453 6608 6610 6613 6615 31336 31346 3 DEAL::Level 6 DEAL:: 0 0 0 0 0 0 0 0 3533 3534 3535 3537 5786 5788 5790 5792 0 0 0 0 0 0 0 0 5786 5788 5790 5792 6586 6588 6590 6592 3533 3534 3535 3537 5786 5788 5790 5792 8414 8417 8420 8423 12324 12328 12332 12336 5786 5788 5790 5792 6586 6588 6590 6592 12324 12328 12332 12336 13444 13448 13452 13456 0 0 0 0 3693 3694 3695 3697 0 0 0 0 6034 6036 6038 6040 3693 3694 3695 3697 8414 8417 8420 8423 6034 6036 6038 6040 12596 12600 12604 12608 0 0 0 0 6034 6036 6038 6040 0 0 0 0 7506 7508 7510 7512 6034 6036 6038 6040 12596 12600 12604 12608 7506 7508 7510 7512 15060 15064 15068 15072 8414 8417 8420 8423 12324 12328 12332 12336 12596 12600 12604 12608 12964 12968 12972 12976 12324 12328 12332 12336 13444 13448 13452 13456 12964 12968 12972 12976 13988 13992 13996 14000 12596 12600 12604 12608 12964 12968 12972 12976 15060 15064 15068 15072 15396 15400 15404 15408 12964 12968 12972 12976 13988 13992 13996 14000 15396 15400 15404 15408 16420 16424 16428 16432 0 0 0 0 0 0 0 0 6586 6588 6590 6592 6810 6812 6814 6816 0 0 0 0 0 0 0 0 6810 6812 6814 6816 4273 4274 4275 4277 6586 6588 6590 6592 6810 6812 6814 6816 13444 13448 13452 13456 13988 13992 13996 14000 6810 6812 6814 6816 4273 4274 4275 4277 13988 13992 13996 14000 10046 10049 10052 10055 13444 13448 13452 13456 13988 13992 13996 14000 13988 13992 13996 14000 14500 14504 14508 14512 13988 13992 13996 14000 10046 10049 10052 10055 14500 14504 14508 14512 14996 15000 15004 15008 13988 13992 13996 14000 14500 14504 14508 14512 16420 16424 16428 16432 16932 16936 16940 16944 14500 14504 14508 14512 14996 15000 15004 15008 16932 16936 16940 16944 17524 17528 17532 17536 10046 10049 10052 10055 4673 4674 4675 4677 14996 15000 15004 15008 7590 7592 7594 7596 4673 4674 4675 4677 0 0 0 0 7590 7592 7594 7596 0 0 0 0 14996 15000 15004 15008 7590 7592 7594 7596 17524 17528 17532 17536 9062 9064 9066 9068 7590 7592 7594 7596 0 0 0 0 9062 9064 9066 9068 0 0 0 0 0 0 0 0 7506 7508 7510 7512 0 0 0 0 7826 7828 7830 7832 7506 7508 7510 7512 15060 15064 15068 15072 7826 7828 7830 7832 16180 16184 16188 16192 0 0 0 0 7826 7828 7830 7832 0 0 0 0 4933 4934 4935 4937 7826 7828 7830 7832 16180 16184 16188 16192 4933 4934 4935 4937 11502 11505 11508 11511 15060 15064 15068 15072 15396 15400 15404 15408 16180 16184 16188 16192 16548 16552 16556 16560 15396 15400 15404 15408 16420 16424 16428 16432 16548 16552 16556 16560 17572 17576 17580 17584 16180 16184 16188 16192 16548 16552 16556 16560 11502 11505 11508 11511 17060 17064 17068 17072 16548 16552 16556 16560 17572 17576 17580 17584 17060 17064 17068 17072 18372 18376 18380 18384 11502 11505 11508 11511 17060 17064 17068 17072 5333 5334 5335 5337 8642 8644 8646 8648 17060 17064 17068 17072 18372 18376 18380 18384 8642 8644 8646 8648 9442 9444 9446 9448 5333 5334 5335 5337 8642 8644 8646 8648 0 0 0 0 0 0 0 0 8642 8644 8646 8648 9442 9444 9446 9448 0 0 0 0 0 0 0 0 16420 16424 16428 16432 16932 16936 16940 16944 17572 17576 17580 17584 18084 18088 18092 18096 16932 16936 16940 16944 17524 17528 17532 17536 18084 18088 18092 18096 18580 18584 18588 18592 17572 17576 17580 17584 18084 18088 18092 18096 18372 18376 18380 18384 18980 18984 18988 18992 18084 18088 18092 18096 18580 18584 18588 18592 18980 18984 18988 18992 13122 13125 13128 13131 17524 17528 17532 17536 9062 9064 9066 9068 18580 18584 18588 18592 9382 9384 9386 9388 9062 9064 9066 9068 0 0 0 0 9382 9384 9386 9388 0 0 0 0 18580 18584 18588 18592 9382 9384 9386 9388 13122 13125 13128 13131 5913 5914 5915 5917 9382 9384 9386 9388 0 0 0 0 5913 5914 5915 5917 0 0 0 0 18372 18376 18380 18384 18980 18984 18988 18992 9442 9444 9446 9448 9666 9668 9670 9672 18980 18984 18988 18992 13122 13125 13128 13131 9666 9668 9670 9672 6073 6074 6075 6077 9442 9444 9446 9448 9666 9668 9670 9672 0 0 0 0 0 0 0 0 9666 9668 9670 9672 6073 6074 6075 6077 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2609 2610 2611 2612 0 0 0 0 0 0 0 0 2609 2610 2611 2612 3533 3534 3535 3537 0 0 0 0 2609 2610 2611 2612 0 0 0 0 3693 3694 3695 3697 2609 2610 2611 2612 3533 3534 3535 3537 3693 3694 3695 3697 8414 8417 8420 8423 0 0 0 0 0 0 0 0 4273 4274 4275 4277 2673 2674 2675 2676 0 0 0 0 0 0 0 0 2673 2674 2675 2676 0 0 0 0 4273 4274 4275 4277 2673 2674 2675 2676 10046 10049 10052 10055 4673 4674 4675 4677 2673 2674 2675 2676 0 0 0 0 4673 4674 4675 4677 0 0 0 0 0 0 0 0 4933 4934 4935 4937 0 0 0 0 2737 2738 2739 2740 4933 4934 4935 4937 11502 11505 11508 11511 2737 2738 2739 2740 5333 5334 5335 5337 0 0 0 0 2737 2738 2739 2740 0 0 0 0 0 0 0 0 2737 2738 2739 2740 5333 5334 5335 5337 0 0 0 0 0 0 0 0 13122 13125 13128 13131 5913 5914 5915 5917 6073 6074 6075 6077 2801 2802 2803 2804 5913 5914 5915 5917 0 0 0 0 2801 2802 2803 2804 0 0 0 0 6073 6074 6075 6077 2801 2802 2803 2804 0 0 0 0 0 0 0 0 2801 2802 2803 2804 0 0 0 0 0 0 0 0 0 0 0 0 DEAL::Level 7 -DEAL:: 0 0 0 0 0 0 0 0 0 0 0 0 2865 2866 2867 2868 0 0 0 0 0 0 0 0 2865 2866 2867 2868 2913 2914 2915 2916 0 0 0 0 2865 2866 2867 2868 0 0 0 0 3089 3090 3091 3092 2865 2866 2867 2868 2913 2914 2915 2916 3089 3090 3091 3092 3137 3138 3139 3140 0 0 0 0 0 0 0 0 2913 2914 2915 2916 2929 2930 2931 2932 0 0 0 0 0 0 0 0 2929 2930 2931 2932 3361 3362 3363 3364 2913 2914 2915 2916 2929 2930 2931 2932 3137 3138 3139 3140 3153 3154 3155 3156 2929 2930 2931 2932 3361 3362 3363 3364 3153 3154 3155 3156 3457 3458 3459 3460 0 0 0 0 0 0 0 0 0 0 0 0 2993 2994 2995 2996 0 0 0 0 0 0 0 0 2993 2994 2995 2996 3105 3106 3107 3108 0 0 0 0 2993 2994 2995 2996 0 0 0 0 3025 3026 3027 3028 2993 2994 2995 2996 3105 3106 3107 3108 3025 3026 3027 3028 3201 3202 3203 3204 0 0 0 0 3025 3026 3027 3028 0 0 0 0 3057 3058 3059 3060 3025 3026 3027 3028 3201 3202 3203 3204 3057 3058 3059 3060 3233 3234 3235 3236 0 0 0 0 3057 3058 3059 3060 0 0 0 0 3857 3858 3859 3860 3057 3058 3059 3060 3233 3234 3235 3236 3857 3858 3859 3860 3969 3970 3971 3972 0 0 0 0 3089 3090 3091 3092 3105 3106 3107 3108 3121 3122 3123 3124 3089 3090 3091 3092 3137 3138 3139 3140 3121 3122 3123 3124 3169 3170 3171 3172 3105 3106 3107 3108 3121 3122 3123 3124 3201 3202 3203 3204 3217 3218 3219 3220 3121 3122 3123 3124 3169 3170 3171 3172 3217 3218 3219 3220 3265 3266 3267 3268 3137 3138 3139 3140 3153 3154 3155 3156 3169 3170 3171 3172 3185 3186 3187 3188 3153 3154 3155 3156 3457 3458 3459 3460 3185 3186 3187 3188 3489 3490 3491 3492 3169 3170 3171 3172 3185 3186 3187 3188 3265 3266 3267 3268 3281 3282 3283 3284 3185 3186 3187 3188 3489 3490 3491 3492 3281 3282 3283 3284 3585 3586 3587 3588 3201 3202 3203 3204 3217 3218 3219 3220 3233 3234 3235 3236 3249 3250 3251 3252 3217 3218 3219 3220 3265 3266 3267 3268 3249 3250 3251 3252 3297 3298 3299 3300 3233 3234 3235 3236 3249 3250 3251 3252 3969 3970 3971 3972 3985 3986 3987 3988 3249 3250 3251 3252 3297 3298 3299 3300 3985 3986 3987 3988 4033 4034 4035 4036 3265 3266 3267 3268 3281 3282 3283 3284 3297 3298 3299 3300 3313 3314 3315 3316 3281 3282 3283 3284 3585 3586 3587 3588 3313 3314 3315 3316 3617 3618 3619 3620 3297 3298 3299 3300 3313 3314 3315 3316 4033 4034 4035 4036 4049 4050 4051 4052 3313 3314 3315 3316 3617 3618 3619 3620 4049 4050 4051 4052 4353 4354 4355 4356 0 0 0 0 0 0 0 0 3361 3362 3363 3364 3377 3378 3379 3380 0 0 0 0 0 0 0 0 3377 3378 3379 3380 3425 3426 3427 3428 3361 3362 3363 3364 3377 3378 3379 3380 3457 3458 3459 3460 3473 3474 3475 3476 3377 3378 3379 3380 3425 3426 3427 3428 3473 3474 3475 3476 3521 3522 3523 3524 0 0 0 0 0 0 0 0 3425 3426 3427 3428 3441 3442 3443 3444 0 0 0 0 0 0 0 0 3441 3442 3443 3444 0 0 0 0 3425 3426 3427 3428 3441 3442 3443 3444 3521 3522 3523 3524 3537 3538 3539 3540 3441 3442 3443 3444 0 0 0 0 3537 3538 3539 3540 0 0 0 0 3457 3458 3459 3460 3473 3474 3475 3476 3489 3490 3491 3492 3505 3506 3507 3508 3473 3474 3475 3476 3521 3522 3523 3524 3505 3506 3507 3508 3553 3554 3555 3556 3489 3490 3491 3492 3505 3506 3507 3508 3585 3586 3587 3588 3601 3602 3603 3604 3505 3506 3507 3508 3553 3554 3555 3556 3601 3602 3603 3604 3649 3650 3651 3652 3521 3522 3523 3524 3537 3538 3539 3540 3553 3554 3555 3556 3569 3570 3571 3572 3537 3538 3539 3540 0 0 0 0 3569 3570 3571 3572 3745 3746 3747 3748 3553 3554 3555 3556 3569 3570 3571 3572 3649 3650 3651 3652 3665 3666 3667 3668 3569 3570 3571 3572 3745 3746 3747 3748 3665 3666 3667 3668 3777 3778 3779 3780 3585 3586 3587 3588 3601 3602 3603 3604 3617 3618 3619 3620 3633 3634 3635 3636 3601 3602 3603 3604 3649 3650 3651 3652 3633 3634 3635 3636 3681 3682 3683 3684 3617 3618 3619 3620 3633 3634 3635 3636 4353 4354 4355 4356 4369 4370 4371 4372 3633 3634 3635 3636 3681 3682 3683 3684 4369 4370 4371 4372 4417 4418 4419 4420 3649 3650 3651 3652 3665 3666 3667 3668 3681 3682 3683 3684 3697 3698 3699 3700 3665 3666 3667 3668 3777 3778 3779 3780 3697 3698 3699 3700 3809 3810 3811 3812 3681 3682 3683 3684 3697 3698 3699 3700 4417 4418 4419 4420 4433 4434 4435 4436 3697 3698 3699 3700 3809 3810 3811 3812 4433 4434 4435 4436 4609 4610 4611 4612 0 0 0 0 0 0 0 0 3745 3746 3747 3748 3761 3762 3763 3764 0 0 0 0 0 0 0 0 3761 3762 3763 3764 0 0 0 0 3745 3746 3747 3748 3761 3762 3763 3764 3777 3778 3779 3780 3793 3794 3795 3796 3761 3762 3763 3764 0 0 0 0 3793 3794 3795 3796 0 0 0 0 3777 3778 3779 3780 3793 3794 3795 3796 3809 3810 3811 3812 3825 3826 3827 3828 3793 3794 3795 3796 0 0 0 0 3825 3826 3827 3828 0 0 0 0 3809 3810 3811 3812 3825 3826 3827 3828 4609 4610 4611 4612 4625 4626 4627 4628 3825 3826 3827 3828 0 0 0 0 4625 4626 4627 4628 0 0 0 0 0 0 0 0 3857 3858 3859 3860 0 0 0 0 3889 3890 3891 3892 3857 3858 3859 3860 3969 3970 3971 3972 3889 3890 3891 3892 4001 4002 4003 4004 0 0 0 0 3889 3890 3891 3892 0 0 0 0 3921 3922 3923 3924 3889 3890 3891 3892 4001 4002 4003 4004 3921 3922 3923 3924 4097 4098 4099 4100 0 0 0 0 3921 3922 3923 3924 0 0 0 0 3953 3954 3955 3956 3921 3922 3923 3924 4097 4098 4099 4100 3953 3954 3955 3956 4129 4130 4131 4132 0 0 0 0 3953 3954 3955 3956 0 0 0 0 0 0 0 0 3953 3954 3955 3956 4129 4130 4131 4132 0 0 0 0 0 0 0 0 3969 3970 3971 3972 3985 3986 3987 3988 4001 4002 4003 4004 4017 4018 4019 4020 3985 3986 3987 3988 4033 4034 4035 4036 4017 4018 4019 4020 4065 4066 4067 4068 4001 4002 4003 4004 4017 4018 4019 4020 4097 4098 4099 4100 4113 4114 4115 4116 4017 4018 4019 4020 4065 4066 4067 4068 4113 4114 4115 4116 4161 4162 4163 4164 4033 4034 4035 4036 4049 4050 4051 4052 4065 4066 4067 4068 4081 4082 4083 4084 4049 4050 4051 4052 4353 4354 4355 4356 4081 4082 4083 4084 4385 4386 4387 4388 4065 4066 4067 4068 4081 4082 4083 4084 4161 4162 4163 4164 4177 4178 4179 4180 4081 4082 4083 4084 4385 4386 4387 4388 4177 4178 4179 4180 4481 4482 4483 4484 4097 4098 4099 4100 4113 4114 4115 4116 4129 4130 4131 4132 4145 4146 4147 4148 4113 4114 4115 4116 4161 4162 4163 4164 4145 4146 4147 4148 4193 4194 4195 4196 4129 4130 4131 4132 4145 4146 4147 4148 0 0 0 0 4241 4242 4243 4244 4145 4146 4147 4148 4193 4194 4195 4196 4241 4242 4243 4244 4289 4290 4291 4292 4161 4162 4163 4164 4177 4178 4179 4180 4193 4194 4195 4196 4209 4210 4211 4212 4177 4178 4179 4180 4481 4482 4483 4484 4209 4210 4211 4212 4513 4514 4515 4516 4193 4194 4195 4196 4209 4210 4211 4212 4289 4290 4291 4292 4305 4306 4307 4308 4209 4210 4211 4212 4513 4514 4515 4516 4305 4306 4307 4308 4737 4738 4739 4740 0 0 0 0 4241 4242 4243 4244 0 0 0 0 4273 4274 4275 4276 4241 4242 4243 4244 4289 4290 4291 4292 4273 4274 4275 4276 4321 4322 4323 4324 0 0 0 0 4273 4274 4275 4276 0 0 0 0 0 0 0 0 4273 4274 4275 4276 4321 4322 4323 4324 0 0 0 0 0 0 0 0 4289 4290 4291 4292 4305 4306 4307 4308 4321 4322 4323 4324 4337 4338 4339 4340 4305 4306 4307 4308 4737 4738 4739 4740 4337 4338 4339 4340 4769 4770 4771 4772 4321 4322 4323 4324 4337 4338 4339 4340 0 0 0 0 0 0 0 0 4337 4338 4339 4340 4769 4770 4771 4772 0 0 0 0 0 0 0 0 4353 4354 4355 4356 4369 4370 4371 4372 4385 4386 4387 4388 4401 4402 4403 4404 4369 4370 4371 4372 4417 4418 4419 4420 4401 4402 4403 4404 4449 4450 4451 4452 4385 4386 4387 4388 4401 4402 4403 4404 4481 4482 4483 4484 4497 4498 4499 4500 4401 4402 4403 4404 4449 4450 4451 4452 4497 4498 4499 4500 4545 4546 4547 4548 4417 4418 4419 4420 4433 4434 4435 4436 4449 4450 4451 4452 4465 4466 4467 4468 4433 4434 4435 4436 4609 4610 4611 4612 4465 4466 4467 4468 4641 4642 4643 4644 4449 4450 4451 4452 4465 4466 4467 4468 4545 4546 4547 4548 4561 4562 4563 4564 4465 4466 4467 4468 4641 4642 4643 4644 4561 4562 4563 4564 4673 4674 4675 4676 4481 4482 4483 4484 4497 4498 4499 4500 4513 4514 4515 4516 4529 4530 4531 4532 4497 4498 4499 4500 4545 4546 4547 4548 4529 4530 4531 4532 4577 4578 4579 4580 4513 4514 4515 4516 4529 4530 4531 4532 4737 4738 4739 4740 4753 4754 4755 4756 4529 4530 4531 4532 4577 4578 4579 4580 4753 4754 4755 4756 4801 4802 4803 4804 4545 4546 4547 4548 4561 4562 4563 4564 4577 4578 4579 4580 4593 4594 4595 4596 4561 4562 4563 4564 4673 4674 4675 4676 4593 4594 4595 4596 4705 4706 4707 4708 4577 4578 4579 4580 4593 4594 4595 4596 4801 4802 4803 4804 4817 4818 4819 4820 4593 4594 4595 4596 4705 4706 4707 4708 4817 4818 4819 4820 0 0 0 0 4609 4610 4611 4612 4625 4626 4627 4628 4641 4642 4643 4644 4657 4658 4659 4660 4625 4626 4627 4628 0 0 0 0 4657 4658 4659 4660 0 0 0 0 4641 4642 4643 4644 4657 4658 4659 4660 4673 4674 4675 4676 4689 4690 4691 4692 4657 4658 4659 4660 0 0 0 0 4689 4690 4691 4692 0 0 0 0 4673 4674 4675 4676 4689 4690 4691 4692 4705 4706 4707 4708 4721 4722 4723 4724 4689 4690 4691 4692 0 0 0 0 4721 4722 4723 4724 0 0 0 0 4705 4706 4707 4708 4721 4722 4723 4724 0 0 0 0 0 0 0 0 4721 4722 4723 4724 0 0 0 0 0 0 0 0 0 0 0 0 4737 4738 4739 4740 4753 4754 4755 4756 4769 4770 4771 4772 4785 4786 4787 4788 4753 4754 4755 4756 4801 4802 4803 4804 4785 4786 4787 4788 4833 4834 4835 4836 4769 4770 4771 4772 4785 4786 4787 4788 0 0 0 0 0 0 0 0 4785 4786 4787 4788 4833 4834 4835 4836 0 0 0 0 0 0 0 0 4801 4802 4803 4804 4817 4818 4819 4820 4833 4834 4835 4836 4849 4850 4851 4852 4817 4818 4819 4820 0 0 0 0 4849 4850 4851 4852 0 0 0 0 4833 4834 4835 4836 4849 4850 4851 4852 0 0 0 0 0 0 0 0 4849 4850 4851 4852 0 0 0 0 0 0 0 0 0 0 0 0Prebuilt copy_to_mg -DEAL::copy_to_mg +DEAL:: 0 0 0 0 0 0 0 0 0 0 0 0 2865 2866 2867 2868 0 0 0 0 0 0 0 0 2865 2866 2867 2868 2913 2914 2915 2916 0 0 0 0 2865 2866 2867 2868 0 0 0 0 3089 3090 3091 3092 2865 2866 2867 2868 2913 2914 2915 2916 3089 3090 3091 3092 3137 3138 3139 3140 0 0 0 0 0 0 0 0 2913 2914 2915 2916 2929 2930 2931 2932 0 0 0 0 0 0 0 0 2929 2930 2931 2932 3361 3362 3363 3364 2913 2914 2915 2916 2929 2930 2931 2932 3137 3138 3139 3140 3153 3154 3155 3156 2929 2930 2931 2932 3361 3362 3363 3364 3153 3154 3155 3156 3457 3458 3459 3460 0 0 0 0 0 0 0 0 0 0 0 0 2993 2994 2995 2996 0 0 0 0 0 0 0 0 2993 2994 2995 2996 3105 3106 3107 3108 0 0 0 0 2993 2994 2995 2996 0 0 0 0 3025 3026 3027 3028 2993 2994 2995 2996 3105 3106 3107 3108 3025 3026 3027 3028 3201 3202 3203 3204 0 0 0 0 3025 3026 3027 3028 0 0 0 0 3057 3058 3059 3060 3025 3026 3027 3028 3201 3202 3203 3204 3057 3058 3059 3060 3233 3234 3235 3236 0 0 0 0 3057 3058 3059 3060 0 0 0 0 3857 3858 3859 3860 3057 3058 3059 3060 3233 3234 3235 3236 3857 3858 3859 3860 3969 3970 3971 3972 0 0 0 0 3089 3090 3091 3092 3105 3106 3107 3108 3121 3122 3123 3124 3089 3090 3091 3092 3137 3138 3139 3140 3121 3122 3123 3124 3169 3170 3171 3172 3105 3106 3107 3108 3121 3122 3123 3124 3201 3202 3203 3204 3217 3218 3219 3220 3121 3122 3123 3124 3169 3170 3171 3172 3217 3218 3219 3220 3265 3266 3267 3268 3137 3138 3139 3140 3153 3154 3155 3156 3169 3170 3171 3172 3185 3186 3187 3188 3153 3154 3155 3156 3457 3458 3459 3460 3185 3186 3187 3188 3489 3490 3491 3492 3169 3170 3171 3172 3185 3186 3187 3188 3265 3266 3267 3268 3281 3282 3283 3284 3185 3186 3187 3188 3489 3490 3491 3492 3281 3282 3283 3284 3585 3586 3587 3588 3201 3202 3203 3204 3217 3218 3219 3220 3233 3234 3235 3236 3249 3250 3251 3252 3217 3218 3219 3220 3265 3266 3267 3268 3249 3250 3251 3252 3297 3298 3299 3300 3233 3234 3235 3236 3249 3250 3251 3252 3969 3970 3971 3972 3985 3986 3987 3988 3249 3250 3251 3252 3297 3298 3299 3300 3985 3986 3987 3988 4033 4034 4035 4036 3265 3266 3267 3268 3281 3282 3283 3284 3297 3298 3299 3300 3313 3314 3315 3316 3281 3282 3283 3284 3585 3586 3587 3588 3313 3314 3315 3316 3617 3618 3619 3620 3297 3298 3299 3300 3313 3314 3315 3316 4033 4034 4035 4036 4049 4050 4051 4052 3313 3314 3315 3316 3617 3618 3619 3620 4049 4050 4051 4052 4353 4354 4355 4356 0 0 0 0 0 0 0 0 3361 3362 3363 3364 3377 3378 3379 3380 0 0 0 0 0 0 0 0 3377 3378 3379 3380 3425 3426 3427 3428 3361 3362 3363 3364 3377 3378 3379 3380 3457 3458 3459 3460 3473 3474 3475 3476 3377 3378 3379 3380 3425 3426 3427 3428 3473 3474 3475 3476 3521 3522 3523 3524 0 0 0 0 0 0 0 0 3425 3426 3427 3428 3441 3442 3443 3444 0 0 0 0 0 0 0 0 3441 3442 3443 3444 0 0 0 0 3425 3426 3427 3428 3441 3442 3443 3444 3521 3522 3523 3524 3537 3538 3539 3540 3441 3442 3443 3444 0 0 0 0 3537 3538 3539 3540 0 0 0 0 3457 3458 3459 3460 3473 3474 3475 3476 3489 3490 3491 3492 3505 3506 3507 3508 3473 3474 3475 3476 3521 3522 3523 3524 3505 3506 3507 3508 3553 3554 3555 3556 3489 3490 3491 3492 3505 3506 3507 3508 3585 3586 3587 3588 3601 3602 3603 3604 3505 3506 3507 3508 3553 3554 3555 3556 3601 3602 3603 3604 3649 3650 3651 3652 3521 3522 3523 3524 3537 3538 3539 3540 3553 3554 3555 3556 3569 3570 3571 3572 3537 3538 3539 3540 0 0 0 0 3569 3570 3571 3572 3745 3746 3747 3748 3553 3554 3555 3556 3569 3570 3571 3572 3649 3650 3651 3652 3665 3666 3667 3668 3569 3570 3571 3572 3745 3746 3747 3748 3665 3666 3667 3668 3777 3778 3779 3780 3585 3586 3587 3588 3601 3602 3603 3604 3617 3618 3619 3620 3633 3634 3635 3636 3601 3602 3603 3604 3649 3650 3651 3652 3633 3634 3635 3636 3681 3682 3683 3684 3617 3618 3619 3620 3633 3634 3635 3636 4353 4354 4355 4356 4369 4370 4371 4372 3633 3634 3635 3636 3681 3682 3683 3684 4369 4370 4371 4372 4417 4418 4419 4420 3649 3650 3651 3652 3665 3666 3667 3668 3681 3682 3683 3684 3697 3698 3699 3700 3665 3666 3667 3668 3777 3778 3779 3780 3697 3698 3699 3700 3809 3810 3811 3812 3681 3682 3683 3684 3697 3698 3699 3700 4417 4418 4419 4420 4433 4434 4435 4436 3697 3698 3699 3700 3809 3810 3811 3812 4433 4434 4435 4436 4609 4610 4611 4612 0 0 0 0 0 0 0 0 3745 3746 3747 3748 3761 3762 3763 3764 0 0 0 0 0 0 0 0 3761 3762 3763 3764 0 0 0 0 3745 3746 3747 3748 3761 3762 3763 3764 3777 3778 3779 3780 3793 3794 3795 3796 3761 3762 3763 3764 0 0 0 0 3793 3794 3795 3796 0 0 0 0 3777 3778 3779 3780 3793 3794 3795 3796 3809 3810 3811 3812 3825 3826 3827 3828 3793 3794 3795 3796 0 0 0 0 3825 3826 3827 3828 0 0 0 0 3809 3810 3811 3812 3825 3826 3827 3828 4609 4610 4611 4612 4625 4626 4627 4628 3825 3826 3827 3828 0 0 0 0 4625 4626 4627 4628 0 0 0 0 0 0 0 0 3857 3858 3859 3860 0 0 0 0 3889 3890 3891 3892 3857 3858 3859 3860 3969 3970 3971 3972 3889 3890 3891 3892 4001 4002 4003 4004 0 0 0 0 3889 3890 3891 3892 0 0 0 0 3921 3922 3923 3924 3889 3890 3891 3892 4001 4002 4003 4004 3921 3922 3923 3924 4097 4098 4099 4100 0 0 0 0 3921 3922 3923 3924 0 0 0 0 3953 3954 3955 3956 3921 3922 3923 3924 4097 4098 4099 4100 3953 3954 3955 3956 4129 4130 4131 4132 0 0 0 0 3953 3954 3955 3956 0 0 0 0 0 0 0 0 3953 3954 3955 3956 4129 4130 4131 4132 0 0 0 0 0 0 0 0 3969 3970 3971 3972 3985 3986 3987 3988 4001 4002 4003 4004 4017 4018 4019 4020 3985 3986 3987 3988 4033 4034 4035 4036 4017 4018 4019 4020 4065 4066 4067 4068 4001 4002 4003 4004 4017 4018 4019 4020 4097 4098 4099 4100 4113 4114 4115 4116 4017 4018 4019 4020 4065 4066 4067 4068 4113 4114 4115 4116 4161 4162 4163 4164 4033 4034 4035 4036 4049 4050 4051 4052 4065 4066 4067 4068 4081 4082 4083 4084 4049 4050 4051 4052 4353 4354 4355 4356 4081 4082 4083 4084 4385 4386 4387 4388 4065 4066 4067 4068 4081 4082 4083 4084 4161 4162 4163 4164 4177 4178 4179 4180 4081 4082 4083 4084 4385 4386 4387 4388 4177 4178 4179 4180 4481 4482 4483 4484 4097 4098 4099 4100 4113 4114 4115 4116 4129 4130 4131 4132 4145 4146 4147 4148 4113 4114 4115 4116 4161 4162 4163 4164 4145 4146 4147 4148 4193 4194 4195 4196 4129 4130 4131 4132 4145 4146 4147 4148 0 0 0 0 4241 4242 4243 4244 4145 4146 4147 4148 4193 4194 4195 4196 4241 4242 4243 4244 4289 4290 4291 4292 4161 4162 4163 4164 4177 4178 4179 4180 4193 4194 4195 4196 4209 4210 4211 4212 4177 4178 4179 4180 4481 4482 4483 4484 4209 4210 4211 4212 4513 4514 4515 4516 4193 4194 4195 4196 4209 4210 4211 4212 4289 4290 4291 4292 4305 4306 4307 4308 4209 4210 4211 4212 4513 4514 4515 4516 4305 4306 4307 4308 4737 4738 4739 4740 0 0 0 0 4241 4242 4243 4244 0 0 0 0 4273 4274 4275 4276 4241 4242 4243 4244 4289 4290 4291 4292 4273 4274 4275 4276 4321 4322 4323 4324 0 0 0 0 4273 4274 4275 4276 0 0 0 0 0 0 0 0 4273 4274 4275 4276 4321 4322 4323 4324 0 0 0 0 0 0 0 0 4289 4290 4291 4292 4305 4306 4307 4308 4321 4322 4323 4324 4337 4338 4339 4340 4305 4306 4307 4308 4737 4738 4739 4740 4337 4338 4339 4340 4769 4770 4771 4772 4321 4322 4323 4324 4337 4338 4339 4340 0 0 0 0 0 0 0 0 4337 4338 4339 4340 4769 4770 4771 4772 0 0 0 0 0 0 0 0 4353 4354 4355 4356 4369 4370 4371 4372 4385 4386 4387 4388 4401 4402 4403 4404 4369 4370 4371 4372 4417 4418 4419 4420 4401 4402 4403 4404 4449 4450 4451 4452 4385 4386 4387 4388 4401 4402 4403 4404 4481 4482 4483 4484 4497 4498 4499 4500 4401 4402 4403 4404 4449 4450 4451 4452 4497 4498 4499 4500 4545 4546 4547 4548 4417 4418 4419 4420 4433 4434 4435 4436 4449 4450 4451 4452 4465 4466 4467 4468 4433 4434 4435 4436 4609 4610 4611 4612 4465 4466 4467 4468 4641 4642 4643 4644 4449 4450 4451 4452 4465 4466 4467 4468 4545 4546 4547 4548 4561 4562 4563 4564 4465 4466 4467 4468 4641 4642 4643 4644 4561 4562 4563 4564 4673 4674 4675 4676 4481 4482 4483 4484 4497 4498 4499 4500 4513 4514 4515 4516 4529 4530 4531 4532 4497 4498 4499 4500 4545 4546 4547 4548 4529 4530 4531 4532 4577 4578 4579 4580 4513 4514 4515 4516 4529 4530 4531 4532 4737 4738 4739 4740 4753 4754 4755 4756 4529 4530 4531 4532 4577 4578 4579 4580 4753 4754 4755 4756 4801 4802 4803 4804 4545 4546 4547 4548 4561 4562 4563 4564 4577 4578 4579 4580 4593 4594 4595 4596 4561 4562 4563 4564 4673 4674 4675 4676 4593 4594 4595 4596 4705 4706 4707 4708 4577 4578 4579 4580 4593 4594 4595 4596 4801 4802 4803 4804 4817 4818 4819 4820 4593 4594 4595 4596 4705 4706 4707 4708 4817 4818 4819 4820 0 0 0 0 4609 4610 4611 4612 4625 4626 4627 4628 4641 4642 4643 4644 4657 4658 4659 4660 4625 4626 4627 4628 0 0 0 0 4657 4658 4659 4660 0 0 0 0 4641 4642 4643 4644 4657 4658 4659 4660 4673 4674 4675 4676 4689 4690 4691 4692 4657 4658 4659 4660 0 0 0 0 4689 4690 4691 4692 0 0 0 0 4673 4674 4675 4676 4689 4690 4691 4692 4705 4706 4707 4708 4721 4722 4723 4724 4689 4690 4691 4692 0 0 0 0 4721 4722 4723 4724 0 0 0 0 4705 4706 4707 4708 4721 4722 4723 4724 0 0 0 0 0 0 0 0 4721 4722 4723 4724 0 0 0 0 0 0 0 0 0 0 0 0 4737 4738 4739 4740 4753 4754 4755 4756 4769 4770 4771 4772 4785 4786 4787 4788 4753 4754 4755 4756 4801 4802 4803 4804 4785 4786 4787 4788 4833 4834 4835 4836 4769 4770 4771 4772 4785 4786 4787 4788 0 0 0 0 0 0 0 0 4785 4786 4787 4788 4833 4834 4835 4836 0 0 0 0 0 0 0 0 4801 4802 4803 4804 4817 4818 4819 4820 4833 4834 4835 4836 4849 4850 4851 4852 4817 4818 4819 4820 0 0 0 0 4849 4850 4851 4852 0 0 0 0 4833 4834 4835 4836 4849 4850 4851 4852 0 0 0 0 0 0 0 0 4849 4850 4851 4852 0 0 0 0 0 0 0 0 0 0 0 0copy_to_mg DEAL:: DEAL::Level 0 DEAL:: 176797 176868 176940 177011 178965 179036 179107 179179 181280 181352 181423 181494 183449 183520 183591 183662 diff --git a/tests/multigrid/mg_renumbered_01/cmp/generic b/tests/multigrid/mg_renumbered_01/cmp/generic index 34ecdb77ab..1ab980989f 100644 --- a/tests/multigrid/mg_renumbered_01/cmp/generic +++ b/tests/multigrid/mg_renumbered_01/cmp/generic @@ -2,70 +2,56 @@ DEAL::Cycle 0 DEAL::Number of degrees of freedom: 100 L0: 16 L1: 36 L2: 100 DEAL::1. Test 1676. -DEAL::Prebuilt copy_to_mg DEAL::1. Test 7958. DEAL::2. Test 1676. -DEAL::Prebuilt copy_to_mg DEAL::2. Test 7412. DEAL:: DEAL::diff 1758. DEAL::Cycle 1 DEAL::Number of degrees of freedom: 164 L0: 16 L1: 36 L2: 100 L3: 100 DEAL::1. Test 3626. -DEAL::Prebuilt copy_to_mg DEAL::1. Test 1.097e+04 DEAL::2. Test 3626. -DEAL::Prebuilt copy_to_mg DEAL::2. Test 1.096e+04 DEAL:: DEAL::diff 123.9 DEAL::Cycle 2 DEAL::Number of degrees of freedom: 228 L0: 16 L1: 36 L2: 100 L3: 100 L4: 100 DEAL::1. Test 5984. -DEAL::Prebuilt copy_to_mg DEAL::1. Test 1.688e+04 DEAL::2. Test 5984. -DEAL::Prebuilt copy_to_mg DEAL::2. Test 1.688e+04 DEAL:: DEAL::diff 0 DEAL::Cycle 3 DEAL::Number of degrees of freedom: 292 L0: 16 L1: 36 L2: 100 L3: 100 L4: 100 L5: 100 DEAL::1. Test 8689. -DEAL::Prebuilt copy_to_mg DEAL::1. Test 2.286e+04 DEAL::2. Test 8689. -DEAL::Prebuilt copy_to_mg DEAL::2. Test 2.286e+04 DEAL:: DEAL::diff 0 DEAL::Cycle 4 DEAL::Number of degrees of freedom: 804 L0: 16 L1: 36 L2: 100 L3: 260 L4: 260 L5: 260 L6: 260 DEAL::1. Test 4.396e+04 -DEAL::Prebuilt copy_to_mg DEAL::1. Test 1.442e+05 DEAL::2. Test 4.396e+04 -DEAL::Prebuilt copy_to_mg DEAL::2. Test 1.442e+05 DEAL:: DEAL::diff 0 DEAL::Cycle 5 DEAL::Number of degrees of freedom: 1428 L0: 16 L1: 36 L2: 100 L3: 324 L4: 324 L5: 324 L6: 324 L7: 612 DEAL::1. Test 1.095e+05 -DEAL::Prebuilt copy_to_mg DEAL::1. Test 4.692e+05 DEAL::2. Test 1.095e+05 -DEAL::Prebuilt copy_to_mg DEAL::2. Test 4.692e+05 DEAL:: DEAL::diff 0 DEAL::Cycle 6 DEAL::Number of degrees of freedom: 3044 L0: 16 L1: 36 L2: 100 L3: 324 L4: 324 L5: 324 L6: 484 L7: 836 L8: 1860 DEAL::1. Test 3.516e+05 -DEAL::Prebuilt copy_to_mg DEAL::1. Test 1.776e+06 DEAL::2. Test 3.516e+05 -DEAL::Prebuilt copy_to_mg DEAL::2. Test 1.776e+06 DEAL:: DEAL::diff 0 diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc index 538b9ce534..40e430a1d8 100644 --- a/tests/multigrid/mg_renumbered_03.cc +++ b/tests/multigrid/mg_renumbered_03.cc @@ -211,14 +211,12 @@ class LaplaceProblem void setup_system (); void test (); void output_gpl(const MGDoFHandler &dof, - MGLevelObject > &v, - const bool renumbered); + MGLevelObject > &v); void refine_local (); Triangulation triangulation; const MappingQ1 mapping; FESystem fe; - //FE_Q fe; MGDoFHandler mg_dof_handler; MGDoFHandler mg_dof_handler_renumbered; @@ -232,8 +230,6 @@ class LaplaceProblem template LaplaceProblem::LaplaceProblem (const unsigned int deg) : triangulation (Triangulation::limit_level_difference_at_vertices), - //fe (deg), - //fe (FE_Q (deg),2, FE_Q (deg),2), fe (FE_Q (deg),3), mg_dof_handler (triangulation), mg_dof_handler_renumbered (triangulation), @@ -247,20 +243,12 @@ void LaplaceProblem::setup_system () mg_dof_handler.distribute_dofs (fe); mg_dof_handler_renumbered.distribute_dofs (fe); - std::vector block_component (2*dim,0); - for(unsigned int c=dim; c<2*dim; ++c) - block_component[c] = 1; - const unsigned int nlevels = triangulation.n_levels(); DoFHandler &dof = mg_dof_handler_renumbered; - DoFRenumbering::component_wise (dof);//, block_component); - //DoFRenumbering::Cuthill_McKee (dof); + DoFRenumbering::component_wise (dof); for (unsigned int level=0;level::setup_system () template void LaplaceProblem::output_gpl(const MGDoFHandler &dof, - MGLevelObject > &v, - const bool renumbered) + MGLevelObject > &v) { MeshWorker::IntegrationWorker integration_worker; MeshWorker::Assembler::GnuplotPatch assembler; @@ -310,13 +297,6 @@ LaplaceProblem::output_gpl(const MGDoFHandler &dof, for(unsigned int l=0; l matrix_integrator; MeshWorker::loop, dim, dim> ( dof.begin(l), dof.end(l), @@ -355,22 +335,19 @@ void LaplaceProblem::test () initialize(mg_dof_handler, test); mg_transfer.copy_to_mg(mg_dof_handler, v, test); - //output_gpl(mg_dof_handler, v, false); initialize(mg_dof_handler_renumbered, test); mg_transfer_renumbered.copy_to_mg(mg_dof_handler_renumbered, u, test); - //output_gpl(mg_dof_handler_renumbered, u, true); for(unsigned int l=0; l[FE_Q<2>(1)^4] DEAL::initialize 1.095e+05 -DEAL::Prebuilt copy_to_mg DEAL::initialize 1.095e+05 -DEAL::Prebuilt copy_to_mg DEAL::copy_to_mg DEAL:: DEAL::diff 0