Atgeirr Flø Rasmussen
e8db63dfb0
Fix initialization of tracer heads, and output ordering.
2014-06-25 09:56:37 +02:00
Atgeirr Flø Rasmussen
59d0ae185f
Refactor tracer computations.
...
Current version executes reordered solve once for each tracer. The benefit
is a simpler code and the ability to use MDU with tracers. The cost is
potentially higher runtime, compared to doing a single sweep for all
tracers (and tof).
2014-06-24 09:43:26 +02:00
Atgeirr Flø Rasmussen
11bea99bef
Remove unused data member.
2014-06-23 14:18:01 +02:00
Atgeirr Flø Rasmussen
4d2043a3ba
Clean up dead code for MDU, update comment.
2014-06-23 14:05:51 +02:00
Atgeirr Flø Rasmussen
cf36cbe6d1
Add tracers_ensure_unity parameter.
...
When this boolean parameter is true (the default), tracer solutions
will be normalized so that the tracer averages will sum to one in each cell.
This behaviour is the same as before, the change is that it can now be
turned off.
2014-06-23 14:03:49 +02:00
Atgeirr Flø Rasmussen
8dceb4b08c
Activate MDU option, making SMU method its default.
2014-06-23 11:29:14 +02:00
Atgeirr Flø Rasmussen
b3454a03b8
Fix bugs in MDU.
2014-06-23 11:23:16 +02:00
Atgeirr Flø Rasmussen
d498143488
Add computation of face tofs parts.
...
This must be done after the cell tof has been computed since they
depend on it.
2014-06-23 11:22:14 +02:00
Atgeirr Flø Rasmussen
57cb41217f
First compiling version of fixed MDU method.
2014-06-19 15:11:32 +02:00
Atgeirr Flø Rasmussen
1080e37fb0
Fix use of assert.
2014-06-16 13:44:00 +02:00
Atgeirr Flø Rasmussen
d788814259
Work in progress fixing multidim upwinding.
2014-06-16 13:14:42 +02:00
Atgeirr Flø Rasmussen
2b6fdc6259
Removed unused debugging output.
2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen
5e5b9e091d
Split method solveSingleCell() for easier maintenance.
2014-06-16 12:49:41 +02:00
Andreas Lauser
0c47d27827
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
6bac6159ee
Merge pull request #596 from andlaus/fix_some_keyword_names
...
Fix some keyword names
2014-06-10 23:14:34 +02:00
Andreas Lauser
31c97ca172
change item names used to query the PVCDO keyword
...
That's similar to having fun with a vodoo doll...
2014-06-06 13:18:57 +02:00
Andreas Lauser
80cb3265db
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
93f7a47062
add missing include
...
for some reason this seems to be only required by GCC 4.4
2014-06-05 14:32:58 +02:00
Andreas Lauser
126ca8043f
Eclipse does not have a PERM keyword
2014-06-05 08:36:53 +02:00
Andreas Lauser
8568f9f3f9
add an assert
2014-06-04 11:11:35 +02:00
Andreas Lauser
2545b423fc
handle the case that the compressed to logically cartesian array is NULL
2014-06-04 11:11:35 +02:00
Andreas Lauser
cbb5910a93
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
fbd8d42e8d
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
Andreas Lauser
c1c3f9d2e0
remove the table_t
type
...
that was an artifact only required for the old parser
2014-05-21 11:22:43 +02:00
Andreas Lauser
f96417e81c
rename all "newParserDeck" objects to "deck"
...
The "new" parser is now "the" parser...
2014-05-21 11:22:43 +02:00
Andreas Lauser
720acacad3
remove the EclipseGridParser class
...
RIP!
2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1
remove EclipseGridParser compatibility methods from all classes
2014-05-21 11:22:43 +02:00
Andreas Lauser
7c226478dd
Eclipse summary output: always convert the simulation time to days
...
this seems to have been forgotten in one place...
2014-05-16 11:50:32 +02:00
Atgeirr Flø Rasmussen
9690ccc978
Supress signed-unsigned comparison warning.
2014-05-12 09:18:52 +02:00
Atgeirr Flø Rasmussen
a681bcf869
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
f0069c7868
Removing a few bugs ...
2014-05-06 18:15:03 +02:00
osae
57b694f66a
Proper interpretation of ENDNUM and IMBNUM fields.
...
Made consistent with grid discretization.
2014-05-06 14:41:17 +02:00
osae
6cd46c5585
Initialisation of EGLNUM (analogous to e.g SATNUM)
2014-05-06 12:47:24 +02:00
osae
2beb0631b2
Inserted some documentation.
2014-05-05 11:27:10 +02:00
osae
c6a83df998
Fix to make EQLNUM consistent with ACTNUM.
...
This should eventually be integrated in the parser.
2014-05-05 11:23:43 +02:00
osae
7280ce2517
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
61a52eee2e
Reset gwseg as the model for endpoint scaling.
2014-05-05 10:33:04 +02:00
osae
7f04384b10
Make use of keywords SATOPTS and EHYSTR.
2014-05-05 10:33:04 +02:00
osae
003b37ad88
Use ENDNUM and prepare for IMBNUM.
2014-05-05 10:33:04 +02:00
osae
f7d2468d79
Added missing line (parser conversion).
2014-05-05 10:33:04 +02:00
Andreas Lauser
89f4a6db5b
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
7917295923
add opm-parser variants for the incompressible property classes
2014-04-25 14:25:54 +02:00
Andreas Lauser
6a90aa086a
CornerPointChopper: add methods opm-parser'y methods
2014-04-25 14:25:53 +02:00
Andreas Lauser
a313dd86d6
convert the EclipseGridInspector to opm-parser
...
that one is completely unused in opm-core (*booo*!), but used quite a
bit in dune-cornerpoint and dune-porsol, so let's keep it for now...
2014-04-25 14:25:53 +02:00
Bård Skaflestad
a97db3f157
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
c830211272
Add missing break statements in switch, add default case.
2014-04-24 15:43:54 +02:00
Joakim Hove
0c9212a605
ERT-601: Added GridManager() constructor which takes a Parser::EclipseGrid instance
2014-04-22 17:16:11 +02:00
Joakim Hove
b43b89063e
Renamed struct EclipseGrid -> struct EclipseWriterGrid to avoid conflict
...
with class in opm-parser.
2014-04-22 15:14:10 +02:00
Joakim Hove
8260d945fa
Added function grid_equal() to compare two UnstructuredGrid instances.
2014-04-22 15:13:54 +02:00
Atgeirr Flø Rasmussen
2a29deff1c
Change option name and generated header names.
2014-04-15 20:21:10 +02:00