Bård Skaflestad
59eedcd82b
Initialise saturation points for Pc scaling
...
This gives predictable failure modes although the actual behaviour
is (probably) unchanged.
2014-08-07 18:50:06 +02:00
Bård Skaflestad
d067ef07a2
Consistently refer to BlackoilPhases::Aqua
...
This avoids confusion.
2014-08-07 18:50:06 +02:00
Bård Skaflestad
2229affcb0
Don't use variable-length arrays
...
We only support up to 'BlackoilPhases::MaxNumPhases' different
phases (and components), so there's no need to pretend otherwise.
2014-08-07 18:50:06 +02:00
Atgeirr Flø Rasmussen
070f2456c4
Properly handle defaulted well reference depths.
2014-08-07 12:57:05 +02:00
Atgeirr Flø Rasmussen
12c9ef2b09
Merge pull request #607 from osae/swatinit
...
Scaling of capillary pressure / initialisation from kw SWATINIT.
2014-07-07 14:10:02 +02:00
Bård Skaflestad
3a6ac6a759
Reimplement clone_wells() in terms of well_controls_clone()
2014-07-03 16:09:56 +02:00
Bård Skaflestad
81d691e66a
wells.h: Document several function
...
This commit adds Doxygen-style documentation to functions
- clear_well_controls()
- set_current_control()
- wells_equal()
No functional changes.
2014-07-03 16:09:56 +02:00
Bård Skaflestad
033625c5a8
well_controls: Add deep-copy (clone) support
...
New function well_controls_clone(), implemented in terms of the
public API only, mirrors the objective of function clone_wells(),
only for well control sets. Add a basic test to demonstrate the
function too.
2014-07-03 16:09:56 +02:00
Bård Skaflestad
24804a1f6f
clone_wells(): Assert result equal to input
...
This adds a debug-mode safety belt that cloning wells produces a
comparable set of wells to the input.
2014-07-03 16:09:56 +02:00
Bård Skaflestad
464b0c3d15
well_controls_equal(): Don't compare set capacities
...
The 'cpty' field is for internal memory management purposes only.
No client can know of its existence, let alone inspect or directly
change the value, so it should not be used to adjudicate control set
equality. This was useful during the refactoring work to introduce
the opm-parser support, but its utility has since ceased.
Okay'ed by: [at] atgeirr and [at] joakim-hove
2014-07-03 16:09:56 +02:00
osae
b22d3bdbf1
Included inititalisation of surface volumes.
2014-06-26 15:06:47 +02:00
osae
c1732b0b32
Make use of EclipseState for EQLNUM and SWATINIT.
2014-06-26 14:46:57 +02:00
osae
7c667a2bd7
Adjustments for vanishing oil phase.
2014-06-25 18:03:17 +02:00
osae
a9138ef574
SWATINIT: Initialisation and capillary pressure scaling.
2014-06-25 18:03:17 +02:00
osae
45e35178bb
Scaling of capillary pressure.
2014-06-25 18:03:17 +02:00
Atgeirr Flø Rasmussen
fd606d907a
Fix initialization of tracer heads, and output ordering.
2014-06-25 09:56:37 +02:00
Atgeirr Flø Rasmussen
3290c41f3a
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
23400d7e2e
Remove unused data member.
2014-06-23 14:18:01 +02:00
Atgeirr Flø Rasmussen
63d7b868d0
Clean up dead code for MDU, update comment.
2014-06-23 14:05:51 +02:00
Atgeirr Flø Rasmussen
41887508ea
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
631498bd06
Activate MDU option, making SMU method its default.
2014-06-23 11:29:14 +02:00
Atgeirr Flø Rasmussen
1a59e7360b
Fix bugs in MDU.
2014-06-23 11:23:16 +02:00
Atgeirr Flø Rasmussen
ae1236c5cd
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
bd1bb1099f
First compiling version of fixed MDU method.
2014-06-19 15:11:32 +02:00
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
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
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
Bård Skaflestad
Atgeirr Flø Rasmussen
osae
Andreas Lauser