Commit Graph
5276 Commits
Author SHA1 Message Date
Markus Blatt 3b4595d2d7 Allow a few well completions in the overlap.
If on one process a well completion is next to border then
it might also be stored in the neighbor process. Still not
all the completions of the well are known to the neighbor.
This breaks the previous assumption that for each well all
completions must belong to the partition of the process.

Therefore with this commit we allow wells that only have a
part of their completions assigned to the partition of the process.
This wells are deactivated under the assumption that they must
exist completely on another process due to the partitioning.
2015-09-08 20:38:02 +02:00
Atgeirr Flø Rasmussen 56c23d1a5a Merge pull request #873 from blattms/fix-parallel-wellsmanager-for-partly-shut-wells
[bugfix] Account for shut completions when checking well in parallel
2015-09-08 11:01:44 +02:00
Markus Blatt 3261ec3281 Make code clearer with and if-else-if statements and spaces. 2015-09-08 10:48:55 +02:00
Markus Blatt 7b5e07f8f6 Improve code comments. 2015-09-08 10:48:14 +02:00
Markus Blatt ef6cf0d928 Make last commit compile 2015-09-08 09:30:16 +02:00
Markus Blatt 3412d1ff1e [bugfix] Account for shut completions when checking well in a parallel run.
Previously well with just some shut completions errorneously triggered an
exception in parallel runs. This is fixed with this commit.

Due to the logic shut completions will always be marked as existing
on a process. (Initially all completions are marked as found. For
each open completion we check whether the cartesian index belongs to
the local grid. If that is not the case we mark it as not found).
Therefore we now check whether the found number of completions
is either the number of shut completions or the number of all completions.
In the former case the well is not stored on this process, and in the latter
case it is. In other cases we throw an exception.
2015-09-07 16:55:08 +02:00
Atgeirr Flø Rasmussen de011f0bd2 Merge pull request #871 from dr-robertk/PR/remove-warnings
[BlackoilPropsFromDeck] remove sign/unsigned warnings.
2015-09-07 10:07:06 +02:00
Robert Kloefkorn 65b5fa1c31 [BlackoilPropsFromDeck] remove sign/unsigned warnings. 2015-09-07 09:50:40 +02:00
Atgeirr Flø Rasmussen c17488888e Merge pull request #867 from babrodtk/fix_warnings
Fixed several warnings
2015-09-04 14:13:34 +02:00
Atgeirr Flø Rasmussen c042a1912a Merge pull request #869 from blattms/fix-for-loop-initial-decl
Fix complaint about initial declaration in foor loops.
2015-09-04 14:10:46 +02:00
dr-robertk cf0e02ef00 Merge pull request #870 from totto82/add_maxgrowth
Limit the time step growth for all time-stepping algorithm
2015-09-04 11:42:29 +02:00
babrodtk 96e1a89abe Fixed even more warnings 2015-09-03 15:17:10 +02:00
babrodtk 221d1a3e92 Fixed several warnings 2015-09-03 15:17:10 +02:00
Markus Blatt 7db80ba2c6 Fix complaint about initial declaration in foor loop.
gcc-4.7.2 (Debian 4.7.2-5) complained about:
"‘for’ loop initial declarations are only allowed in C99 mode
note: use option -std=c99 or -std=gnu99 to compile your code"
when seeing a loop like
for(int i=0; i<end; ++i)

This is fixed by moving the declaration before the for loop with
this commit. Altenatively, we could use the above option.
2015-09-03 14:03:25 +02:00
Tor Harald Sandve a765659d90 Limit the timestep growth for all timestepping algorithm
The time step restriction is moved to AdaptiveTimeStepping_impl.hpp to
make it apply to all time-stepping algorithms.
2015-09-03 12:52:47 +02:00
Atgeirr Flø Rasmussen 3ddf2a7139 Merge pull request #834 from andlaus/satfunc_refactoring
use opm-material for the saturation functions
2015-09-02 15:23:12 +02:00
Andreas Lauser 71bbc01fdf SaturationPropsFromDeck: fix some array index screw-ups in the twophase case
I don't think the code gets more beatiful because of this, but it
seems like it does not crash anymore.
2015-09-02 12:29:18 +02:00
Andreas Lauser 92c7fa46ed "fix" the satfunc unit test
the derivatives changed in some instances compared to the old
implementations. this patch updates them to the new versions.

