Markus Blatt
87e02a1059
Communicate rock properties, too.
...
Somehow I was mislead by the name rock properties that the data stored in
them is not associated to grid cells, but to rock regions. With this commit
we determine the porosity and permeability by communication.
2015-10-26 10:49:35 +01:00
dr-robertk
fe1ba16e40
Merge pull request #511 from blattms/prevent-processing-wells-null-pointer-fixed
...
Cater for wells null pointer
2015-10-23 16:23:13 +02:00
dr-robertk
4490f07f9f
Merge pull request #512 from blattms/remove-superfluous-wellmap
...
Removes superfluous wellMap_ member from WellStateFullyImplicitBlackoil
2015-10-23 15:14:56 +02:00
Atgeirr Flø Rasmussen
0ffcaeb9f0
Merge pull request #513 from atgeirr/add-moduleversion
...
Add moduleVersion() utility and update dune.version.
2015-10-23 13:10:38 +02:00
Atgeirr Flø Rasmussen
bb7530edc3
Add and use moduleVersion() utility.
2015-10-23 11:25:06 +02:00
Markus Blatt
975ac0dc37
Removes superfluous wellMap_ member from WellStateFullyImplicitBlackoil.hpp
...
There is a using `BaseType::wellMap` directive that redirects all the
well map accesses to the base class. In consequence the local wellMap_
is alway empty and just makes debugging harder. Therefore it is
removed in this commit.
2015-10-23 10:47:14 +02:00
Markus Blatt
ba9f227a5b
Cater for wells null pointer
...
In the rare occasion that there are no wells int the model the wells_ pointer in
BlackoilModelBase class is a null pointer. Therefore we need to test whether it is
null and only process well information if it is not.
This problem was reintroduced with PR #460 and gets fixed by this
one. No we can run the equilibrium examples without wells again.
Sorry for the inconvenience.
2015-10-22 16:28:18 +02:00
Bård Skaflestad
cfc1350717
Merge pull request #500 from blattms/removed-superfluous-ptr-during-redistribution
...
Remove unnecessary shared_ptr for geology and black oil properties during redistribution.
2015-10-22 15:27:40 +02:00
Markus Blatt
f5e34e01ca
Remove unnecessary shared_ptr for geology and black oil properties.
2015-10-22 15:24:25 +02:00
Atgeirr Flø Rasmussen
98a3d1675a
Merge pull request #454 from babrodtk/openpm_experiment
...
Parallel assembly (partial)
2015-10-19 15:32:50 +02:00
Tor Harald Sandve
16140c54fc
Update comment
...
Cases with wells with no flow where crossflow is banned is handled in
the parser by shutting these wells. They will never be seen by the
simulator.
2015-10-19 08:17:52 +02:00
Tor Harald Sandve
1772a8c257
Handle allowCrossFlow flags from the input deck
2015-10-19 08:15:21 +02:00
Tor Harald Sandve
3f089b10d8
Add support for banning crossflow in the well equations
2015-10-19 08:15:21 +02:00
Atgeirr Flø Rasmussen
df668cc5e7
Merge pull request #497 from andlaus/error_macros_to_opm_common
...
Error macros to opm common
2015-10-12 13:31:54 +02:00
Atgeirr Flø Rasmussen
6170542e2f
Fix compile warning and error message.
2015-10-09 13:49:00 +02:00
Robert Kloefkorn
4d121dccf4
NewtonIterationBlackoilInterleavedImpl: cleanup.
2015-10-09 13:39:02 +02:00
Robert Kloefkorn
476a09e0d6
NewtonIterationBlackoilInterleaved: print "...to cover np = 0"
2015-10-09 12:12:50 +02:00
Robert Kloefkorn
ac034bd80e
NewtonIterationBlackoilInterleaved: fix docu.
2015-10-09 12:06:29 +02:00
Robert Kloefkorn
885aedb1e8
NewtonIterationBlackoilInterleaved: make parameter a struct to avoid multi reading.
2015-10-09 12:03:58 +02:00
Robert Kloefkorn
28902065cf
NewtonIterationBlackoilInterleavedImpl: silence warnings about unused and shadowed
...
variables.
2015-10-08 15:54:21 +02:00
Robert Kloefkorn
d93a1a5b63
NewtonIterationBlackoilInterleaved: replace switch-case statement by proper template
...
recursion.
2015-10-08 15:54:21 +02:00
Robert Kloefkorn
884edadbd6
NewtonIterationBlackoilInterleaved: remove old docu.
2015-10-08 15:54:21 +02:00
Robert Kloefkorn
6304e44242
NewtonIterationBlackoilInterleeaved: remove unused headers.
2015-10-08 15:54:21 +02:00
Robert Kloefkorn
c485e3fdc7
NewtonBlackølInterationInterleaved: NewtonBlackølInterationInterleavedImpl implements
...
the Iteration for a fixed number of cell variabled which is then used by the
NewtonBlackølInterationInterleaved class via a switch-case over the actually existing
numbers.
2015-10-08 15:54:21 +02:00
Atgeirr Flø Rasmussen
9be05f4206
Undo changes to NewtonIterationsBlackoilInterleaved.
2015-10-08 15:11:50 +02:00
Andreas Lauser
72b0cb2c3e
use the error macros from opm-common
2015-10-08 12:08:28 +02:00
Atgeirr Flø Rasmussen
9e3d360b5b
Silence warnings (shadowing and unused argument).
2015-10-07 10:07:45 +02:00
Joakim Hove
76f674b16b
Updated path to warning suppression header.
2015-10-06 12:11:49 +02:00
Tor Harald Sandve
dff77afff7
Use getConvergence and convergenceReduction from base
2015-10-06 11:04:34 +02:00
Tor Harald Sandve
56d6a1f54e
Add missed parentheses from the rebase process
2015-10-06 10:51:20 +02:00
Tor Harald Sandve
83bcd24108
Fill vector with zeros as constructed
2015-10-06 10:40:18 +02:00
Tor Harald Sandve
60a6451a6f
Fix typo
2015-10-06 10:40:18 +02:00
Tor Harald Sandve
8b8ca200d6
Use implemented computeWellConnectionPressures()
2015-10-06 10:40:18 +02:00
Tor Harald Sandve
6106d560ba
Compute matbal_scale for the solvent model
...
The material balance scaling is extended to the solvent model
The gas value is used as default and an updateEquationsScaling() method
is added.
Minor modifications is done to the BlackoilModelBase.hpp and
BlackoilModelBase_impl.hpp in order to re-use code from the base case.
2015-10-06 10:40:18 +02:00
Tor Harald Sandve
fb9e21d695
Add a local version of computeWellConnectionPressures()
...
Solvent is accounted for in the calculations of well connection
pressures by adjusting the surface_density and the b-factor
TODO: Restructuring to avoid code duplication with
BlackoilModelBase_impl
2015-10-06 10:38:36 +02:00
Tor Harald Sandve
7bdd91d78f
Allow for different surface densities in well perforations
...
The surface density input in well_perforation_densities() in
WellDensitySegmented.hpp is changed from one value pr. phase to one
value pr phase and perforation. This allow for different densities in
different perforation. The test is changed accordingly.
2015-10-06 10:38:36 +02:00
Tor Harald Sandve
23f4f48df5
Initialize well solvent fraction
...
The well solvent fraction is set to zero as default.
2015-10-06 10:38:36 +02:00
Tor Harald Sandve
18613b9c7b
Make flow_solvent run when SOLVENT is not specified
2015-10-06 10:38:36 +02:00
Tor Harald Sandve
c9b6db6c7e
Use a weighted sum of the b-factors of gas and solvent
...
A weighted sum of the b-factors of gas and solvent is used in the well
equation.
2015-10-06 10:33:17 +02:00
Tor Harald Sandve
08ce231869
Recalculate gas fluxes
...
The gas fluxes must be recalculated along with the mobilities after the
gasRelPermMultiplier is applied
2015-10-06 10:33:17 +02:00
Tor Harald Sandve
853e1f0dc1
Use ADB for solvent fraction
2015-10-06 10:33:17 +02:00
Atgeirr Flø Rasmussen
64c5b29b87
Merge pull request #492 from atgeirr/refactor-convergence-report
...
Refactor convergence reduction and report
2015-10-06 10:03:37 +02:00
Joakim Hove
a9a42e82be
Changed Table code to use TableContainer
2015-10-04 07:45:58 +02:00
babrodtk
1d6f12e870
Added OMP pragmas
2015-10-02 10:37:08 +02:00
babrodtk
654e4a81bf
Fixed errors from rebasing
2015-10-02 10:33:55 +02:00
babrodtk
7f9175e046
Created named constructor for identity matrices
2015-10-02 10:22:05 +02:00
babrodtk
4073abeafb
Added documentation for AutoDiffMatrix
2015-10-02 10:21:28 +02:00
Atgeirr Flø Rasmussen
39a0766b8c
Refactor MPI version of convergenceReduction().
2015-10-01 11:05:35 +02:00
Atgeirr Flø Rasmussen
d29ee6967c
Also refactor getWellConvergence() like getConvergence().
2015-09-30 15:20:04 +02:00
Atgeirr Flø Rasmussen
dcb78877eb
Separate phase and material concepts.
2015-09-30 14:44:50 +02:00
