Atgeirr Flø Rasmussen
0b05182645
Fix use of assert.
2014-06-16 13:44:00 +02:00
Atgeirr Flø Rasmussen
a199d78476
Work in progress fixing multidim upwinding.
2014-06-16 13:14:42 +02:00
Atgeirr Flø Rasmussen
4166a0621c
Removed unused debugging output.
2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen
0afbecfa07
Split method solveSingleCell() for easier maintenance.
2014-06-16 12:49:41 +02:00
Andreas Lauser
05775a0b36
Glue in support for the grid property modifier keywords
...
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.
with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.
no ctest regressions have been observed with this patch on my machine.
2014-06-11 13:48:49 +02:00
Bård Skaflestad
ed5bd42980
Merge pull request #596 from andlaus/fix_some_keyword_names
...
Fix some keyword names
2014-06-10 23:14:34 +02:00
Andreas Lauser
7603eafaf9
fix some keyword names
...
The queried keywords are unknown to the parser and after manual
inspection also to the Eclipse RM. There might be wrong keywords some
left, but these were to ones needed to get SPE9 started using
sim_fibo_ad...
2014-06-05 16:07:31 +02:00
Andreas Lauser
21719a6860
fix the equilibration test by using new values
...
thanks to @bska for the hints.
2014-06-04 13:26:37 +02:00
Andreas Lauser
d1a8c9d787
add missing PVTW keywords to the decks used by the equil test
...
the test still fails, but the errors seem to be due to differences in
the saturation functions...
2014-06-04 11:35:24 +02:00
Andreas Lauser
5936c59e22
add an assert
2014-06-04 11:11:35 +02:00
Andreas Lauser
749d0e838d
incorperate the review comments/decisions for multi-region PVT
...
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
2014-06-04 11:11:35 +02:00
Andreas Lauser
9a7b068d15
Implement multi-region PVT for all property classes
...
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
2014-06-04 11:11:35 +02:00
Liu Ming
8a118f45fe
rename the private member.
2014-05-23 11:10:22 +08:00
Liu Ming
9d985f7421
use unordered_map for "string-enum" translations.
2014-05-23 11:09:04 +08:00
Andreas Lauser
6a50afb219
rename all "newParserDeck" objects to "deck"
...
The "new" parser is now "the" parser...
2014-05-21 11:22:43 +02:00
Andreas Lauser
f360562aee
remove EclipseGridParser compatibility methods from all classes
2014-05-21 11:22:43 +02:00
Liu Ming
6f2d28d08a
Throw information for Petsc.
2014-05-16 15:02:49 +08:00
Liu Ming
559003ef1e
Test Petsc.
2014-05-16 14:55:23 +08:00
Liu Ming
ccb83a8503
Initialize Petsc from constructor.
...
Remove private members for initializing Petsc.
2014-05-16 14:53:49 +08:00
Liu Ming
4491eb7a6a
Add Petsc to OPM.
2014-05-16 14:41:51 +08:00
Atgeirr Flø Rasmussen
abd341ab7f
Supress signed-unsigned comparison warning.
2014-05-12 09:18:52 +02:00
Atgeirr Flø Rasmussen
a5ccc97a0f
Merge pull request #573 from osae/test-eps
...
Endpoint scaling - taking advantage of the new parser.
2014-05-12 08:28:48 +02:00
osae
4a3c7ff204
Removing a few bugs ...
2014-05-06 18:15:03 +02:00
osae
d91c49cffd
Proper interpretation of ENDNUM and IMBNUM fields.
...
Made consistent with grid discretization.
2014-05-06 14:41:17 +02:00
osae
d648917fcf
Initialisation of EGLNUM (analogous to e.g SATNUM)
2014-05-06 12:47:24 +02:00
osae
ca5b0eb16f
Inserted some documentation.
2014-05-05 11:27:10 +02:00
osae
bd38a577ae
Fix to make EQLNUM consistent with ACTNUM.
...
This should eventually be integrated in the parser.
2014-05-05 11:23:43 +02:00
osae
922a73442c
ENDNUM: changed default value and jtab-logic
...
Default value changed from 'no scaling' to 'use table 1'.
Range of jtab changed to [-1,#tables-1].
2014-05-05 10:33:04 +02:00
osae
48c3577277
Make use of keywords SATOPTS and EHYSTR.
2014-05-05 10:33:04 +02:00
osae
59eb5f6c20
Use ENDNUM and prepare for IMBNUM.
2014-05-05 10:33:04 +02:00
osae
a34eb162e8
Added missing line (parser conversion).
2014-05-05 10:33:04 +02:00
Andreas Lauser
0cdc32d213
adapt to the renames of the table classes in opm-parser
...
basically, "Opm::SimpleTable" becomes "Opm::SingleRecordTable".
2014-04-28 18:47:28 +02:00
Andreas Lauser
112e96d7e6
convert the examples and the tests to opm-parser
2014-04-25 14:25:54 +02:00
Andreas Lauser
eb656c60ec
add opm-parser variants for the incompressible property classes
2014-04-25 14:25:54 +02:00
Bård Skaflestad
97d1a36686
Merge pull request #581 from joakim-hove/GridManager-EclipseGrid-constructor
...
Grid manager eclipse grid constructor
2014-04-24 16:52:55 +02:00
Atgeirr Flø Rasmussen
320c3332ad
Add missing break statements in switch, add default case.
2014-04-24 15:43:54 +02:00
Joakim Hove
feeaeb1d2e
Changed the data files used for testing:
...
1) Added RUNSPEC section
2) Replaces DEPTHZ keyword with TOPS keyword.
2014-04-24 15:26:39 +02:00
Bård Skaflestad
29ae3ab836
Merge pull request #572 from andlaus/add_tabdims_to_some_decks
...
add the missing TABDIMS keyword to the live oil and wet gas unit test data files
2014-04-16 13:48:56 +02:00
Andreas Lauser
305e9d1448
add the missing TABDIMS keyword to the live oil and wet gas unit test data files
...
these are required for the new parser. (without them, these files
would be invalid AFAICT, but I'm not an Eclipse file format expert...)
2014-04-16 11:16:58 +02:00
Atgeirr Flø Rasmussen
be5af2378a
Change option name and generated header names.
2014-04-15 20:21:10 +02:00
Atgeirr Flø Rasmussen
883e955176
Merge branch 'suppress-warnings' into suppress-external-warnings
2014-04-15 19:49:19 +02:00
Atgeirr Flø Rasmussen
ba26696d22
Fix access to keywords, while still silencing warning.
...
Previous fix was wrong because it called getKeyword() outside the
hasKeyword() check. Current version (like original code) uses the
short-circuiting behaviour of && to ensure this.
2014-04-15 14:52:21 +02:00
Atgeirr Flø Rasmussen
bd4eef5a86
Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings
2014-04-15 14:35:01 +02:00
Atgeirr Flø Rasmussen
b225970686
Add (all-zero) initialisation of new EquilRecord fields.
2014-04-15 13:41:10 +02:00
Atgeirr Flø Rasmussen
cd0d48abbd
Avoid signed/unsigned warning.
2014-04-15 13:40:50 +02:00
Atgeirr Flø Rasmussen
645ff76a0b
Comment out unused function argument.
2014-04-15 13:40:15 +02:00
Atgeirr Flø Rasmussen
798ef0d070
Comment or add (void) usage of unused arguments.
2014-04-15 13:39:03 +02:00
Bård Skaflestad
d6d58d4045
Declare initBlackoilStateFromDeck(DeckConstPtr)
...
This was missing in commit 4c2120c and produced some build failures
that were hard to analyse. I'm not convinced that the underlying
problem is solved, but this does at least restore the build.
2014-04-10 00:51:28 +02:00
Markus Blatt
20faca397a
Added missing variant of initBlackoilStateFromDeck with new parser and without UG.
2014-04-09 14:34:04 +02:00
Markus Blatt
07ef14f181
Removed superfluous parameter cartdims from initStateFromDeck.
...
The parameter was unused and would cause trouble in initBlackoilStateFromDeck.
2014-04-09 14:33:35 +02:00