Joakim Hove
0149732abc
Merge pull request #493 from joakim-hove/relocate-warning-headers
...
Updated path to warning suppression header.
2015-10-06 16:06:05 +02:00
Joakim Hove
76f674b16b
Updated path to warning suppression header.
2015-10-06 12:11:49 +02:00
Atgeirr Flø Rasmussen
68caa026d9
Merge pull request #487 from totto82/solventModel
...
Changes to the solvent model
2015-10-06 11:19:58 +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
0054c90e45
Merge pull request #146 from atgeirr/refactor-getconvergence
...
Refactor getConvergence()
2015-10-06 10:27:39 +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
Bård Skaflestad
8b31c8b946
Merge pull request #147 from joakim-hove/table-container
...
Using TableContainer.
2015-10-05 15:08:13 +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
1a0358d85a
Using TableContainer.
2015-10-04 09:00:01 +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
058e4326ca
Remove unused functions.
2015-10-01 10:47:13 +02:00
Atgeirr Flø Rasmussen
d29ee6967c
Also refactor getWellConvergence() like getConvergence().
2015-09-30 15:20:04 +02:00
Atgeirr Flø Rasmussen
b885c8e454
Add "Polymer" material and disable custom getConvergence().
2015-09-30 14:49:15 +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
6ef6dbcf5a
Merge pull request #145 from bska/restore-build
...
Follow API update of BlackoilOutputWriter
2015-09-30 11:30:57 +02:00
Bård Skaflestad
13df018745
Follow API update of BlackoilOutputWriter
...
The constructor of class BlackoilOutputWriter gained a new parameter
in commit OPM/opm-autodiff@299b0aa (OPM/opm-autodiff#484 ). Honour
new API requirement.
2015-09-30 11:01:01 +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
