OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-30 13:03:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
442 Commits 24 Branches 101 Tags 75 MiB
b1d20aa83d
Commit Graph

442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
b1d20aa83d The water/gas pressures are only calculated if woc and goc lies within 
the reservoar
The water/gas pressure is set to -inf when woc and goc is above or below
the reservoar.
 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
480f5337b6 BUGFIX 
Wrong placement of parentes
 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
70dc519539 Implements initialization for constant capillary pressure functions 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
c61fb736fa Computes saturations based on depths 
For constant capillar pressure function the saturation is
    determined by cell depths:

    Sg_max, Sw_min
    ----- goc ----
    Sg_min, Sw_min
    ----- woc ----
    Sg_min, Sw_max
 2018-01-02 14:28:06 +01:00
osae
834669dff4 Included inititalisation of surface volumes. 2018-01-02 14:28:06 +01:00
osae
c4b5a7e302 Make use of EclipseState for EQLNUM and SWATINIT. 2018-01-02 14:28:06 +01:00
osae
f06659cd71 Adjustments for vanishing oil phase. 2018-01-02 14:28:06 +01:00
osae
10f5b07915 SWATINIT: Initialisation and capillary pressure scaling. 2018-01-02 14:28:06 +01:00
Andreas Lauser
897f64c21a 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.
 2018-01-02 14:28:06 +01:00
Andreas Lauser
68623918a7 Implement multi-region PVT for all property classes 
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
 2018-01-02 14:28:06 +01:00
Andreas Lauser
5194a1a782 rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2018-01-02 14:28:06 +01:00
Andreas Lauser
bd45d3e693 remove EclipseGridParser compatibility methods from all classes 2018-01-02 14:28:06 +01:00
osae
bc558f3818 Initialisation of EGLNUM (analogous to e.g SATNUM) 2018-01-02 14:28:06 +01:00
osae
6f3a03c072 Inserted some documentation. 2018-01-02 14:28:06 +01:00
osae
6a587ba8d9 Fix to make EQLNUM consistent with ACTNUM. 
This should eventually be integrated in the parser.
 2018-01-02 14:28:06 +01:00
Andreas Lauser
3bf249e1ab adapt to the renames of the table classes in opm-parser 
basically, "Opm::SimpleTable" becomes "Opm::SingleRecordTable".
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
c8d13d2a79 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.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
91dedb0eea Avoid signed/unsigned warning. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
65e435e139 Comment out unused function argument. 2018-01-02 14:28:06 +01:00
osae
7207b50721 Equil regions now internally indexed 0..(NTEQUL-1) 2018-01-02 14:28:06 +01:00
osae
1a30326e1a New parser included. 2018-01-02 14:28:06 +01:00
osae
abb8a63e6d Default equil region should be one not zero ... 
Otherwise problems when kw EQLNUM is used.
 2018-01-02 14:28:06 +01:00
osae
a2cd03197c 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.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
ad285d452c Bugfix in RsSatAtContact: use min(), not max(). 
Also modified test to match output.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
6ccc8d7bf8 Fix bug in RS initialisation. 
Also throw if default init is specified and datum != goc depth.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
bbcf7a5833 Remove debugging output. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
5aa1a0f999 Add computeRs() function and use from InitialStateComputer. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
a340781958 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.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
cd39c887f5 Added Rv field to InitialStateComputer. 
It is currently not computed, as for Rs.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
09e73f2dbd Moved implementation of phaseSaturations() to _impl file. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
02b1d21393 Refactor copying of region to global data. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
055769b8bd Rename PhasePressureSaturationComputer -> InitialStateComputer. 
Also add (unused so far) rs_ field to class.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
5c669614bf Added size() method to CellRange inner class. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
9569ea304f Enable live oil in initialisation. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
074dbbb599 Removed redundant calcPressII() method. 
Pressure is also calculated in the calcPressSat() method.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
319bbe5ca6 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.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
0d565d798f Made NoMixing a class. 
For uniformity with its sibling classes.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
406cfe578e Prune includes. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
e1dac5269b Moved equilibration utilities to separate file. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
e2913a178c Capitalize nested namespace names. 
equil -> Equil
miscibility -> Miscibility
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
f02270fbdc Move RegionMapping class to its own header, add test. 
Class now resides in opm/core/utility/RegionMapping.hpp.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
bbf2907f42 Added class RsSatAtContact (not tested). 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
9d2eed7e5a Fix bug in saturation initialisation. 
We shall only use gas-water capillary to initialise when we would get
unphysical saturations otherwise.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
0a8ae66046 Add saturation computation to and rename computer class. 
Opm::equil::DeckDependent::PhasePressureComputer ->
Opm::equil::DeckDependent::PhasePressureSaturationComputer
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
f8f9dc538a Fix bugs in saturation initialisation and helpers. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
66d5ccbd6c Add saturation init facilities. 
This adds the function phaseSaturations() and some helpers:
satFromPc() and satFromSumOfPcs().
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
b836f98788 Add (defaulted) gravity argument in some places. 
This is done to facilitate testing, using gravity = 10 m/s^2 for example.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
09a839f82b Throw exception if datum not in oil zone. 
We are not capable of handling this, and must abort.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen
8dfab5ab67 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.
 2018-01-02 14:28:06 +01:00
Bård Skaflestad
6c5ed7b8ff Add a layer of glue to extract data from deck 
This is a work in progress.
 2018-01-02 14:28:06 +01:00