Commit Graph

2092 Commits

Author SHA1 Message Date
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
f3437a67f7 Merge pull request #488 from joakim-hove/table-container
Changed Table code to use TableContainer
2015-10-05 14:47:13 +02:00
Joakim Hove
a9a42e82be Changed Table code to use TableContainer 2015-10-04 07:45:58 +02:00
Atgeirr Flø Rasmussen
85d7f6c904 Merge pull request #482 from babrodtk/autodiffmatrix_documentation
Autodiffmatrix beautification
2015-10-02 12:48:16 +02:00
babrodtk
57c95ecf00 Added missing endline to printout 2015-10-02 10:37:08 +02:00
babrodtk
c991ba8188 Added default setting for number of threads 2015-10-02 10:37:08 +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
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
Atgeirr Flø Rasmussen
5c8b6702e7 Merge pull request #491 from blattms/fix-hydrostatic-corrections-for-unperforated-wells
Return 0 as hydrostatic correction for unperforated cells.
2015-09-28 11:23:14 +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
Bård Skaflestad
2c84414641 Merge pull request #480 from atgeirr/silence-warning
Silence unused argument warning.
2015-09-21 10:45:58 +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
Atgeirr Flø Rasmussen
e49f852b98 Merge pull request #477 from dr-robertk/PR/terminal-output-in-parallel
SolverFullyImpl: avoid multiple output of redundant information in parallel.
2015-09-16 18:43:45 +02:00
Atgeirr Flø Rasmussen
57840a3153 Merge pull request #479 from akva2/fix_sibling_builds
fixed: make sure opm-common can be (re-)found
2015-09-16 16:30:56 +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
Arne Morten Kvarving
1ac43da951 fixed: make sure opm-common can be (re-)found
see https://github.com/OPM/opm-common/issues/40#issuecomment-140720316
2015-09-16 14:22:24 +02:00
Atgeirr Flø Rasmussen
55f8ebacfc Merge pull request #476 from dr-robertk/PR/ParallelDebugOutput
Pr/parallel debug output fixes
2015-09-16 13:25:49 +02:00
Robert Kloefkorn
a807aceb26 Merge remote-tracking branch 'upstream/master' into PR/ParallelDebugOutput 2015-09-16 13:10:46 +02:00
Robert Kloefkorn
c3568a64d6 BlackoilOutput: make matlab output work in parallel. 2015-09-16 13:05:23 +02:00
Robert Kloefkorn
0696dbc1bb ParallelDebugOutput: remove warnings due to unused variables. 2015-09-16 13:05:00 +02:00
Atgeirr Flø Rasmussen
35136f5f6a Merge pull request #471 from dr-robertk/PR/ParallelDebugOutput
ParallelDebugOutput: make the output in ecl format work in parallel.
2015-09-16 12:48:49 +02:00