From b67dc9c8f15aab3cf7ead60907086a8f903ea55b Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 7 Jun 2012 21:57:56 +0000 Subject: [PATCH] Update test results after recent changes to FE_DGQArbitraryNodes and PointValueHistory. git-svn-id: https://svn.dealii.org/trunk@25613 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/bits/fe_tools_08/cmp/generic | 6 +-- .../point_value_history_01/cmp/generic | 53 +++++++++++++------ tests/multigrid/transfer_01/cmp/generic | 2 +- tests/multigrid/transfer_02/cmp/generic | 2 +- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/tests/bits/fe_tools_08/cmp/generic b/tests/bits/fe_tools_08/cmp/generic index d858dc4f1c..53645cac74 100644 --- a/tests/bits/fe_tools_08/cmp/generic +++ b/tests/bits/fe_tools_08/cmp/generic @@ -109,7 +109,7 @@ DEAL::14. 8.1 5.5 DEAL::1.5 1.5 5.5 5.5 DEAL::Checking DGQ0 against DGQ1 in 2d: DEAL::1.9e+02 34. 9.8 -DEAL::0.94 -0.47 3.0 -0.37 1.2 2.7 2.0 3.5 2.7 4.2 3.5 5.0 5.2 6.8 6.0 7.5 6.7 8.3 7.5 9.0 +DEAL::0.94 -0.47 3.0 -0.37 1.2 2.7 2.0 3.5 2.7 4.2 3.5 5.0 5.2 6.7 6.0 7.5 6.7 8.3 7.5 9.0 DEAL::Checking DGQ1 against DGQ0 in 2d: DEAL::2.2e+02 73. 32. DEAL::14. 14. 16. 16. 16. 16. 32. 32. 32. 32. @@ -184,7 +184,7 @@ DEAL::3.3e+03 2.9e+02 39. DEAL::9.6 -0.0015 15. 1.1 9.7 10. 12. 12. 14. 19. 16. 21. 26. 26. 28. 28. 30. 35. 32. 37. DEAL::Checking DGQ3 against DGQ1 in 2d: DEAL::3.3e+03 5.9e+02 1.7e+02 -DEAL::22. 1.4 55. 3.8 24. 51. 36. 64. 51. 78. 63. 90. 88. 1.1e+02 1.0e+02 1.3e+02 1.1e+02 1.4e+02 1.3e+02 1.5e+02 +DEAL::22. 1.4 55. 3.8 24. 51. 36. 64. 51. 78. 63. 91. 88. 1.1e+02 1.0e+02 1.3e+02 1.1e+02 1.4e+02 1.3e+02 1.5e+02 DEAL::Checking DGQ1 against DGQ3 in 3d: DEAL::1.3e+05 3.8e+03 1.8e+02 DEAL::26. 22. 41. 38. 34. 43. 53. 64. 76. 91. 89. 76. 89. 1.3e+02 1.1e+02 1.3e+02 1.3e+02 1.5e+02 1.6e+02 1.5e+02 1.7e+02 @@ -235,7 +235,7 @@ DEAL::1.1e+02 39. 19. DEAL::-0.25 2.1 4.5 4.5 6.9 9.2 9.7 12. 15. 14. 17. 19. DEAL::Checking DGQ2 against DGQ4 in 2d: DEAL::1.2e+04 8.2e+02 89. -DEAL::24. 0.33 25. 6.6 34. 22. 31. 28. 38. 38. 41. 46. 51. 54. 63. 60. 71. 71. 77. 77. 83. +DEAL::24. 0.33 25. 6.6 34. 22. 31. 28. 38. 38. 41. 46. 51. 54. 63. 60. 71. 72. 77. 77. 83. DEAL::Checking DGQ4 against DGQ2 in 2d: DEAL::1.2e+04 1.4e+03 2.6e+02 DEAL::45. 35. -14. 49. -12. 57. 80. 67. 98. 80. 1.1e+02 1.4e+02 1.2e+02 1.5e+02 1.6e+02 1.8e+02 1.7e+02 2.0e+02 1.8e+02 2.1e+02 2.4e+02 2.2e+02 2.5e+02 diff --git a/tests/deal.II/point_value_history_01/cmp/generic b/tests/deal.II/point_value_history_01/cmp/generic index 9fcb7e6f96..76e9c6c7e0 100644 --- a/tests/deal.II/point_value_history_01/cmp/generic +++ b/tests/deal.II/point_value_history_01/cmp/generic @@ -4,7 +4,8 @@ Closed: 1 Cleared: 0 Geometric Data -# DoF_index : Location (for each component) +# Requested location: 1.0 0.20 +# DoF_index : Support location (for each component) 138 : 1.0 0.25 139 : 1.0 0.25 181 : 1.0 0.25 @@ -20,27 +21,38 @@ Solution: 3 : 1 Closed: 1 Cleared: 0 Geometric Data -# DoF_index : Location (for each component) +# Requested location: 0.0 0.0 +# DoF_index : Support location (for each component) 0 : 0.0 0.0 1 : 0.0 0.0 162 : 0.0 0.0 +# Requested location: 0.25 0.0 +# DoF_index : Support location (for each component) 8 : 0.25 0.0 9 : 0.25 0.0 163 : 0.25 0.0 +# Requested location: 0.25 0.45 +# DoF_index : Support location (for each component) 46 : 0.25 0.50 47 : 0.25 0.50 169 : 0.25 0.50 +# Requested location: 0.45 0.45 +# DoF_index : Support location (for each component) 48 : 0.50 0.50 49 : 0.50 0.50 170 : 0.50 0.50 +# Requested location: 0.80 0.80 +# DoF_index : Support location (for each component) 96 : 0.75 0.75 97 : 0.75 0.75 177 : 0.75 0.75 +# Requested location: 1.0 0.20 +# DoF_index : Support location (for each component) 138 : 1.0 0.25 139 : 1.0 0.25 181 : 1.0 0.25 @@ -57,7 +69,7 @@ Solution: 18 : 10 Closed: 1 Cleared: 0 Geometric Data -No nodes stored currently +No points stored currently Independent value(s): 1 : 10 @@ -65,11 +77,12 @@ Independent value(s): 1 : 10 DEAL::Starting data files DEAL::Copying output file point_value_history_01/node_00.gpl -DEAL::# DoF_index : Location (for each component) +DEAL::# Requested location: 0 0 +DEAL::# DoF_index : Support location (for each component) DEAL::# 0 : 0 0 DEAL::# 1 : 0 0 DEAL::# 162 : 0 0 -DEAL:: +DEAL::# DEAL::# DEAL::0 1 3 3 3 1 1 1 DEAL::1e-06 1 3 3 2.9 1 1 0.9 @@ -84,11 +97,12 @@ DEAL::9e-06 1 3 3 2.38742 1 1 0.38742 DEAL:: DEAL:: DEAL::Copying output file point_value_history_01/node_01.gpl -DEAL::# DoF_index : Location (for each component) +DEAL::# Requested location: 0.25 0 +DEAL::# DoF_index : Support location (for each component) DEAL::# 8 : 0.25 0 DEAL::# 9 : 0.25 0 DEAL::# 163 : 0.25 0 -DEAL:: +DEAL::# DEAL::# DEAL::0 1 3 3 3 1 1 1 DEAL::1e-06 1 2.94444 3 2.9 0.944444 1 0.9 @@ -103,11 +117,12 @@ DEAL::9e-06 1 2.59784 3 2.38742 0.597844 1 0.38742 DEAL:: DEAL:: DEAL::Copying output file point_value_history_01/node_02.gpl -DEAL::# DoF_index : Location (for each component) +DEAL::# Requested location: 0.25 0.45 +DEAL::# DoF_index : Support location (for each component) DEAL::# 46 : 0.25 0.5 DEAL::# 47 : 0.25 0.5 DEAL::# 169 : 0.25 0.5 -DEAL:: +DEAL::# DEAL::# DEAL::0 1 3 3 3 1 1 1 DEAL::1e-06 1 2.88889 2.77778 2.9 0.888889 0.777778 0.9 @@ -122,11 +137,12 @@ DEAL::9e-06 1 2.34644 2.10416 2.38742 0.346439 0.10416 0.38742 DEAL:: DEAL:: DEAL::Copying output file point_value_history_01/node_03.gpl -DEAL::# DoF_index : Location (for each component) +DEAL::# Requested location: 0.45 0.45 +DEAL::# DoF_index : Support location (for each component) DEAL::# 48 : 0.5 0.5 DEAL::# 49 : 0.5 0.5 DEAL::# 170 : 0.5 0.5 -DEAL:: +DEAL::# DEAL::# DEAL::0 1 3 3 3 1 1 1 DEAL::1e-06 1 2.77778 2.77778 2.9 0.777778 0.777778 0.9 @@ -141,11 +157,12 @@ DEAL::9e-06 1 2.10416 2.10416 2.38742 0.10416 0.10416 0.38742 DEAL:: DEAL:: DEAL::Copying output file point_value_history_01/node_04.gpl -DEAL::# DoF_index : Location (for each component) +DEAL::# Requested location: 0.8 0.8 +DEAL::# DoF_index : Support location (for each component) DEAL::# 96 : 0.75 0.75 DEAL::# 97 : 0.75 0.75 DEAL::# 177 : 0.75 0.75 -DEAL:: +DEAL::# DEAL::# DEAL::0 1 3 3 3 1 1 1 DEAL::1e-06 1 2.66667 2.66667 2.9 0.666667 0.666667 0.9 @@ -160,11 +177,12 @@ DEAL::9e-06 1 2.02601 2.02601 2.38742 0.0260123 0.0260123 0.38742 DEAL:: DEAL:: DEAL::Copying output file point_value_history_01/node_05.gpl -DEAL::# DoF_index : Location (for each component) +DEAL::# Requested location: 1 0.2 +DEAL::# DoF_index : Support location (for each component) DEAL::# 138 : 1 0.25 DEAL::# 139 : 1 0.25 DEAL::# 181 : 1 0.25 -DEAL:: +DEAL::# DEAL::# DEAL::0 1 3 3 3 1 1 1 DEAL::1e-06 1 2.77778 2.94444 2.9 0.777778 0.944444 0.9 @@ -194,11 +212,12 @@ DEAL::9e-06 1 DEAL:: DEAL:: DEAL::Copying output file point_value_history_01/Test_Copy_00.gpl -DEAL::# DoF_index : Location (for each component) +DEAL::# Requested location: 1 0.2 +DEAL::# DoF_index : Support location (for each component) DEAL::# 138 : 1 0.25 DEAL::# 139 : 1 0.25 DEAL::# 181 : 1 0.25 -DEAL:: +DEAL::# DEAL::# DEAL::0.1 1 1 1 1 DEAL:: diff --git a/tests/multigrid/transfer_01/cmp/generic b/tests/multigrid/transfer_01/cmp/generic index e77926165b..57ed8fd4c7 100644 --- a/tests/multigrid/transfer_01/cmp/generic +++ b/tests/multigrid/transfer_01/cmp/generic @@ -106,7 +106,7 @@ DEAL::u0 4608.50 DEAL::u0 1785.50 DEAL::u1 7110.50 DEAL::u2 28410.5 -DEAL::u1 113580. +DEAL::u1 113581. DEAL::u0 453661. 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 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 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 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 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 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 diff --git a/tests/multigrid/transfer_02/cmp/generic b/tests/multigrid/transfer_02/cmp/generic index d4b768447d..55dc893488 100644 --- a/tests/multigrid/transfer_02/cmp/generic +++ b/tests/multigrid/transfer_02/cmp/generic @@ -106,7 +106,7 @@ DEAL::u0 4608.50 DEAL::u0 1785.50 DEAL::u1 7110.50 DEAL::u2 28410.5 -DEAL::u1 113580. +DEAL::u1 113581. DEAL::u0 453661. 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 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 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 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 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 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 -- 2.39.5