From 98d16b6ee859ebac94fe8f1f8f98bbd8dca744e5 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Thu, 29 Dec 2005 10:22:14 +0000 Subject: [PATCH] add missing cylinder_shell git-svn-id: https://svn.dealii.org/trunk@11934 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/bits/grid_generator_01.cc | 10 +- tests/bits/grid_generator_01/cmp/generic | 415 +++++++++++++++++++++++ 2 files changed, 424 insertions(+), 1 deletion(-) diff --git a/tests/bits/grid_generator_01.cc b/tests/bits/grid_generator_01.cc index a8596880e1..290da97012 100644 --- a/tests/bits/grid_generator_01.cc +++ b/tests/bits/grid_generator_01.cc @@ -12,7 +12,7 @@ //--------------------------------------------------------------------------- -// Test the various functions in grid generator. +// Test grid generation functions in GridGenerator. #include #include @@ -147,6 +147,14 @@ void test(std::ostream& out) if (tr.n_cells() > 0) go.write(tr, out, format); } + if (true) + { + deallog << "cylinder_shell" << std::endl; + Triangulation tr; + GridGenerator::cylinder_shell(tr, 2., 5., 6.); + if (tr.n_cells() > 0) + go.write(tr, out, format); + } if (true) { deallog << "half_hyper_ball" << std::endl; diff --git a/tests/bits/grid_generator_01/cmp/generic b/tests/bits/grid_generator_01/cmp/generic index f184fa700b..82f817958d 100644 --- a/tests/bits/grid_generator_01/cmp/generic +++ b/tests/bits/grid_generator_01/cmp/generic @@ -27,6 +27,8 @@ DEAL:1d::hyper_cube_slit DEAL:1d::Abort!!! DEAL:1d::hyper_shell DEAL:1d::Abort!!! +DEAL:1d::cylinder_shell +DEAL:1d::Abort!!! DEAL:1d::half_hyper_ball DEAL:1d::Abort!!! DEAL:1d::half_hyper_shell @@ -817,6 +819,8 @@ Single 2 1 0 3 1 -1 800 0 -1 0.0 0 0 -1 0 0 2 6834 -3036 7200 -1200 +DEAL:2d::cylinder_shell +DEAL:2d::Abort!!! DEAL:2d::half_hyper_ball #FIG 3.2 Landscape @@ -1571,6 +1575,417 @@ DEAL:3d::hyper_cube_slit DEAL:3d::Abort!!! DEAL:3d::hyper_shell DEAL:3d::Abort!!! +DEAL:3d::cylinder_shell +object "vertices" class array type float rank 1 shape 3 items 280 data follows + 6.00000 0.00000 0.00000 + 5.90358 1.07134 0.00000 + 5.61741 2.10825 0.00000 + 5.15069 3.07740 0.00000 + 4.51843 3.94763 0.00000 + 3.74094 4.69099 0.00000 + 2.84321 5.28357 0.00000 + 1.85410 5.70634 0.00000 + 0.805400 5.94570 0.00000 + -0.269189 5.99396 0.00000 + -1.33513 5.84957 0.00000 + -2.35815 5.51717 0.00000 + -3.30538 5.00744 0.00000 + -4.14638 4.33677 0.00000 + -4.85410 3.52671 0.00000 + -5.40581 2.60330 0.00000 + -5.78378 1.59622 0.00000 + -5.97585 0.537836 0.00000 + -5.97585 -0.537836 0.00000 + -5.78378 -1.59622 0.00000 + -5.40581 -2.60330 0.00000 + -4.85410 -3.52671 0.00000 + -4.14638 -4.33677 0.00000 + -3.30538 -5.00744 0.00000 + -2.35815 -5.51717 0.00000 + -1.33513 -5.84957 0.00000 + -0.269189 -5.99396 0.00000 + 0.805400 -5.94570 0.00000 + 1.85410 -5.70634 0.00000 + 2.84321 -5.28357 0.00000 + 3.74094 -4.69099 0.00000 + 4.51843 -3.94763 0.00000 + 5.15069 -3.07740 0.00000 + 5.61741 -2.10825 0.00000 + 5.90358 -1.07134 0.00000 + 5.00000 0.00000 0.00000 + 4.91965 0.892784 0.00000 + 4.68117 1.75687 0.00000 + 4.29224 2.56450 0.00000 + 3.76536 3.28969 0.00000 + 3.11745 3.90916 0.00000 + 2.36934 4.40298 0.00000 + 1.54508 4.75528 0.00000 + 0.671166 4.95475 0.00000 + -0.224324 4.99497 0.00000 + -1.11260 4.87464 0.00000 + -1.96513 4.59764 0.00000 + -2.75448 4.17287 0.00000 + -3.45531 3.61397 0.00000 + -4.04508 2.93893 0.00000 + -4.50484 2.16942 0.00000 + -4.81981 1.33018 0.00000 + -4.97987 0.448197 0.00000 + -4.97987 -0.448197 0.00000 + -4.81981 -1.33018 0.00000 + -4.50484 -2.16942 0.00000 + -4.04508 -2.93893 0.00000 + -3.45531 -3.61397 0.00000 + -2.75448 -4.17287 0.00000 + -1.96513 -4.59764 0.00000 + -1.11260 -4.87464 0.00000 + -0.224324 -4.99497 0.00000 + 0.671166 -4.95475 0.00000 + 1.54508 -4.75528 0.00000 + 2.36934 -4.40298 0.00000 + 3.11745 -3.90916 0.00000 + 3.76536 -3.28969 0.00000 + 4.29224 -2.56450 0.00000 + 4.68117 -1.75687 0.00000 + 4.91965 -0.892784 0.00000 + 6.00000 0.00000 0.666667 + 5.90358 1.07134 0.666667 + 5.61741 2.10825 0.666667 + 5.15069 3.07740 0.666667 + 4.51843 3.94763 0.666667 + 3.74094 4.69099 0.666667 + 2.84321 5.28357 0.666667 + 1.85410 5.70634 0.666667 + 0.805400 5.94570 0.666667 + -0.269189 5.99396 0.666667 + -1.33513 5.84957 0.666667 + -2.35815 5.51717 0.666667 + -3.30538 5.00744 0.666667 + -4.14638 4.33677 0.666667 + -4.85410 3.52671 0.666667 + -5.40581 2.60330 0.666667 + -5.78378 1.59622 0.666667 + -5.97585 0.537836 0.666667 + -5.97585 -0.537836 0.666667 + -5.78378 -1.59622 0.666667 + -5.40581 -2.60330 0.666667 + -4.85410 -3.52671 0.666667 + -4.14638 -4.33677 0.666667 + -3.30538 -5.00744 0.666667 + -2.35815 -5.51717 0.666667 + -1.33513 -5.84957 0.666667 + -0.269189 -5.99396 0.666667 + 0.805400 -5.94570 0.666667 + 1.85410 -5.70634 0.666667 + 2.84321 -5.28357 0.666667 + 3.74094 -4.69099 0.666667 + 4.51843 -3.94763 0.666667 + 5.15069 -3.07740 0.666667 + 5.61741 -2.10825 0.666667 + 5.90358 -1.07134 0.666667 + 5.00000 0.00000 0.666667 + 4.91965 0.892784 0.666667 + 4.68117 1.75687 0.666667 + 4.29224 2.56450 0.666667 + 3.76536 3.28969 0.666667 + 3.11745 3.90916 0.666667 + 2.36934 4.40298 0.666667 + 1.54508 4.75528 0.666667 + 0.671166 4.95475 0.666667 + -0.224324 4.99497 0.666667 + -1.11260 4.87464 0.666667 + -1.96513 4.59764 0.666667 + -2.75448 4.17287 0.666667 + -3.45531 3.61397 0.666667 + -4.04508 2.93893 0.666667 + -4.50484 2.16942 0.666667 + -4.81981 1.33018 0.666667 + -4.97987 0.448197 0.666667 + -4.97987 -0.448197 0.666667 + -4.81981 -1.33018 0.666667 + -4.50484 -2.16942 0.666667 + -4.04508 -2.93893 0.666667 + -3.45531 -3.61397 0.666667 + -2.75448 -4.17287 0.666667 + -1.96513 -4.59764 0.666667 + -1.11260 -4.87464 0.666667 + -0.224324 -4.99497 0.666667 + 0.671166 -4.95475 0.666667 + 1.54508 -4.75528 0.666667 + 2.36934 -4.40298 0.666667 + 3.11745 -3.90916 0.666667 + 3.76536 -3.28969 0.666667 + 4.29224 -2.56450 0.666667 + 4.68117 -1.75687 0.666667 + 4.91965 -0.892784 0.666667 + 6.00000 0.00000 1.33333 + 5.90358 1.07134 1.33333 + 5.61741 2.10825 1.33333 + 5.15069 3.07740 1.33333 + 4.51843 3.94763 1.33333 + 3.74094 4.69099 1.33333 + 2.84321 5.28357 1.33333 + 1.85410 5.70634 1.33333 + 0.805400 5.94570 1.33333 + -0.269189 5.99396 1.33333 + -1.33513 5.84957 1.33333 + -2.35815 5.51717 1.33333 + -3.30538 5.00744 1.33333 + -4.14638 4.33677 1.33333 + -4.85410 3.52671 1.33333 + -5.40581 2.60330 1.33333 + -5.78378 1.59622 1.33333 + -5.97585 0.537836 1.33333 + -5.97585 -0.537836 1.33333 + -5.78378 -1.59622 1.33333 + -5.40581 -2.60330 1.33333 + -4.85410 -3.52671 1.33333 + -4.14638 -4.33677 1.33333 + -3.30538 -5.00744 1.33333 + -2.35815 -5.51717 1.33333 + -1.33513 -5.84957 1.33333 + -0.269189 -5.99396 1.33333 + 0.805400 -5.94570 1.33333 + 1.85410 -5.70634 1.33333 + 2.84321 -5.28357 1.33333 + 3.74094 -4.69099 1.33333 + 4.51843 -3.94763 1.33333 + 5.15069 -3.07740 1.33333 + 5.61741 -2.10825 1.33333 + 5.90358 -1.07134 1.33333 + 5.00000 0.00000 1.33333 + 4.91965 0.892784 1.33333 + 4.68117 1.75687 1.33333 + 4.29224 2.56450 1.33333 + 3.76536 3.28969 1.33333 + 3.11745 3.90916 1.33333 + 2.36934 4.40298 1.33333 + 1.54508 4.75528 1.33333 + 0.671166 4.95475 1.33333 + -0.224324 4.99497 1.33333 + -1.11260 4.87464 1.33333 + -1.96513 4.59764 1.33333 + -2.75448 4.17287 1.33333 + -3.45531 3.61397 1.33333 + -4.04508 2.93893 1.33333 + -4.50484 2.16942 1.33333 + -4.81981 1.33018 1.33333 + -4.97987 0.448197 1.33333 + -4.97987 -0.448197 1.33333 + -4.81981 -1.33018 1.33333 + -4.50484 -2.16942 1.33333 + -4.04508 -2.93893 1.33333 + -3.45531 -3.61397 1.33333 + -2.75448 -4.17287 1.33333 + -1.96513 -4.59764 1.33333 + -1.11260 -4.87464 1.33333 + -0.224324 -4.99497 1.33333 + 0.671166 -4.95475 1.33333 + 1.54508 -4.75528 1.33333 + 2.36934 -4.40298 1.33333 + 3.11745 -3.90916 1.33333 + 3.76536 -3.28969 1.33333 + 4.29224 -2.56450 1.33333 + 4.68117 -1.75687 1.33333 + 4.91965 -0.892784 1.33333 + 6.00000 0.00000 2.00000 + 5.90358 1.07134 2.00000 + 5.61741 2.10825 2.00000 + 5.15069 3.07740 2.00000 + 4.51843 3.94763 2.00000 + 3.74094 4.69099 2.00000 + 2.84321 5.28357 2.00000 + 1.85410 5.70634 2.00000 + 0.805400 5.94570 2.00000 + -0.269189 5.99396 2.00000 + -1.33513 5.84957 2.00000 + -2.35815 5.51717 2.00000 + -3.30538 5.00744 2.00000 + -4.14638 4.33677 2.00000 + -4.85410 3.52671 2.00000 + -5.40581 2.60330 2.00000 + -5.78378 1.59622 2.00000 + -5.97585 0.537836 2.00000 + -5.97585 -0.537836 2.00000 + -5.78378 -1.59622 2.00000 + -5.40581 -2.60330 2.00000 + -4.85410 -3.52671 2.00000 + -4.14638 -4.33677 2.00000 + -3.30538 -5.00744 2.00000 + -2.35815 -5.51717 2.00000 + -1.33513 -5.84957 2.00000 + -0.269189 -5.99396 2.00000 + 0.805400 -5.94570 2.00000 + 1.85410 -5.70634 2.00000 + 2.84321 -5.28357 2.00000 + 3.74094 -4.69099 2.00000 + 4.51843 -3.94763 2.00000 + 5.15069 -3.07740 2.00000 + 5.61741 -2.10825 2.00000 + 5.90358 -1.07134 2.00000 + 5.00000 0.00000 2.00000 + 4.91965 0.892784 2.00000 + 4.68117 1.75687 2.00000 + 4.29224 2.56450 2.00000 + 3.76536 3.28969 2.00000 + 3.11745 3.90916 2.00000 + 2.36934 4.40298 2.00000 + 1.54508 4.75528 2.00000 + 0.671166 4.95475 2.00000 + -0.224324 4.99497 2.00000 + -1.11260 4.87464 2.00000 + -1.96513 4.59764 2.00000 + -2.75448 4.17287 2.00000 + -3.45531 3.61397 2.00000 + -4.04508 2.93893 2.00000 + -4.50484 2.16942 2.00000 + -4.81981 1.33018 2.00000 + -4.97987 0.448197 2.00000 + -4.97987 -0.448197 2.00000 + -4.81981 -1.33018 2.00000 + -4.50484 -2.16942 2.00000 + -4.04508 -2.93893 2.00000 + -3.45531 -3.61397 2.00000 + -2.75448 -4.17287 2.00000 + -1.96513 -4.59764 2.00000 + -1.11260 -4.87464 2.00000 + -0.224324 -4.99497 2.00000 + 0.671166 -4.95475 2.00000 + 1.54508 -4.75528 2.00000 + 2.36934 -4.40298 2.00000 + 3.11745 -3.90916 2.00000 + 3.76536 -3.28969 2.00000 + 4.29224 -2.56450 2.00000 + 4.68117 -1.75687 2.00000 + 4.91965 -0.892784 2.00000 +object "cells" class array type int rank 1 shape 8 items 105 data follows + 70 105 0 35 71 106 1 36 + 71 106 1 36 72 107 2 37 + 72 107 2 37 73 108 3 38 + 73 108 3 38 74 109 4 39 + 74 109 4 39 75 110 5 40 + 75 110 5 40 76 111 6 41 + 76 111 6 41 77 112 7 42 + 77 112 7 42 78 113 8 43 + 78 113 8 43 79 114 9 44 + 79 114 9 44 80 115 10 45 + 80 115 10 45 81 116 11 46 + 81 116 11 46 82 117 12 47 + 82 117 12 47 83 118 13 48 + 83 118 13 48 84 119 14 49 + 84 119 14 49 85 120 15 50 + 85 120 15 50 86 121 16 51 + 86 121 16 51 87 122 17 52 + 87 122 17 52 88 123 18 53 + 88 123 18 53 89 124 19 54 + 89 124 19 54 90 125 20 55 + 90 125 20 55 91 126 21 56 + 91 126 21 56 92 127 22 57 + 92 127 22 57 93 128 23 58 + 93 128 23 58 94 129 24 59 + 94 129 24 59 95 130 25 60 + 95 130 25 60 96 131 26 61 + 96 131 26 61 97 132 27 62 + 97 132 27 62 98 133 28 63 + 98 133 28 63 99 134 29 64 + 99 134 29 64 100 135 30 65 + 100 135 30 65 101 136 31 66 + 101 136 31 66 102 137 32 67 + 102 137 32 67 103 138 33 68 + 103 138 33 68 104 139 34 69 + 104 139 34 69 70 105 0 35 + 140 175 70 105 141 176 71 106 + 141 176 71 106 142 177 72 107 + 142 177 72 107 143 178 73 108 + 143 178 73 108 144 179 74 109 + 144 179 74 109 145 180 75 110 + 145 180 75 110 146 181 76 111 + 146 181 76 111 147 182 77 112 + 147 182 77 112 148 183 78 113 + 148 183 78 113 149 184 79 114 + 149 184 79 114 150 185 80 115 + 150 185 80 115 151 186 81 116 + 151 186 81 116 152 187 82 117 + 152 187 82 117 153 188 83 118 + 153 188 83 118 154 189 84 119 + 154 189 84 119 155 190 85 120 + 155 190 85 120 156 191 86 121 + 156 191 86 121 157 192 87 122 + 157 192 87 122 158 193 88 123 + 158 193 88 123 159 194 89 124 + 159 194 89 124 160 195 90 125 + 160 195 90 125 161 196 91 126 + 161 196 91 126 162 197 92 127 + 162 197 92 127 163 198 93 128 + 163 198 93 128 164 199 94 129 + 164 199 94 129 165 200 95 130 + 165 200 95 130 166 201 96 131 + 166 201 96 131 167 202 97 132 + 167 202 97 132 168 203 98 133 + 168 203 98 133 169 204 99 134 + 169 204 99 134 170 205 100 135 + 170 205 100 135 171 206 101 136 + 171 206 101 136 172 207 102 137 + 172 207 102 137 173 208 103 138 + 173 208 103 138 174 209 104 139 + 174 209 104 139 140 175 70 105 + 210 245 140 175 211 246 141 176 + 211 246 141 176 212 247 142 177 + 212 247 142 177 213 248 143 178 + 213 248 143 178 214 249 144 179 + 214 249 144 179 215 250 145 180 + 215 250 145 180 216 251 146 181 + 216 251 146 181 217 252 147 182 + 217 252 147 182 218 253 148 183 + 218 253 148 183 219 254 149 184 + 219 254 149 184 220 255 150 185 + 220 255 150 185 221 256 151 186 + 221 256 151 186 222 257 152 187 + 222 257 152 187 223 258 153 188 + 223 258 153 188 224 259 154 189 + 224 259 154 189 225 260 155 190 + 225 260 155 190 226 261 156 191 + 226 261 156 191 227 262 157 192 + 227 262 157 192 228 263 158 193 + 228 263 158 193 229 264 159 194 + 229 264 159 194 230 265 160 195 + 230 265 160 195 231 266 161 196 + 231 266 161 196 232 267 162 197 + 232 267 162 197 233 268 163 198 + 233 268 163 198 234 269 164 199 + 234 269 164 199 235 270 165 200 + 235 270 165 200 236 271 166 201 + 236 271 166 201 237 272 167 202 + 237 272 167 202 238 273 168 203 + 238 273 168 203 239 274 169 204 + 239 274 169 204 240 275 170 205 + 240 275 170 205 241 276 171 206 + 241 276 171 206 242 277 172 207 + 242 277 172 207 243 278 173 208 + 243 278 173 208 244 279 174 209 + 244 279 174 209 210 245 140 175 +attribute "element type" string "cubes" +attribute "ref" string "positions" + +object "material" class array type int rank 0 items 105 data follows + 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 +attribute "dep" string "connections" + +object "level" class array type int rank 0 items 105 data follows + 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 +attribute "dep" string "connections" + +object "deal data" class field +component "positions" value "vertices" +component "connections" value "cells" +object "cell data" class field +component "positions" value "vertices" +component "connections" value "cells" +component "material" value "material" +component "level" value "level" + +object "grid data" class group +member "cells" value "cell data" +end DEAL:3d::half_hyper_ball DEAL:3d::Abort!!! DEAL:3d::half_hyper_shell -- 2.39.5