OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,727 Commits 9 Branches 35 Tags
42bcb5f0c8c517d42800ec5800b7439c7e7bae6c
Commit Graph
268 Commits
Author SHA1 Message Date
Robert Kloefkorn 42bcb5f0c8 address Atgeirs comments. 2014-10-20 12:32:11 +02:00
Robert Kloefkorn f8e61c0267 also catch std::runtime_error, i.e. convergence of linear solver failed. 2014-10-14 15:18:36 +02:00
Robert Kloefkorn 164b892c17 added initial fraction to initialize last_timestep. 2014-10-13 11:17:37 +02:00
Robert Kloefkorn 44f90f974e Two small adjustments that came up when running in debug mode. 2014-10-10 13:55:28 +02:00
Robert Kloefkorn 80431e273f ok, now we got it. euclidianNormSquared. 2014-10-07 14:14:31 +02:00
Robert Kloefkorn ba316dd651 more convenient name. 2014-10-07 10:45:09 +02:00
Robert Kloefkorn b111fbbb15 innerProduct --> euclideanNorm2. 2014-10-07 10:40:44 +02:00
Robert Kloefkorn ef813c94cc inner_product --> innerProduct. Avoid confusion with std version. 2014-10-07 09:52:22 +02:00
Robert Kloefkorn b250383ae0 use unit::convert::to instead of hard coded 86400 factor. 2014-10-07 09:48:57 +02:00
Robert K 355e68c63b move implementation to .cpp files. 2014-10-06 14:26:23 +02:00
Robert K 5af49ed90b the adaptive time stepping utility classes. 2014-10-06 14:06:07 +02:00
Robert K 879dddc9b6 move protected area to the bottom and remove unused lines as well as halfTimeStep method. 2014-10-03 15:53:18 +02:00
Robert K e1d1063e0d remove white spaces. 2014-10-03 14:14:01 +02:00
Robert K 0ed28121a1 reset to old state. 2014-10-03 14:10:56 +02:00
Robert K e69c37167c renamed and split advance method. 2014-10-03 13:44:05 +02:00
Robert K c371d4fa22 class for handling adaptive time steps. 2014-10-03 13:33:13 +02:00
Robert K f6c9bc9090 improvement of the time step adjustment. 2014-10-02 14:04:32 +02:00
Robert K 92d5f43d82 sub step simulator timer. 2014-10-01 13:56:27 +02:00
Robert K 9517359d3f reset master. 2014-10-01 13:55:42 +02:00
Robert K d42d0a6cbe SubStepSimulationTimer for time step control. Needs documentation and cleanup. 2014-09-30 15:55:26 +02:00
Andreas Lauser bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Tor Harald Sandve a7ecde25ce Include goc and woc in the span for the phase pressure calculation 2014-09-02 14:49:09 +02:00
Tor Harald Sandve e44b045260 Remove fix for GOC and WOC above/below reservoir 2014-09-02 14:49:09 +02:00
Tor Harald Sandve 37e526a046 Fix sign error in the specified oil pressures at at WOC and GOC 
The oil pressure at the contact for the special cases:

contact	location	po(contact)
GOC 	above 	-inf
GOC 	below 	+inf
WOC 	above 	-inf
WOC 	below 	+inf
 2014-08-27 14:35:01 +02:00
Tor Harald Sandve 704e7dbb58 Currectly handling GOC below and WOC above the reservoir The phase pressure of water and gas is set to inf when WOC and GOC is above and below the reservoir. This make sure the minimum saturation values are picked for these cases. 2014-08-27 10:10:55 +02:00
Tor Harald Sandve b331c68fbc Fixes issues pointed out in the PR comments 2014-08-18 08:57:23 +02:00
Tor Harald Sandve 12b245df3d 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.
 2014-08-15 08:56:35 +02:00
Tor Harald Sandve 28d7380d40 BUGFIX 
Wrong placement of parentes
 2014-08-11 12:45:52 +02:00
Tor Harald Sandve 5051658a07 Implements initialization for constant capillary pressure functions 2014-08-11 11:23:15 +02:00
Tor Harald Sandve 4f862e759e 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
 2014-08-11 11:22:47 +02:00
Andreas Lauser 493650d2b1 EclipseWriter: Don't use the deck directly anymore 
instead, use Opm::EclipseState. This requires to pass the PhaseUsage
object to the EclipseWriter, as this one cannot be recovered from
EclipseState (yet?).
 2014-07-18 11:20:28 +02:00
Andreas Lauser dc5fc64e98 EclipseWriter: pass an EclipseState to it and use it where possible 2014-07-16 14:34:24 +02:00
osae 80463a2e40 Included inititalisation of surface volumes. 2014-06-26 15:06:47 +02:00
osae 89137e8cd0 Make use of EclipseState for EQLNUM and SWATINIT. 2014-06-26 14:46:57 +02:00
osae e3b06569e9 Adjustments for vanishing oil phase. 2014-06-25 18:03:17 +02:00
osae d3ee5dc20a SWATINIT: Initialisation and capillary pressure scaling. 2014-06-25 18:03:17 +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 f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 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
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
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
Atgeirr Flø Rasmussen bfd3246d33 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 6b2bc6c4d6 Avoid signed/unsigned warning. 2014-04-15 13:40:50 +02:00
Atgeirr Flø Rasmussen 3ec1e22f21 Comment out unused function argument. 2014-04-15 13:40:15 +02:00
Bård Skaflestad 18624766f2 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 4c2120c770 Added missing variant of initBlackoilStateFromDeck with new parser and without UG. 2014-04-09 14:34:04 +02:00
Markus Blatt 0dcd0351fc Removed superfluous parameter cartdims from initStateFromDeck. 
The parameter was unused and would cause trouble in initBlackoilStateFromDeck.
 2014-04-09 14:33:35 +02:00