From: kanschat Date: Tue, 1 May 2007 21:45:27 +0000 (+0000) Subject: further tests on transfer classes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9db673805828e3422f6fa92315aafe5ddc06fc6d;p=dealii-svn.git further tests on transfer classes git-svn-id: https://svn.dealii.org/trunk@14653 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/multigrid/transfer.cc b/tests/multigrid/transfer.cc index 44f12a9a7b..7aa9927915 100644 --- a/tests/multigrid/transfer.cc +++ b/tests/multigrid/transfer.cc @@ -91,6 +91,34 @@ void check_simple(const FiniteElement& fe) transfer.restrict_and_add(1,u0,u1); deallog << "u1\t" << (u1*u1+.5) << std::endl << "u0\t" << (u0*u0+.5) << std::endl; + + // Fill a global vector by counting + // from one up + Vector u; + u.reinit (mgdof.n_dofs()); + for (unsigned int i=0;i > v; + v.resize(2,2); + v[2].reinit(mgdof.n_dofs(2)); + + transfer.copy_to_mg(mgdof, v, u); + for (unsigned int i=0; i& fe, if (factors.size()>0) transfer.initialize(factors, mem); - BlockVector u2(mg_ndofs[2]); - BlockVector u1(mg_ndofs[1]); - BlockVector u0(mg_ndofs[0]); + MGLevelObject< BlockVector > u(0, tr.n_levels()-1); + + MGTools::reinit_vector_by_blocks(mgdof, u, selected, mg_ndofs); // Prolongate a constant function // twice - u0 = 1; - transfer.prolongate(1,u1,u0); - transfer.prolongate(2,u2,u1); + u[0] = 1; + transfer.prolongate(1,u[1],u[0]); + transfer.prolongate(2,u[2],u[1]); // These outputs are just the // number of dofs on each level deallog << "u0"; - for (unsigned int b=0;b u; - u.reinit (ndofs); - for (unsigned int i=0;i > cached_sizes; - MGLevelObject > v; - v.resize(0, tr.n_levels()-1); - MGTools::reinit_vector_by_blocks(mgdof, v, selected, cached_sizes); + BlockVector v; + v.reinit (ndofs); + for (unsigned int i=0;i[FE_RaviartThomasNodal<2>(1)-FE_DGQ<2>(1)] DEAL::selected 0 @@ -20,13 +21,14 @@ DEAL::Global dofs: 144 64 DEAL::Level 0 dofs: 12 4 DEAL::Level 1 dofs: 40 16 DEAL::Level 2 dofs: 144 64 -DEAL::u0 12 4 -DEAL::u1 40 0 -DEAL::u2 144 0 -DEAL::u1 572 0 -DEAL::u0 2214 0 +DEAL::u0 12 +DEAL::u1 40 +DEAL::u2 144 +DEAL::u1 572 +DEAL::u0 2214 DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +DEAL::diff 0 DEAL::Pressure DEAL::FESystem<2>[FE_RaviartThomasNodal<2>(1)-FE_DGQ<2>(1)] DEAL::selected 1 @@ -34,23 +36,25 @@ DEAL::Global dofs: 144 64 DEAL::Level 0 dofs: 12 4 DEAL::Level 1 dofs: 40 16 DEAL::Level 2 dofs: 144 64 -DEAL::u0 12 4 -DEAL::u1 0 16 -DEAL::u2 0 64 -DEAL::u1 0 256 -DEAL::u0 0 1024 +DEAL::u0 4 +DEAL::u1 16 +DEAL::u2 64 +DEAL::u1 256 +DEAL::u0 1024 DEAL:: 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 DEAL:: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 +DEAL::diff 0 DEAL::FESystem<2>[FE_RaviartThomasNodal<2>(0)^2-FE_DGQ<2>(0)^2] DEAL::selected 1 3 DEAL::Global dofs: 40 40 16 16 DEAL::Level 0 dofs: 4 4 1 1 DEAL::Level 1 dofs: 12 12 4 4 DEAL::Level 2 dofs: 40 40 16 16 -DEAL::u0 4 4 1 1 -DEAL::u1 0 12 0 4 -DEAL::u2 0 40 0 16 -DEAL::u1 0 136 0 64 -DEAL::u0 0 400 0 256 +DEAL::u0 4 1 +DEAL::u1 12 4 +DEAL::u2 40 16 +DEAL::u1 136 64 +DEAL::u0 400 256 DEAL:: 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 DEAL:: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 +DEAL::diff 0 diff --git a/tests/multigrid/transfer_block_select.cc b/tests/multigrid/transfer_block_select.cc index 94d6996f07..824a77be26 100644 --- a/tests/multigrid/transfer_block_select.cc +++ b/tests/multigrid/transfer_block_select.cc @@ -107,9 +107,9 @@ void check_select(const FiniteElement& fe, unsigned int selected) // See what part gets copied to mg MGLevelObject > v; - v.resize(2,2); - v[2].reinit(mg_ndofs[2][selected]); - + v.resize(0,tr.n_levels()-1); + MGTools::reinit_vector_by_blocks(mgdof, v, selected, mg_ndofs); + transfer.copy_to_mg(mgdof, v, u); for (unsigned int i=0; i& fe) std::vector > cached_sizes; MGLevelObject > v; - MGLevelObject > w; + MGLevelObject > wb; + MGLevelObject > ws; v.resize(0, tr.n_levels()-1); - w.resize(0, tr.n_levels()-1); + wb.resize(0, tr.n_levels()-1); + ws.resize(0, tr.n_levels()-1); MGTools::reinit_vector_by_blocks(mgdof, v, selected, cached_sizes); - MGTools::reinit_vector_by_blocks(mgdof, w, selected, cached_sizes); + MGTools::reinit_vector_by_blocks(mgdof, wb, selected, cached_sizes); + MGTools::reinit_vector_by_blocks(mgdof, ws, 0, cached_sizes); deallog << "copy to mg"; transfer.copy_to_mg(mgdof, v, u); - transfer_block.copy_to_mg(mgdof, w, u); - + transfer_block.copy_to_mg(mgdof, wb, u); + transfer_select.copy_to_mg(mgdof, ws, u); + for (unsigned int l=0; l& fe) for (unsigned int i=0;i uu; uu.reinit(u); transfer.copy_from_mg_add(mgdof, u, v); transfer_block.copy_from_mg_add(mgdof, uu, v); - u.print(std::cout, 0, false); - uu.print(std::cout, 0, false); u.add(-1., uu); deallog << u.l2_norm() << std::endl;