OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
662 Commits 31 Branches 117 Tags
3185e8662b7b74fd71c8890a87a4065536e6d85e
Commit Graph
48 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 118e3f6dac Restore const-ness accidentally lost. 2018-07-31 15:35:15 +02:00
Atgeirr Flø Rasmussen a63aac0491 Merge pull request #352 from andlaus/ebos_allow_no_fip 
ebos: add possibility to disable the FIP output even if requested in the deck
 2018-07-31 11:32:15 +02:00
Atgeirr Flø Rasmussen ad6645b8d3 Merge pull request #336 from andlaus/fix_extra_warnings 
fix extra compiler warnings
 2018-07-05 14:29:59 +02:00
Atgeirr Flø Rasmussen aaf885098d Merge pull request #288 from totto82/fix_restart_norne 
Fix restart norne
 2018-02-21 11:32:55 +01:00
Atgeirr Flø Rasmussen 875aafe0f9 Merge pull request #289 from totto82/fix_default_output_dir 
Fix default output directory
 2018-02-19 17:04:41 +01:00
Atgeirr Flø Rasmussen 39793ec932 Adapt to moved opm-grid headers. 2018-02-12 10:20:09 +01:00
Atgeirr Flø Rasmussen 2d9285dbab Merge pull request #269 from totto82/addPBDVandPDDV 
Add support for PBDV and PDDV in initstateequil.hh
 2018-01-09 11:40:34 +01:00
Atgeirr Flø Rasmussen 546759f775 Bugfix: type for target capillary pressure. 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen db9ccebb17 Increase max iterations for capillary curve inversion. 
Triggered by a new two-phase case.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen bc4116fd39 Fix unneeded-internal-declaration warning. 
Again related to anonymous namespace function only being used
in template functions.
 2018-01-02 14:28:06 +01:00
Atgeirr Flø Rasmussen 733061c943 Silence unused argument warning. 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
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
Atgeirr Flø Rasmussen 6a5c6ea227 Merge pull request #241 from totto82/removeInitDupl 
Prepare for using the initial solution from ebos directly
 2017-12-05 08:44:29 +01:00
Atgeirr Flø Rasmussen 30aa70c9b6 Merge pull request #153 from andlaus/improve_EQLDIMS_access 
ebos: no longer fail if the EQLDIMS keyword is not explicitly mentioned in the deck
 2017-02-14 09:54:52 +01:00
Atgeirr Flø Rasmussen 0c8355d2ad Merge pull request #122 from totto82/swatInitFix 
Pass enableSwatinit to the OPM initialization
 2017-01-06 10:24:11 +01:00
Atgeirr Flø Rasmussen 3d9f1af26b Silence release mode unused argument warnings. 2016-12-30 10:12:08 +01:00
Atgeirr Flø Rasmussen f7ef4c9724 Avoid shadowing warning, and simplify using transform(). 
Minor detail: will use ::toupper() rather than std::toupper() overloads,
only a problem if underlying character type of string type changes.
 2016-12-30 10:06:11 +01:00
Atgeirr Flø Rasmussen 818e0d6faa Remove unused function argument. 2016-12-30 10:05:11 +01:00
Atgeirr Flø Rasmussen 5724244b4f Silence unused argument warnings with OPM_UNUSED. 2016-12-30 10:03:14 +01:00
Atgeirr Flø Rasmussen b5951a6ec7 Renaming dune-cornerpoint -> opm-grid. 2016-04-04 21:20:50 +02:00