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
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
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
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
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
Markus Blatt
ab5e011f34
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Manually resolved conflicts in:
opm/core/io/eclipse/EclipseWriter.cpp
opm/core/io/eclipse/EclipseWriter.hpp
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
2014-04-08 21:50:00 +02:00
osae
3de80989a2
Equil regions now internally indexed 0..(NTEQUL-1)
2014-03-31 16:16:45 +02:00
osae
b86fa0af86
New parser included.
2014-03-28 17:35:43 +01:00
osae
b485d03711
Default equil region should be one not zero ...
...
Otherwise problems when kw EQLNUM is used.
2014-03-28 17:18:50 +01:00
Markus Blatt
c282949400
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Manually resolved conflicts:
opm/core/io/eclipse/EclipseWriter.cpp
opm/core/io/eclipse/EclipseWriter.hpp
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/simulator/initState_impl.hpp
opm/core/wells/WellsManager.cpp
opm/core/wells/WellsManager.hpp
2014-03-27 15:27:11 +01:00
osae
e1d2fa2088
Some adjustments to equil initialisation.
...
- Saturations, phase pressures, and standard initialsation of RS and RV
now agree to baseline.
- Tables of RS and RV versus vertical depth (kw RSVD RVVD) have been
hardcoded for testing (need new parser) and the calculations agree to
baseline in the gas and oil zones. In the water zone there is some
differences: Our code computes saturated RS and RV using the final
phase pressures (these are modified to be consistent with saturations
and capillary pressures) while the baseline uses unmodified phase pressures.
2014-03-26 14:53:47 +01:00
osae
5d028d4eca
Merge branch 'master' of git://github.com/OPM/opm-core
...
Conflicts:
CMakeLists_files.cmake
2014-03-26 14:51:06 +01:00
Bård Skaflestad
957ad787ad
Merge pull request #508 from atgeirr/adjust-initial-wellrates
...
Adjustment to well rate initialisation.
2014-03-15 14:59:27 +01:00
Atgeirr Flø Rasmussen
a13f7b990f
Fix logic related to open/shut wells initialisation.
2014-03-14 11:27:20 +01:00
Andreas Lauser
0b3217fe6f
initStateFromDeck(): do not accept potentially contradicting ways to set the initial condition
...
i.e. PRESSURE and EQUIL are now considered mutually exclusive...
2014-03-13 16:33:32 +01:00
Markus Blatt
bb7b709312
Make initStateFromDeck with the new parser deck usable again.
...
My last merge broke compilation of opm-autodiff, as this new function
still relied on the old behaviour (the one taking a grid instead of
the data directly). This patch moved initStateFromDeck to the new behaviour.
2014-03-13 15:59:37 +01:00
Markus Blatt
c6daebc35d
Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support
...
Manually resolved conflicts in:
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/wells/WellsManager.cpp
2014-03-13 13:41:45 +01:00
Atgeirr Flø Rasmussen
c0fd117103
Bugfix: || -> &&
2014-03-11 12:54:04 +01:00
Atgeirr Flø Rasmussen
a592a23153
Assert to avoid future surprises.
...
Well types must be either INJECTOR or PRODUCER for now, if
we change this in the future, we should check this part of
the code as well.
2014-03-11 12:51:49 +01:00
Atgeirr Flø Rasmussen
db6a36d1fd
Commented choices in initialisation of well rates.
2014-03-11 12:50:58 +01:00
Atgeirr Flø Rasmussen
c0ddb9707e
Initialize well rates better.
...
Instead of making well rates zero for wells that are not controlled by
surface volume, we initialize them to a small value with the correct
sign (positive for injectors, negative for producers).
2014-03-10 13:30:43 +01:00
Joakim Hove
8be1f0e8d3
Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status
2014-03-04 20:23:19 +01:00
Atgeirr Flø Rasmussen
d13bf03e1f
Bugfix in RsSatAtContact: use min(), not max().
...
Also modified test to match output.
2014-02-27 14:57:38 +01:00
Atgeirr Flø Rasmussen
1c9675605c
Fix bug in RS initialisation.
...
Also throw if default init is specified and datum != goc depth.
2014-02-27 14:48:14 +01:00
Atgeirr Flø Rasmussen
1b3cac2433
Remove debugging output.
2014-02-27 13:27:07 +01:00
Atgeirr Flø Rasmussen
af9c1fc4cc
Add computeRs() function and use from InitialStateComputer.
2014-02-27 13:14:48 +01:00
Atgeirr Flø Rasmussen
f84162bc39
Add initStateEquil() function.
...
It is not quite complete yet for the following reasons:
- it does not compute state.surfacevol(),
- the InitialStateComputer class does not compute Rs or Rv,
- it has not been verified.
2014-02-27 10:40:14 +01:00
Atgeirr Flø Rasmussen
4aaeff0078
Added Rv field to InitialStateComputer.
...
It is currently not computed, as for Rs.
2014-02-27 10:39:18 +01:00
Atgeirr Flø Rasmussen
0fbc3a1ccb
Moved implementation of phaseSaturations() to _impl file.
2014-02-27 09:37:48 +01:00
Atgeirr Flø Rasmussen
a1192c09dc
Refactor copying of region to global data.
2014-02-27 09:31:48 +01:00
Atgeirr Flø Rasmussen
a7c45d4e9f
Rename PhasePressureSaturationComputer -> InitialStateComputer.
...
Also add (unused so far) rs_ field to class.
2014-02-27 09:08:39 +01:00
Atgeirr Flø Rasmussen
27743b4a13
Enable live oil in initialisation.
2014-02-27 08:31:03 +01:00
Atgeirr Flø Rasmussen
d5ffcc051c
Removed redundant calcPressII() method.
...
Pressure is also calculated in the calcPressSat() method.
2014-02-26 14:49:06 +01:00
Atgeirr Flø Rasmussen
38c89f363d
Made phase mixing functors a class hierarchy.
...
In summary:
- added RsFunction (base class),
- made NoMixing, RsVD, RsSatAtContact inherit RsFunction,
- RS and RV are no longer template arguments for EquilReg class,
- EquilReg constructor now takes two shared_ptr<Miscibility::RsFunction>,
- use of constructor updated, mostly using make_shared.
2014-02-26 14:47:24 +01:00
Atgeirr Flø Rasmussen
8266c52d99
Made NoMixing a class.
...
For uniformity with its sibling classes.
2014-02-26 14:16:51 +01:00
Markus Blatt
e30031dc77
Added missing namespace qualifiers.
2014-02-25 15:10:46 +01:00
Markus Blatt
c7e20e5eb3
Fixed unused parameter warning in initBlackoilStateFromDeck.
2014-02-25 15:10:18 +01:00
Atgeirr Flø Rasmussen
74573947bb
Prune includes.
2014-02-24 16:11:50 +01:00
Atgeirr Flø Rasmussen
7e0bd62205
Moved equilibration utilities to separate file.
2014-02-24 16:09:04 +01:00
Atgeirr Flø Rasmussen
64b6a40191
Capitalize nested namespace names.
...
equil -> Equil
miscibility -> Miscibility
2014-02-24 15:55:14 +01:00
Atgeirr Flø Rasmussen
2b0fcfe748
Move RegionMapping class to its own header, add test.
...
Class now resides in opm/core/utility/RegionMapping.hpp.
2014-02-24 15:19:04 +01:00
Atgeirr Flø Rasmussen
c689bc757f
Added class RsSatAtContact (not tested).
2014-02-24 13:47:03 +01:00
Atgeirr Flø Rasmussen
6c8babc7d2
Fix bug in saturation initialisation.
...
We shall only use gas-water capillary to initialise when we would get
unphysical saturations otherwise.
2014-02-21 14:47:14 +01:00
Atgeirr Flø Rasmussen
b2be489e6e
Add saturation computation to and rename computer class.
...
Opm::equil::DeckDependent::PhasePressureComputer ->
Opm::equil::DeckDependent::PhasePressureSaturationComputer
2014-02-21 08:52:25 +01:00
Atgeirr Flø Rasmussen
e1069cf39b
Fix bugs in saturation initialisation and helpers.
2014-02-20 15:24:27 +01:00
Markus Blatt
21864388bd
Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support
...
Resolved Conflicts:
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/props/rock/RockFromDeck.hpp
opm/core/props/satfunc/SaturationPropsFromDeck.hpp
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
2014-02-19 15:22:18 +01:00