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
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
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
Atgeirr Flø Rasmussen
01f7e48693
Implement numPhases() by phase_name_.size().
...
This makes it easier for derived models to add a phase.
2015-09-30 13:46:57 +02:00
Atgeirr Flø Rasmussen
67ac59288d
Make numPhases() calls use asImpl().
2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen
3d86b9b619
Refactor getWellConvergence() similar to getConvergence().
2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen
6a0964851c
Make convergence checks and output work with active phases.
2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen
4f72bfdbcf
Added phaseName() method.
2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen
aac34009e1
Use active and not canonical phases in getConvergence() etc.
2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen
57deb18dc4
Merge pull request #484 from dr-robertk/PR/Parallel-output-only-in-parallel-runs
...
ParallelDebugOutput: only use parallel output when mpi size > 1.
2015-09-30 09:42:28 +02:00
Markus Blatt
d7e6886f4b
Return 0 as hydrostatic correction for unperforated cells.
...
There might be wells without any perforations. It it happens
to be the last well will supscript over the bounds. In other
cases we actually return the correction for the next well.
Not sure whether returning 0 makes any sense, though.
2015-09-24 14:47:45 +02:00
Bård Skaflestad
a333755a2b
Merge pull request #481 from babrodtk/faster-form-interleaved
...
Faster form interleaved
2015-09-24 09:19:54 +02:00
babrodtk
85cfd9768e
Fixed whitespace issue
2015-09-24 08:47:27 +02:00
Robert Kloefkorn
36ca75c4b7
ParallelDebugOutput: fix bug in creation of local to global map on I/O rank.
2015-09-21 16:48:57 +02:00
Robert Kloefkorn
299b0aa3cf
ParallelDebugOutput: fix initialization of wells for the I/O rank.
2015-09-21 14:05:35 +02:00
Robert Kloefkorn
04ec4eb2bf
ParallelDebugOutput: disable wells, seems to not work after latest changes in opm-core.
2015-09-21 12:52:37 +02:00
Robert Kloefkorn
f63487ad0f
ParallelDebugOutput: initialize globalIndex in serial run too.
2015-09-21 12:42:41 +02:00
Robert Kloefkorn
dacb4013ed
ParallelDebugOutput: only use parallel output when mpi size > 1.
2015-09-21 12:24:07 +02:00
babrodtk
206dbd3b56
Updated documentation
2015-09-21 08:28:57 +02:00
babrodtk
a58dcce654
Minor changes to how the interleaved system is built
2015-09-17 16:00:44 +02:00
Atgeirr Flø Rasmussen
1f6d957cd4
Change the way the interleaved matrix is built.
...
Note that this implementation may not be robust since the getSparse()
method throws if the AutoDiffMatrix is not of general sparse type (S),
2015-09-17 15:59:56 +02:00
Atgeirr Flø Rasmussen
2d4c10d919
Silence unused argument warning.
2015-09-17 14:56:59 +02:00
Robert Kloefkorn
e8fad08d81
ParallelDebugOutput: workaround for ancient gcc bug.
2015-09-16 14:59:37 +02:00
Robert Kloefkorn
c32749b129
SolverFullyImpl: avoid multiple output of redundant information in parallel.
2015-09-16 14:36:28 +02:00
