Kristian Flikka
b6072e5112
Added support for creation of WellsGroup objects from new parser Well and Group objects
2014-02-11 14:12:36 +01:00
Andreas Lauser
4018bcfc71
make the saturation functions work with opm-parser
2014-02-10 14:50:37 +01:00
Andreas Lauser
1221ea25c1
more typos
...
thanks to @bska
2014-02-10 14:49:58 +01:00
Andreas Lauser
5b77bcd4a0
handle the ROCK keywords using the new opm-parser utility class
2014-02-10 14:49:58 +01:00
Andreas Lauser
e177b657f9
use the (new) RocktabTable class for rock compressibility
...
thanks to @bska for pointing this out
2014-02-10 14:49:58 +01:00
Andreas Lauser
7fdda98213
add variants of all methods which take a deck of the new parser to the rock properties
2014-02-10 14:49:58 +01:00
Joakim Hove
88c99663c6
Merge pull request #469 from andlaus/parser-integrate_phase_usage_from_deck
...
git add variant of phaseUsageFromDeck() which takes a deck of the new parser
2014-02-10 13:30:39 +01:00
Atgeirr Flø Rasmussen
1f2b2eadc5
Merge branch 'master' into initialisation
2014-02-10 13:24:35 +01:00
Andreas Lauser
f1f801aca5
add back blank line as requested by @bska
2014-02-07 19:35:28 +01:00
Andreas Lauser
a91a6c9484
git add variant of phaseUsageFromDeck() which takes a deck of the new parser
2014-02-07 19:35:28 +01:00
Joakim Hove
5d8c1244db
Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate
2014-02-07 09:23:39 +01:00
Joakim Hove
97bfb0ed82
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2014-02-07 09:23:22 +01:00
Kristian Flikka
6632630269
Initializing do_hyst_ to false, this caused random segfaults in sim_fibo_ad
2014-02-06 21:17:36 +01:00
Kristian Flikka
aa329b8b3e
Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses
2014-02-06 16:31:35 +01:00
Joakim Hove
2c05b6a1b4
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2014-02-05 23:06:54 +01:00
Atgeirr Flø Rasmussen
cb99938c62
Fix initialisation warning.
2014-02-05 13:05:33 +01:00
Atgeirr Flø Rasmussen
b134fe048a
Still working on test_equil.cpp.
2014-02-05 11:26:29 +01:00
Joakim Hove
ca2def2a02
Merged upstream/master
2014-02-04 21:42:07 +01:00
Atgeirr Flø Rasmussen
04eea929ba
Fix contact depths in test deck.
2014-02-04 10:57:23 +01:00
Atgeirr Flø Rasmussen
45de38a019
Throw exception if datum not in oil zone.
...
We are not capable of handling this, and must abort.
2014-02-04 10:56:09 +01:00
Atgeirr Flø Rasmussen
634b78a9d9
Created simple data for init testing.
2014-02-04 09:38:47 +01:00
Atgeirr Flø Rasmussen
85be4b1263
Add (unfinished) test case.
2014-02-03 15:36:20 +01:00
Atgeirr Flø Rasmussen
30d65e6c32
Removed RK4IVP's inheritance from binary_function.
...
Three reasons:
- class is a unary functor,
- the typedefs obtained were not used,
- binary_function is deprecated in C++11.
2014-02-03 11:32:46 +01:00
Kristian Flikka
3d215691da
Removed WELTARG commented code, moved wellperf_data into createWellsFromSpecs function
2014-02-03 09:22:28 +01:00
Kristian Flikka
76dff2e326
Extracted well controls setup to separate function
2014-02-03 09:07:58 +01:00
Kristian Flikka
e12ec1b25d
Extracted well specification and completion data setup to a function
2014-02-03 08:58:54 +01:00
Atgeirr Flø Rasmussen
0061b25408
Merge remote-tracking branch 'bska/initialisation' into initialisation
2014-01-31 15:41:58 +01:00
Atgeirr Flø Rasmussen
5ce1d09370
Merge pull request #478 from osae/endscale
...
Saturation table scaling and hysteresis.
2014-01-31 05:48:56 -08:00
Bård Skaflestad
0fc3571488
Fix fallout from PR #474
...
The check introduced in PR #474 (commit ad899fc) means all decks
must supply valid depth data. Update test decks accordingly to
restore "make test".
2014-01-31 14:24:02 +01:00
Joakim Hove
30df3cab37
Using well->hasInjectionControl() to check whether a particular control is available.
2014-01-30 16:37:20 +01:00
Joakim Hove
35d0808fbe
Implemented WCONPROD support from Parser::Schedule object.
2014-01-30 15:55:17 +01:00
Joakim Hove
3e2df33a65
Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates
...
Conflicts:
opm/core/wells/WellsManager.cpp
2014-01-30 09:50:09 +01:00
Joakim Hove
70e2dd9f12
Implemented well injector properties from opm-parser::Well.
2014-01-30 08:02:13 +01:00
Joakim Hove
0d8b883b8e
Added namespace prefix to enum.
2014-01-30 08:00:45 +01:00
Kristian Flikka
d621fdfe79
Removed print statement
2014-01-29 12:30:03 +01:00
Kristian Flikka
fbe2f31653
Updated COMPDAT i,j,k indices, and removed the old commented part
2014-01-29 11:58:14 +01:00
Kristian Flikka
0d492ce407
Changed data file not not have same perforation multiple times, as the old system doesn't support this
2014-01-29 11:58:13 +01:00
Kristian Flikka
7ce9cb9055
Compdat extraction from new CompletionXXX classes
2014-01-29 11:58:13 +01:00
Kristian Flikka
74c3040c43
Added an extra data file with an extra well
2014-01-29 11:58:13 +01:00
Joakim Hove
9f948329c4
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2014-01-29 11:02:21 +01:00
Joakim Hove
1548984acd
Merge remote-tracking branch 'upstream/master' into wellsmanager-rates
2014-01-29 11:01:14 +01:00
Kristian Flikka
4049426ec9
Updated Namespace of PhaseEnum from opm-parser
2014-01-28 21:11:51 +01:00
osae
64b9726692
Saturation table scaling and hysteresis.
...
This commit implements some additional scaling keywords. This includes
the ISWL-family that provide hysteresis behaviour via alternative
scaling of the tables. The old parser has been somewhat extended for
testing purposes. The commit also includes a slight refactoring of the
SatFunc-family where a new base class has been introduced.
2014-01-28 16:36:55 +01:00
Joakim Hove
7774a11eee
WellType is determined from well->isProducer() instead of looking for WCONINJE / WCONPROD keywords.
2014-01-24 12:00:58 +01:00
Bård Skaflestad
311ac78340
Add a layer of glue to extract data from deck
...
This is a work in progress.
2014-01-23 10:16:49 +01:00
Kristian Flikka
3b0a9067b4
Removes the WELSPECS usage in WellsManager constructor. Step 1 in rewrite of constructor
2014-01-22 15:22:32 +01:00
Bård Skaflestad
f71ba5a9f7
Install crude handling of data point outside vertical span
...
The initial implementation of RK4IVP<>::operator() failed to take
into account the possibility that we might need to evaluate the
function outside the vertical span for which it was initially
defined. This situation occurs, for instance, in the not uncommon
cases of the GOC being above or the WOC being below the model.
This commit installs a crude Hermitian extrapolation procedure to
handle these cases. Refinements are likely.
2014-01-21 17:54:47 +01:00
Bård Skaflestad
76844c9c59
Include <numeric> for std::iota()
...
Header was missing in earlier revision.
2014-01-21 17:54:47 +01:00
Bård Skaflestad
ada48fd0b5
Document requirements of CellRange.
2014-01-21 17:54:47 +01:00
Bård Skaflestad
955cb795f3
Document public interface of phasePressures().
2014-01-21 17:54:47 +01:00
