mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-11-29 12:33:49 -06:00
bf32eb0010
This makes eWoms multi-discretization capable. Along the way, this fixes some bugs and does a medium sized reorganization of the source tree. This is a squashed patch of the following commits: -------- 1st commit message: add initial version of the element centered finite volume discretization currently, it is a misnomer as it is just a copy of the vertex centered discretization plus some renames... -------- 2nd commit message: rename [VE]cfvModel -> [VE]cfvDiscretization -------- 3rd commit message: ecfv: prelimary changes required to make it compile but not work yet... -------- 4th commit message: Rename *FvElementGeometry to *Stencil "Stencil" seems to be the standard expression for this concept... (also, it is not specific to finite volume methods and is shorter.) -------- 5th commit message: refactor the stencil class for the element centered finite volume discretization -------- 6th commit message: ECFV: some work on the stencil class -------- 7th commit message: ECFV: make the boundary handling code compile -------- 8th commit message: rename elemContext() to elementContext() -------- 9th commit message: ECFV: make the VTK output modules compile -------- 10th commit message: stencil: introduce the concept of primary DOFs also save an vector of all element pointers in the stencil. -------- 11th commit message: ECFV: try to fix assembly; add missing timeIdx arguments to the num*() methods -------- 12th commit message: ECFV: fix stupid mistake in the assembler -------- 13th commit message: ECFV: remove a few implicit DOF == vertex assumptions the black-oil example now runs without valgrind complaints until it encounters a negative oil mole fraction. -------- 14th commit message: VCFV: make everything compile again all vertex centered FV examples should now work again... -------- 15th commit message: rename [ev]cfvmodel.hh to [ev]cfvdiscretization.hh the classes have already been renamed. -------- 16th commit message: ECFV: make it work to the point where it can write out the initial solution. -------- 17th commit message: ECFV: make it work the local residual/jacobian needed some work in distinguishing primary and secondary DOFs and there was an minor issue with the serialization code. for some reason, it seems still not correct. (-> convergence is too slow.) -------- 18th commit message: VCFV: make it compile for the black oil model again -------- 19th commit message: VCFV: make it compile with the remaining models again -------- 20th commit message: flash model: make it work with ECFV although this breaks its compatibility with VCFV. (-> next commit) -------- 21st commit message: adapt the VCFV to make it compatible with the flash model again -------- 22nd commit message: make all models compile with VCFV again -------- 23rd commit message: VCFV: more cleanups of the stencil VcfvStencil now does not have any public attributes anymore. TODO: do not export attributes in the SubControlVolume and SubControlVolumeFace classes. -------- 24th commit message: VCFV: actually update the element pointer -------- 25th commit message: change the blackoil model back to ECFV -------- 26th commit message: immiscible model: make it compatible with the ECFV discretization -------- 27th commit message: PVS model: make it work with ECFV -------- 28th commit message: NCP model: make it work with ECFV -------- 29th commit message: rename Vcfv*VelocityModule to *VelocityModule -------- 30th commit message: richards model: make it work with ECFV -------- 31st commit message: unify the ECFV and the VCFV VTK output modules and other cleanups -------- 32nd commit message: unify the common code of the VCFV and the ECFV disctretizations -------- 33rd commit message: unify the element contexts between element and vertex centered finite volumes -------- 34th commit message: unify the local jacobian class of the finite volume discretizations -------- 35th commit message: replace [VE]vcf(LocalResidual|ElementContext|BoundaryContext|ConstraintsContext) by generic code -------- 36th commit message: replace the [EV]cfvLocalResidual by generic code -------- 37th commit message: unify the MultiPhaseProblem and Problem classes, introduce NullBorderListCreator -------- 38th commit message: remove the discretization specific boundary context -------- 39th commit message: unify the [EV]cfvDiscretization classes -------- 40th commit message: Unify [EV]cfvMultiPhaseFluxVariables -------- 41st commit message: Unify the [EC]cfvNewton* classes -------- 42nd commit message: Unify [EV]cfvVolumeVariables -------- 43rd commit message: unify [EV]cfvAssembler -------- 44th commit message: unified flux variables: fix stupid mistake when calculating pressure gradients -------- 45th commit message: unify what's to unify for the [EV]CFV properties -------- 46th commit message: make the method to calculate gradients and values at flux approximation points changeable Currently, this is used by the vertex centered finite volume method to be able to use P1-finite element gradients instead of two-point ones... -------- 47th commit message: make the restart code work correctly, use the correct DofMapper for VCFV -------- 48th commit message: actually use the gradient calculator in a model the immiscible model in this case -------- 49th commit message: move some files around to where they belong, use the new gradient calculation code in all models TODO: proper handling of boundary gradients -------- 50th commit message: fix the stokes model currently it only works with the vertex centered finite volume discretization, but the plan is to soon move it to a staggered grid scheme anyway... -------- 51st commit message: move all models back to using the vertex centered finite volume discretization by default -------- 52nd commit message: models: some variable renames and documentation fixes - scv -> dof - vert -> dof - vertex -> dof - replace 'VCFV' - fix some typos -------- 53rd commit message: don't expect UG anymore since it is quite non-free and hard to get. we now use ALUGrid instead! -------- 54th commit message: temporarily disable jacobian recycling -------- 55th commit message: fix writing/reading restart files using the generic code -------- 56th commit message: fix bug where fluxes were only counted once in the stencil this only affected the vertex centered finite volumes discretization... -------- 57th commit message: boundary gradients: use the center of the sub-control volume adjacent to a boundary segment -------- 58th commit message: make it compile on GCC -------- 59th commit message: get rid of most hacks for this, partial reassemble and jacobian recycling was brought back. For the this and the remaining stuff the main trick is the introduction of the GridCommHandleFactory concept which constructs communication handles suited for the respective spatial discretization... -------- 60th commit message: fix a few annoying bugs first, default the convergence criterion for the linear solver did not honor the initial residual which lead to linear solver breakdowns, then some debugging code was left in the discrete fracture model and then there was a bug in the TP gradient approximation class... this has the consequence that we need a new reference solution for the discrete fracture problem... -------- 61st commit message: iterative linear solver: remove the code for the non-default convergence criteria -------- 62nd commit message: provide the FE cache instead of the local FE this fixes a segfault in the stokes model caused by the fact that the local FE was not initialized at this point. -------- 63rd commit message: (Navier-)Stokes: fix bug due to the transition to unit normals now, all tests pass for this branch. The only things which need to be fixed are some annoying performance regressions compared to master and some bug in the splices feature of the property system... -------- 64th commit message: some fix for the local residual of the immiscible model -------- 65th commit message: Navier-Stokes: implement SCV center gradients There seems to be a bug in the previous implementation (the jacobian inverse transposed is evaluated using the local, not the global geometry), so the reference solution for the stokes2c test problem has also been updated... -------- 66th commit message: remove the ALUGrid specialization of the LensGridCreator and the YaspGrid one for the fingerproblem using different grid seems to sometimes cause a different vertex order, which in turn causes the respective test to fail if the reference solution was computed using the other grid... -------- 67th commit message: VCFV: use the correct BorderListCreator this makes MPI parallel computations work again. apart from performance regressions, this branch does not exhibit any known regressions compared to master anymore... -------- 68th commit message: make verything compile with the element centered finite volume discretization except the Navier-Stokes and the two-phase DFM models, of course... -------- 69th commit message: minor fixes - make the navier-stokes model slighly more generic by using the proper (in,ex)teriorIndex() methods on sub-control volumes - make the signature of the calculateValue() template method of the common two-point gradient approximator match the one of the vertex centered finite volume one -------- 70th commit message: fix fallout from the Big Rebase -------- 71st commit message: ECFV: some bugs in the boundary -------- 72nd commit message: make computeFlux() compute area-specific quantities -------- 73rd commit message: fix more bugs in the element centered FV discretization now eWoms should match Dumux pretty closely... -------- 74th commit message: coalesce the common code of the multi phase porous medium models into "MultiPhaseBaseModel" -------- 75th commit message: update reference solutions these were changed because of the screw-up with the area of boundary segments... -------- 76th commit message: rename "ImplicitBase" to "FvBase" because in eWoms, everything is implicit and these are currently the base classes for all finite volume discretizations. -------- 77th commit message: make the spatial discretization selectable using a splice This requires an opm-core with a the patches from https://github.com/OPM/opm-core/pull/446 merged... -------- 78th commit message: rename the properties used for splices to *Splice -------- 79th commit message: move the files in 'tests/models' to 'tests' since 'tests' was empty except for the 'models' subdirectory... -------- 80th commit message: improve and fix the tutorial -------- 81st commit message: remove the -fno-strict-aliasing flag from the provided option files seems like recent versions of Dune have been adapted... -------- 82nd commit message: also compile all CO2 injection simulations using the element centered finite volume discretization -------- 83rd commit message: PVS model: make it work properly with the element-centered finite volume discretiation because DOF != number of vertices
157 lines
8.0 KiB
XML
157 lines
8.0 KiB
XML
<?xml version="1.0"?>
|
|
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
|
|
<UnstructuredGrid>
|
|
<Piece NumberOfCells="100" NumberOfPoints="121">
|
|
<PointData Scalars="pressure_H2O">
|
|
<DataArray type="Float32" Name="pressure_H2O" NumberOfComponents="1" format="ascii">
|
|
196212 196370 188338 188780 196814 190251 197395 192346 197858 193915 198028 194419
|
|
197858 193915 197395 192346 196814 190251 196370 188780 196212 188338 179700 180187
|
|
182338 188503 191008 191792 191008 188503 182338 180187 179700 170226 170483 170828
|
|
176915 181101 182066 181101 176915 170828 170483 170226 160213 160286 160492 162320
|
|
164724 165436 164724 162320 160492 160286 160213 150000 150000 150000 150000 150000
|
|
150000 150000 150000 150000 150000 150000 139787 139714 139508 137680 135276 134564
|
|
135276 137680 139508 139714 139787 129774 129517 129172 123085 118899 117934 118899
|
|
123085 129172 129517 129774 120300 119813 117662 111497 108992 108208 108992 111497
|
|
117662 119813 120300 111662 111220 109749 107654 106085 105581 106085 107654 109749
|
|
111220 111662 103788 103630 103186 102605 102142 101972 102142 102605 103186 103630
|
|
103788
|
|
</DataArray>
|
|
<DataArray type="Float32" Name="density_H2O" NumberOfComponents="1" format="ascii">
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
|
|
1000
|
|
</DataArray>
|
|
<DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
|
|
0.4
|
|
</DataArray>
|
|
<DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
|
|
283.15
|
|
</DataArray>
|
|
</PointData>
|
|
<Points>
|
|
<DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii">
|
|
0 0 0 0.1 0 0 0 0.1 0 0.1 0.1 0
|
|
0.2 0 0 0.2 0.1 0 0.3 0 0 0.3 0.1 0
|
|
0.4 0 0 0.4 0.1 0 0.5 0 0 0.5 0.1 0
|
|
0.6 0 0 0.6 0.1 0 0.7 0 0 0.7 0.1 0
|
|
0.8 0 0 0.8 0.1 0 0.9 0 0 0.9 0.1 0
|
|
1 0 0 1 0.1 0 0 0.2 0 0.1 0.2 0
|
|
0.2 0.2 0 0.3 0.2 0 0.4 0.2 0 0.5 0.2 0
|
|
0.6 0.2 0 0.7 0.2 0 0.8 0.2 0 0.9 0.2 0
|
|
1 0.2 0 0 0.3 0 0.1 0.3 0 0.2 0.3 0
|
|
0.3 0.3 0 0.4 0.3 0 0.5 0.3 0 0.6 0.3 0
|
|
0.7 0.3 0 0.8 0.3 0 0.9 0.3 0 1 0.3 0
|
|
0 0.4 0 0.1 0.4 0 0.2 0.4 0 0.3 0.4 0
|
|
0.4 0.4 0 0.5 0.4 0 0.6 0.4 0 0.7 0.4 0
|
|
0.8 0.4 0 0.9 0.4 0 1 0.4 0 0 0.5 0
|
|
0.1 0.5 0 0.2 0.5 0 0.3 0.5 0 0.4 0.5 0
|
|
0.5 0.5 0 0.6 0.5 0 0.7 0.5 0 0.8 0.5 0
|
|
0.9 0.5 0 1 0.5 0 0 0.6 0 0.1 0.6 0
|
|
0.2 0.6 0 0.3 0.6 0 0.4 0.6 0 0.5 0.6 0
|
|
0.6 0.6 0 0.7 0.6 0 0.8 0.6 0 0.9 0.6 0
|
|
1 0.6 0 0 0.7 0 0.1 0.7 0 0.2 0.7 0
|
|
0.3 0.7 0 0.4 0.7 0 0.5 0.7 0 0.6 0.7 0
|
|
0.7 0.7 0 0.8 0.7 0 0.9 0.7 0 1 0.7 0
|
|
0 0.8 0 0.1 0.8 0 0.2 0.8 0 0.3 0.8 0
|
|
0.4 0.8 0 0.5 0.8 0 0.6 0.8 0 0.7 0.8 0
|
|
0.8 0.8 0 0.9 0.8 0 1 0.8 0 0 0.9 0
|
|
0.1 0.9 0 0.2 0.9 0 0.3 0.9 0 0.4 0.9 0
|
|
0.5 0.9 0 0.6 0.9 0 0.7 0.9 0 0.8 0.9 0
|
|
0.9 0.9 0 1 0.9 0 0 1 0 0.1 1 0
|
|
0.2 1 0 0.3 1 0 0.4 1 0 0.5 1 0
|
|
0.6 1 0 0.7 1 0 0.8 1 0 0.9 1 0
|
|
1 1 0
|
|
</DataArray>
|
|
</Points>
|
|
<Cells>
|
|
<DataArray type="Int32" Name="connectivity" NumberOfComponents="1" format="ascii">
|
|
0 1 3 2 1 4 5 3 4 6 7 5
|
|
6 8 9 7 8 10 11 9 10 12 13 11
|
|
12 14 15 13 14 16 17 15 16 18 19 17
|
|
18 20 21 19 2 3 23 22 3 5 24 23
|
|
5 7 25 24 7 9 26 25 9 11 27 26
|
|
11 13 28 27 13 15 29 28 15 17 30 29
|
|
17 19 31 30 19 21 32 31 22 23 34 33
|
|
23 24 35 34 24 25 36 35 25 26 37 36
|
|
26 27 38 37 27 28 39 38 28 29 40 39
|
|
29 30 41 40 30 31 42 41 31 32 43 42
|
|
33 34 45 44 34 35 46 45 35 36 47 46
|
|
36 37 48 47 37 38 49 48 38 39 50 49
|
|
39 40 51 50 40 41 52 51 41 42 53 52
|
|
42 43 54 53 44 45 56 55 45 46 57 56
|
|
46 47 58 57 47 48 59 58 48 49 60 59
|
|
49 50 61 60 50 51 62 61 51 52 63 62
|
|
52 53 64 63 53 54 65 64 55 56 67 66
|
|
56 57 68 67 57 58 69 68 58 59 70 69
|
|
59 60 71 70 60 61 72 71 61 62 73 72
|
|
62 63 74 73 63 64 75 74 64 65 76 75
|
|
66 67 78 77 67 68 79 78 68 69 80 79
|
|
69 70 81 80 70 71 82 81 71 72 83 82
|
|
72 73 84 83 73 74 85 84 74 75 86 85
|
|
75 76 87 86 77 78 89 88 78 79 90 89
|
|
79 80 91 90 80 81 92 91 81 82 93 92
|
|
82 83 94 93 83 84 95 94 84 85 96 95
|
|
85 86 97 96 86 87 98 97 88 89 100 99
|
|
89 90 101 100 90 91 102 101 91 92 103 102
|
|
92 93 104 103 93 94 105 104 94 95 106 105
|
|
95 96 107 106 96 97 108 107 97 98 109 108
|
|
99 100 111 110 100 101 112 111 101 102 113 112
|
|
102 103 114 113 103 104 115 114 104 105 116 115
|
|
105 106 117 116 106 107 118 117 107 108 119 118
|
|
108 109 120 119
|
|
</DataArray>
|
|
<DataArray type="Int32" Name="offsets" NumberOfComponents="1" format="ascii">
|
|
4 8 12 16 20 24 28 32 36 40 44 48
|
|
52 56 60 64 68 72 76 80 84 88 92 96
|
|
100 104 108 112 116 120 124 128 132 136 140 144
|
|
148 152 156 160 164 168 172 176 180 184 188 192
|
|
196 200 204 208 212 216 220 224 228 232 236 240
|
|
244 248 252 256 260 264 268 272 276 280 284 288
|
|
292 296 300 304 308 312 316 320 324 328 332 336
|
|
340 344 348 352 356 360 364 368 372 376 380 384
|
|
388 392 396 400
|
|
</DataArray>
|
|
<DataArray type="UInt8" Name="types" NumberOfComponents="1" format="ascii">
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9 9 9 9 9 9 9 9 9
|
|
9 9 9 9
|
|
</DataArray>
|
|
</Cells>
|
|
</Piece>
|
|
</UnstructuredGrid>
|
|
</VTKFile>
|