Markus Blatt
de1e709476
Merge remote-tracking branch 'upstream/master'
2012-10-03 20:01:05 +02:00
Markus Blatt
1105c9b540
Make number of smoothing steps and scaling factor for prolongation of AMG adjustable
2012-10-03 20:01:00 +02:00
Atgeirr Flø Rasmussen
6f31f059d7
Merge branch 'master' into reorder_tof
2012-10-03 10:05:53 +02:00
Atgeirr Flø Rasmussen
d22a1b6c03
Merge branch 'master' into ert
...
Conflicts:
opm/core/grid/cpgpreprocess/preprocess.h
2012-10-03 10:00:58 +02:00
Bård Skaflestad
ee23dfd475
Merge remote-tracking branch 'upstream/master'
2012-10-02 20:30:13 +02:00
Bård Skaflestad
6f888db5ea
Merge remote-tracking branch 'upstream/master'
2012-10-02 19:30:31 +02:00
Atgeirr Flø Rasmussen
a9783eefc7
Add explanatory comment.
2012-10-02 15:46:33 +02:00
Atgeirr Flø Rasmussen
5acbf00b14
Update compressible transport solver for new src convention.
...
Namely, that inflowing transport sources are water *surface* volumes,
not water *reservoir* volumes.
2012-10-02 14:37:18 +02:00
Atgeirr Flø Rasmussen
4f276a8870
Bugfix: size of vector for A should be np*np.
2012-10-02 14:35:28 +02:00
Atgeirr Flø Rasmussen
017663cc5b
Change interface for (blackoil) computeInjectedProduced().
...
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen
17c1be6541
Modified functions dealing with transport source.
...
In preparation for switching to new convention for inflow
sources in the compressible case: source being surface volumes,
not reservoir volumes.
2012-10-01 16:40:47 +02:00
Atgeirr Flø Rasmussen
6fb248d403
Update WellState::perfPress() after pressure solve.
2012-10-01 16:40:10 +02:00
Atgeirr Flø Rasmussen
0eb54ca90a
Added perfPress() to WellState.
2012-10-01 16:39:35 +02:00
Atgeirr Flø Rasmussen
78835b57b8
Merge branch 'master' into ert
2012-09-30 15:08:49 +02:00
Atgeirr Flø Rasmussen
f6b2306dab
Work in progress: degree 2 quadratures.
...
Also, changed quadrature degrees used to get exact quadratures for all terms.
2012-09-28 14:44:04 +02:00
Atgeirr Flø Rasmussen
cf38936c99
Merge branch 'master' into reorder_tof
2012-09-27 11:19:56 +02:00
Bård Skaflestad
888d0f04ad
Merge remote-tracking branch 'upstream/master'
2012-09-27 11:19:47 +02:00
Atgeirr Flø Rasmussen
d83ab5856d
Fix: forgotten multiply by cell volume in a quadrature.
2012-09-27 09:49:36 +02:00
Atgeirr Flø Rasmussen
04a76988d9
Add sink term contribution.
2012-09-26 15:15:04 +02:00
Atgeirr Flø Rasmussen
93094ebeec
Fix argument order in call.
2012-09-26 14:21:00 +02:00
Atgeirr Flø Rasmussen
99a12a7edc
Initial version of DG(1) for tof implemented.
...
Basis functions, quadratures and velocity interpolation are basic versions,
not handling any higher than DG(1) for now. These are currently in helper
classes and functions. The code in the main solver class is written with
the aim of supporting DG(n) generally.
2012-09-26 13:30:54 +02:00
Bård Skaflestad
fb8e79857c
Add tentative implementation of surface-rate targets.
...
Not tested at present.
2012-09-26 10:14:45 +02:00
Atgeirr Flø Rasmussen
bbc5ed5c68
Merge branch 'master' into reorder_tof
2012-09-26 09:08:26 +02:00
Atgeirr Flø Rasmussen
6a01298312
Merge branch 'master' into ert
...
Conflicts:
Makefile.am
2012-09-26 09:07:57 +02:00
Atgeirr Flø Rasmussen
1a227dbf86
Added skeleton of general order DG tof solver.
2012-09-26 08:58:03 +02:00
Atgeirr Flø Rasmussen
b9a2c14113
Add proper support for source terms.
...
This fixes the problem with infinite tofs at sinks.
2012-09-25 14:00:17 +02:00
Bård Skaflestad
afe4c54b66
Merge remote-tracking branch 'upstream/master'
2012-09-25 13:10:33 +02:00
Atgeirr Flø Rasmussen
ddf177b4c5
Merge branch 'master' into reorder_tof
2012-09-25 10:13:46 +02:00
Bård Skaflestad
ac66bbd7bf
Merge remote-tracking branch 'upstream/master'
2012-09-24 19:40:19 +02:00
Atgeirr Flø Rasmussen
9f69e9fa51
Guard against input error.
...
If no valid threephase_model is input, throw instead of crashing.
2012-09-24 17:09:50 +02:00
Atgeirr Flø Rasmussen
56e81968e3
Add support for new three-phase relperm option to BlackoilPropertiesFromDeck.
...
New parameter option added: 'threephase_model' can now be 'gwseg'.
2012-09-24 16:43:00 +02:00
Roland Kaufmann
ab21d44c9a
Disable warning for using DUNE's FieldVector::size
...
In DUNE 2.2 FieldVector::size changed from being a member to being a
method. A compatibility warning is issued if you include the relevant
headers.
This warning can be silenced for DUNE modules by using passing the
option --enable-fieldvector-size-is-method to ./configure. This patch
effectively does the same, but through a macro definition.
2012-09-24 00:21:06 +02:00
Bård Skaflestad
271b0d800c
Merge remote-tracking branch 'upstream/master' into fix-impedance-mismatch
2012-09-20 15:49:59 +02:00
Bård Skaflestad
b137eb0b65
Interpret `wells != 0 && wells->W == 0'' as `no wells''.
...
The CompressibleTpfa class always passes a non-null `forces->wells'
object to the constructor, assembly, and reconstruction routines but
uses ``forces->wells->W == 0'' to signify a simulation model without
wells. This is, arguably, an error in the CompressibleTpfa class but
one that does not require a lot of work to support in the
cfs_tpfa_residual module.
Insert the extra tests in an effort to honour the ``liberal in what you
accept, strict in what you produce'' principle.
2012-09-20 15:48:48 +02:00
Bård Skaflestad
bdcd5236bd
Don't crash on models without wells.
...
The user will legitimately want to run models that do not specify wells
(e.g., using boundary conditions). While we do not yet fully support
that configuration (no wells), we absolutely must not crash by
dereferencing null pointers or generating pointers into ::empty()
std::vector<>s.
This commit installs the required guards needed to avoid said failure
mode.
2012-09-20 15:03:38 +02:00
Atgeirr Flø Rasmussen
e3388575d6
Fix treatment of WELOPEN keyword.
...
Now you can actually shut and open wells with WELOPEN. The following
caveats apply:
- this may interact improperly with group controls,
- dynamic usage of WCONINJE/WCONPROD should not be mixed with WELOPEN.
2012-09-20 14:35:03 +02:00
Atgeirr Flø Rasmussen
50a23c0f5d
Support shut wells in compressible tpfa solver.
2012-09-20 14:34:33 +02:00
Atgeirr Flø Rasmussen
2017481a58
Improve diagnostic output if crossflow is detected.
2012-09-20 14:33:57 +02:00
Bård Skaflestad
2707bc15b2
Merge remote-tracking branch 'upstream/master'
2012-09-19 15:32:43 +02:00
Atgeirr Flø Rasmussen
8dc958044f
Merge branch 'master' into ert
2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
65447604ae
Typo fix.
2012-09-14 20:56:08 +02:00
Atgeirr Flø Rasmussen
67b5f007fd
Made initialization from SWAT/SGAS etc. more robust and general.
2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen
fa6b772972
Changed well initialization and property calculation.
...
Bhp is now initialized to bhp target for bhp-controlled wells.
Mobilities and pvt properties are now calculated from
well perforation pressure and injection specifications for
injectors, producers still use cell properties as before.
2012-09-14 09:53:11 +02:00
Atgeirr Flø Rasmussen
bdcf0291e0
Fix error message.
2012-09-14 09:52:13 +02:00
Bård Skaflestad
dfa5805784
Merge remote-tracking branch 'upstream/master'
2012-09-05 19:48:21 +02:00
Atgeirr Flø Rasmussen
026863c95d
Merge branch 'master' into reorder_tof
2012-09-05 14:21:47 +02:00
Xavier Raynaud
680276debf
Fixed documentation.
2012-09-05 14:07:51 +02:00
Atgeirr Flø Rasmussen
9c77d12f8d
Merge branch 'master' into ert
...
Conflicts:
Makefile.am
configure.ac
examples/Makefile.am
opm/core/GridManager.cpp
opm/core/eclipse/EclipseGridParser.cpp
opm/core/grid/cpgpreprocess/preprocess.h
tests/Makefile.am
2012-09-05 13:36:19 +02:00
Xavier Raynaud
3eda90b7e6
Merge remote-tracking branch 'upstream/master'
2012-09-05 13:35:48 +02:00
Xavier Raynaud
1d98e043a5
Fixed source term (measured at reservoir conditions).
2012-09-05 13:34:25 +02:00