thanks to [at]atgeirr for discovering this.
2015-09-02 12:29:18 +02:00
Andreas Lauser faadeaa0aa use a .cpp instead of an _impl.hpp file for SaturationPropsFromDeck
this avoids having to include the "Evaluation.hpp" file as the first
thing in the morning.
2015-09-02 12:29:18 +02:00
Andreas Lauser bc9ab3862b InitStateEquil: fix valgrind complaint about uninitialized values
it seems that it was pure luck that this worked so far!
2015-09-02 12:29:18 +02:00
Andreas Lauser a1eb108528 remove the now obsolete SatFunc* classes 2015-09-02 12:29:18 +02:00
Andreas Lauser 921f377a1d SaturationPropsFromDeck: add the code to calculate all saturation properties using opm-material
also remove the now obsolete code in that class.
2015-09-02 12:29:11 +02:00
Andreas Lauser f32ab0e4e3 add a fluid state where scalars include the derivatives w.r.t. the saturations 2015-09-02 12:23:24 +02:00
Andreas Lauser 919ba96c09 ExplicitArraysFluidState: always make it appear threephase to the exterior, but also accept twophase arrays 2015-09-02 12:23:24 +02:00
Andreas Lauser 28c47461c6 redhat specfile: add opm-material as build dependency 2015-09-02 12:23:24 +02:00
Andreas Lauser 8c2b764cd0 debian control file: add opm-material as build time dependency 2015-09-02 12:23:24 +02:00
Andreas Lauser e5fe7e4c6c add opm-material to the dependencies specified by dune.module 2015-09-02 12:23:24 +02:00
Joakim Hove 34e90a0a30 Merge pull request #865 from joakim-hove/table-refactor
Using TableManager to get tables.
2015-09-02 11:57:53 +02:00
Atgeirr Flø Rasmussen bf7276280a Merge pull request #866 from blattms/fixes-getting-next-timestep
[bugfix] Allow querying the current time step even if we are done.
2015-09-01 23:10:00 +02:00
Markus Blatt 31617da382 [bugfix] Allow querying the current time step even if we are done.
Previously there was an assertion whether the time stepping is still
running when querying the time step. After commit 5af794cfd5 this
triggered an assertion for Norne. As there is no reason to limit querying
the current time step in this way. This commit simply removes the assertion
in AdaptiveSimulatorTimer::currentStepLength.

This closes OPM/opm-autodiff#446
2015-09-01 19:34:30 +02:00
Joakim Hove f3151a9abe Using TableManager to get tables. 2015-09-01 12:58:09 +02:00
Atgeirr Flø Rasmussen 943a5d1e4c Merge pull request #861 from osae/zero_poro_hack
Zero-porosity cells and MINPV.
2015-08-31 13:35:19 +02:00
osae f81a4d62a4 Zero-porosity cells and MINPV.
Model 2 partly uses PORO=0.0 to signal inactive cells. This PR
prevents such cells from causing unwanted zcorn modifications in
the current min-pv algoritm. (The problem is however more general as
zero PORO or NTG should kill a cell whether MINPV is active or not,
refer kw ACTNUM.)
2015-08-27 17:49:10 +02:00
Joakim Hove 6579a150f3 Merge pull request #860 from joakim-hove/THPRES
Using map base ThresholdPressure implementation.
2015-08-25 16:23:56 +02:00
Joakim Hove c03d6f0b4b Ensure that thresholdPressure.hpp is compiled.
Added a test to ensure that thresholdPressure is compiled; however the
test is deactivated because it requires the GridHelpers from opm-autodiff.
2015-08-25 16:22:38 +02:00
Joakim Hove f8fb0ab7ab Using map base ThresholdPressure implementation. 2015-08-25 16:22:37 +02:00
Atgeirr Flø Rasmussen 78e30cc7e0 Merge pull request #859 from totto82/time-stepping
Use estimated time-step instead of average in next report step
2015-08-25 13:50:10 +02:00
Tor Harald Sandve b318686df1 Rename last_timestep_ to suggested_next_timestep_ 2015-08-25 11:16:36 +02:00
Tor Harald Sandve 5af794cfd5 Use estimated time-step instead of average in next report step 2015-08-25 06:32:39 +02:00
Joakim Hove 9ad6e59ee7 Merge pull request #857 from iLoop2/ThresholdPressure
Threshold pressure
2015-08-24 16:54:07 +02:00
Fredrik Gundersen 352a5d826b Updated as needed by new opm-parser functinality 2015-08-24 15:37:49 +02:00
Fredrik Gundersen 3d90a918d5 Merge remote-tracking branch 'upstream/master' 2015-08-24 08:35:58 +02:00
Joakim Hove 352f6bc26e Merge pull request #854 from chflo/OPM-215
Opm 215 EclipseReader restart file read of solution data
2015-08-23 23:09:32 +02:00
chflo 48c17ebd86 OPM-215: Added fault handling 2015-08-21 13:25:34 +02:00
Fredrik Gundersen 09aa2b7bf7 Added suport for new Threshold Pressure behavior 2015-08-20 13:00:01 +02:00
chflo 1739deb849 OPM-215: Added test 2015-08-20 12:42:12 +02:00
chflo 9d723ab071 OPM-215: Added method restoreSOLUTIONData() to EclipseReader, and helper methods 2015-08-20 12:37:06 +02:00
chflo c5383bc576 OPM-215: Created EclipseIOUtil.hpp file 2015-08-20 10:06:48 +02:00
Atgeirr Flø Rasmussen eac0e84f0f Merge pull request #844 from babrodtk/vfpprod
Vertical flow performance tables
2015-08-19 13:26:37 +02:00
babrodtk 3bca45883a Fixed whitespace 2015-08-19 13:20:58 +02:00