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
Atgeirr Flø Rasmussen
eba000bf17
Do thp init() differently.
2015-08-19 13:12:15 +02:00
Atgeirr Flø Rasmussen
7a76766f79
Fix bug in test program.
2015-08-19 13:12:14 +02:00
babrodtk
12afe501fc
Fixed warning, double=>int
2015-08-19 13:12:14 +02:00
babrodtk
104159af15
Minor fixes
2015-08-19 13:12:14 +02:00
babrodtk
761973b01e
Fixed several compiler warnings
2015-08-19 13:12:14 +02:00
babrodtk
a103c59f3f
Bugfix with THP for injection wells
2015-08-19 13:12:14 +02:00
babrodtk
5fb364a48b
Removed superfluous line
2015-08-19 13:12:14 +02:00
babrodtk
ac0e72ea1d
Refactoring
2015-08-19 13:12:14 +02:00
babrodtk
c7a66bf595
Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table'
2015-08-19 13:12:14 +02:00
babrodtk
5913535396
More integration of VFP tables
2015-08-19 13:12:03 +02:00
babrodtk
88c3596535
Initial integration of VFP
2015-08-19 13:11:41 +02:00
babrodtk
53413e9318
Fixed warning
2015-08-19 13:10:48 +02:00
babrodtk
c4aae4440e
Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table'
2015-08-19 13:10:48 +02:00
babrodtk
e05b7778d7
More integration of VFP tables
2015-08-19 13:10:48 +02:00
babrodtk
1dab5351c2
Initial integration of VFP
2015-08-19 13:10:48 +02:00
Atgeirr Flø Rasmussen
11062bf13a
Merge pull request #853 from atgeirr/fix-init-order
...
Match init order to member order.
2015-08-19 11:36:10 +02:00
Atgeirr Flø Rasmussen
13d443473e
Match init order to member order.
...
In a constructor initialisation list, the order should be the same
as the order in which the variables actually are initialised, which
is given by the order they are declared in the class and not by the
order in the initialisation list.
2015-08-19 11:33:29 +02:00
Atgeirr Flø Rasmussen
c1332b8b83
Merge pull request #852 from GitPaean/testing_new_adaptive_timestepping
...
adding command line option full_timestep_initially_
2015-08-18 10:24:51 +02:00
Kai Bao
5e5271b14d
adding command line option full_timestep_initially_
...
when the option is true, for each report step, the size of the adaptive
time step always beginning with the size of the report step.
2015-08-17 15:56:31 +02:00
Atgeirr Flø Rasmussen
932d686408
Merge pull request #851 from atgeirr/catch-more-istl-exceptions
...
Catch more istl exceptions
2015-08-17 14:48:01 +02:00
Atgeirr Flø Rasmussen
64b83989d5
Correct comment.
2015-08-17 13:02:37 +02:00
Atgeirr Flø Rasmussen
e88e62a68d
Catch MatrixBlockError in the adaptive time stepper.
...
This can be thrown by the ILU0 preconditioner when using the
interleaved solver approach.
2015-08-17 12:59:31 +02:00
Joakim Hove
a5f8921fff
Merge pull request #850 from atgeirr/fix-groupcontrol-resv
...
Use the correct (new) method from the Group class for group RESV.
2015-08-14 13:47:38 +02:00
Atgeirr Flø Rasmussen
9c6cabcd9a
Use the correct (new) method from the Group class for group RESV.
...
Production controls now are no longer initialised from injection control data.
2015-08-13 10:21:24 +02:00
Atgeirr Flø Rasmussen
0147d28257
Merge pull request #848 from atgeirr/fix-bugs-explicitarraysfluidstate
...
Fix bugs related to ExplicitArraysFluidState
2015-08-12 15:25:29 +02:00
Atgeirr Flø Rasmussen
f2572066b7
Merge pull request #849 from joakim-hove/memcmp_double
...
Added small utility memcmp_double()
2015-08-12 14:41:59 +02:00
Joakim Hove
20968d9c0a
Added small utility memcmp_double()
2015-08-12 14:31:07 +02:00
Atgeirr Flø Rasmussen
6921bd2af9
Make saturation functions work with two phases again.
...
Note that this changes ExplicitArraysFluidState to take
a run-time argument for the number of phases.
2015-08-12 13:38:32 +02:00
Atgeirr Flø Rasmussen
6c821aef10
Bugfix: add forgotten setIndex() call.
2015-08-12 13:38:10 +02:00
Atgeirr Flø Rasmussen
547018d3c7
Merge pull request #845 from atgeirr/fix-abs-bug-and-warnings
...
Fix abs bug and warnings
2015-08-12 12:50:31 +02:00
Atgeirr Flø Rasmussen
8a0010527c
Suppress warnings.
2015-08-10 16:07:45 +02:00
Atgeirr Flø Rasmussen
1ead8dd458
Fix bug in floating-point comparison.
...
The function used integer abs() instead of fabs(), in C abs() only
takes integers so this is an error. Also needed to add comparison
with absolute tolerance to get reasonable behaviour (comparing 0 versus
0.0000000000001 is ok here).
2015-08-10 16:05:00 +02:00
