OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 17:32:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
592 Commits 31 Branches 117 Tags
98371f660f33718f2d58263f357b31b0bcc2edca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 98371f660f Fix mixture calculation for volatile oil case. 2014-01-23 12:40:54 +01:00
Atgeirr Flø Rasmussen ac6209640b Documented interface for SegmentedWellModel. 2014-01-22 13:55:22 +01:00
Atgeirr Flø Rasmussen aa5d9d255b Added a test program for SegmentedWellModel. 
The only currently tested case is a simple water injector.
 2014-01-22 12:56:08 +01:00
Atgeirr Flø Rasmussen ad81cc6a37 Initial version of segmented well model. 
This computes pressure differences with respect to the bottom-hole pressure
for each well perforation, based on the well flows. It is explicit and not
implicit, using the previous time step's flow rates to calculate the necessary
densities.
 2014-01-22 12:53:05 +01:00
Atgeirr Flø Rasmussen 671122e2e6 Merge pull request #65 from andlaus/implement_pc 
include capillary pressure in the PDEs
 2013-12-06 02:26:10 -08:00
Atgeirr Flø Rasmussen 96454a8496 Merge pull request #70 from andlaus/improve_doc 
make the phase-presence docstring understandable for mere mortals
 2013-12-04 03:47:25 -08:00
Atgeirr Flø Rasmussen 32c2bb43f4 Merge pull request #69 from bska/match-reference/properties 
Switch PVT Evaluators to Use Explicit External Condition Interface
 2013-12-04 00:51:06 -08:00
Atgeirr Flø Rasmussen fb458b71a0 Merge pull request #63 from bska/063_cmake 
Synchronise build system with opm-core
 2013-11-25 13:55:40 -08:00
Atgeirr Flø Rasmussen cd2ecc15a9 Merge pull request #62 from bska/062_cmake 
Synchronise build system with opm-core
 2013-11-25 05:52:05 -08:00
Atgeirr Flø Rasmussen fb672abee9 Merge pull request #61 from bska/061_cmake 
Synchronise build system with opm-core
 2013-11-25 03:52:32 -08:00
Atgeirr Flø Rasmussen 11c0982c18 Merge pull request #58 from bska/058_cmake 
Synchronise build system with opm-core
 2013-11-06 01:21:48 -08:00
Atgeirr Flø Rasmussen 478c87dd74 Reduce version to 0.9. 
Since there is a fair chance of interface adjustments after the release,
the version number cautions the user a little bit more than calling it 1.0.
 2013-10-25 14:56:54 +02:00
Atgeirr Flø Rasmussen 258d8e0e24 Avoid infinite loop with two constant operands. 2013-10-24 13:41:55 +02:00
Atgeirr Flø Rasmussen 1eec8b16d6 Fix bug in operator+ introduced by previous commit. 
Also make documentation clearer.
 2013-10-24 00:17:15 +02:00
Atgeirr Flø Rasmussen 46a17945a3 Fix minor whitespace issue. 2013-10-23 22:42:32 +02:00
Atgeirr Flø Rasmussen b996959c61 Add new AutoDiffBlock::constant() overload without block sizes. 
This should simplify some uses of the autodiff code. The internals
have been changed to allow for objects to have an empty vector of
Jacobians, always treating that object as a constant.
 2013-10-23 20:09:55 +02:00
Atgeirr Flø Rasmussen cdfeb8c69e Merge pull request #51 from bska/fix-exception-message 
Fix convergence failure exception message
 2013-10-22 02:14:48 -07:00
Atgeirr Flø Rasmussen cbd79ed2ad Merge pull request #48 from bska/048_cmake 
Synchronise build system with opm-core
 2013-10-21 06:51:56 -07:00
Atgeirr Flø Rasmussen f75f1d414f Bump version number and label. 
Set version number to 1.0 since core class AutoDiffBlock is quite well-tested
and documented. Prototype solvers and simulators may not yet warrant that
version number, but are stated to be experimental in the README.
 2013-10-21 14:44:52 +02:00
Atgeirr Flø Rasmussen f40271d96c Minimal fix for Eigen versions lacking pow(Eigen::Array). 2013-10-20 22:02:32 +02:00
Atgeirr Flø Rasmussen c6b1d204ba Merge pull request #43 from bska/043_cmake 
Synchronise build system with opm-core
 2013-10-09 01:29:43 -07:00
Atgeirr Flø Rasmussen 5afee4b993 Merge pull request #42 from bska/042_cmake 
Synchronise build system with opm-core
 2013-10-07 07:09:02 -07:00
Atgeirr Flø Rasmussen d382e70350 Merge pull request #41 from bska/041_cmake 
Synchronise build system with opm-core to restore debugging on MacOS X
 2013-10-07 00:11:39 -07:00
Atgeirr Flø Rasmussen e50033e3a2 Merge pull request #39 from atgeirr/master 
Fix boundary condition checking bug.
 2013-10-03 07:21:54 -07:00
Atgeirr Flø Rasmussen 79562ca3cc Fix boundary condition checking bug. 2013-10-03 16:19:21 +02:00
Atgeirr Flø Rasmussen cbcd82c5cf Merge pull request #37 from bska/Wunused 
Fix warnings about "unused" parameters and typedefs.
 2013-09-29 11:06:23 -07:00
Atgeirr Flø Rasmussen 9170ff69fd Updated to address points raised by bska. 2013-09-24 13:44:32 +02:00
Atgeirr Flø Rasmussen 240be9556c Expanded README.md, now similar to README in opm-core. 2013-09-24 13:12:41 +02:00
Atgeirr Flø Rasmussen cc58bc3cef Fix minor issues pointed out by bska. 2013-09-23 13:02:56 +02:00
Atgeirr Flø Rasmussen edd7e1487b Documented class FullyImplicitBlackoilSolver. 2013-09-20 14:55:43 +02:00
Atgeirr Flø Rasmussen cb892d6a18 Documented class DerivedGeology. 2013-09-20 14:55:24 +02:00
Atgeirr Flø Rasmussen 56e50f02fd Documented BlackoilPropsAdFromDeck. 2013-09-20 14:42:12 +02:00
Atgeirr Flø Rasmussen a10eb61b66 Require deck and remove simple source term in fully implicit sim. 2013-09-20 14:32:29 +02:00
Atgeirr Flø Rasmussen ad78cb8713 Document class BlackoilPropsAd. 2013-09-20 14:31:57 +02:00
Atgeirr Flø Rasmussen 9109dad0de Merge pull request #33 from totto82/bugfixes 
Bugfix
 2013-09-19 06:15:24 -07:00
Atgeirr Flø Rasmussen b203d01e18 Merge pull request #31 from totto82/buildstuff 
Added changes from PR #373 in opm-core to opm-autodiff
 2013-09-19 06:02:10 -07:00
Atgeirr Flø Rasmussen 9337a6227b Renamed misleading adfi -> fi. 
Some classes and a program were renamed since they were not fully implicit
solvers despite their names indicating it.
 2013-09-19 14:52:39 +02:00
Atgeirr Flø Rasmussen 0aa96af329 Documentation refinement. Added main doc file. 2013-09-19 14:45:40 +02:00
Atgeirr Flø Rasmussen 9a20c1ee02 Documented AutoDiffBlock. 2013-09-19 14:07:05 +02:00
Atgeirr Flø Rasmussen 85f79c0e84 Rename AutoDiff::ForwardBlock -> Opm::AutoDiffBlock. 
Also moved AutoDiffHelpers.hpp content to Opm namespace, and modified other
files as required by these two changes.
 2013-09-19 12:53:28 +02:00
Atgeirr Flø Rasmussen e9b933bf4f Rename AutoDiff::Forward -> Opm::AutoDiff. 2013-09-19 11:32:47 +02:00
Atgeirr Flø Rasmussen 86e9e04d2f Remove unnecessary include statement. 2013-09-19 11:32:29 +02:00
Atgeirr Flø Rasmussen a33f7e964b Let sim_2p_comp_ad throw if not given an input deck. 
There is some code in place now to create wells for the no-deck case,
but since it does not work correctly yet, the simulator intercepts this
and throws.
 2013-09-19 10:09:53 +02:00
Atgeirr Flø Rasmussen 6e2cdfc33f Add helpers grad, fullngrad, fulldiv. 2013-09-18 14:32:09 +02:00
Atgeirr Flø Rasmussen 4df5d7fb12 Merge pull request #9 from bska/master 
Unify indentation style in CMakeLists_file.txt
 2013-06-24 03:36:34 -07:00
Atgeirr Flø Rasmussen 77188fab95 Merge pull request #5 from atgeirr/master 
Add rock compressibility to fully implicit solver.
 2013-06-07 05:04:52 -07:00
Atgeirr Flø Rasmussen baf11ec591 Bugfix: perforation parts must be mapped to wells. 2013-06-07 14:03:17 +02:00
Atgeirr Flø Rasmussen 07027d3a09 Added rock compressibility to fully implicit solver. 2013-06-03 14:14:48 +02:00
Atgeirr Flø Rasmussen 20079f763a Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit 2013-06-03 09:01:17 +02:00
Atgeirr Flø Rasmussen 04eb340a3b Fix two bugs in solver. 
- Using x/x.abs() instead of a proper sign function led to problems
   when x = 0. Solved by using new sign() utility.
 - Pass pressure instead of rs as parameter to fluidRsMax().
 2013-06-03 00:33:05 +02:00
Atgeirr Flø Rasmussen 90f3886d20 Add sign() utility function. 2013-06-03 00:32:44 +02:00
Atgeirr Flø Rasmussen 0376cb0fff Initialize and update qs primary variable. 2013-06-02 23:50:21 +02:00
Atgeirr Flø Rasmussen b23e622a61 Remove accidentally added file. 2013-06-02 08:59:00 +02:00
Atgeirr Flø Rasmussen 765ce23c3e Work in progress on well flux equations. 2013-06-02 08:58:30 +02:00
Atgeirr Flø Rasmussen 74a5e10f7b Renames variables dtpv->pvdt and Rs->rs. 2013-06-02 08:19:21 +02:00
Atgeirr Flø Rasmussen adf291a30c Work in progress on well flux equations. 2013-06-02 08:17:13 +02:00
Atgeirr Flø Rasmussen 9a3bad000a Do not evaluate properties at well perforation pressures. 
Always use quantities derived from cell properties.
 2013-05-31 16:03:00 +02:00
Atgeirr Flø Rasmussen adbbebeeea Properly compute well pressure differentials. 
Properly here means using a simple algorithm like
in CompressibleTpfa and ImpesTPFAAD.
 2013-05-31 15:02:03 +02:00
Atgeirr Flø Rasmussen 514c48aa31 Use DUMP macro in useful places. 2013-05-31 15:01:28 +02:00
Atgeirr Flø Rasmussen d49be41cae Corrected fluidDensity() function to account for dissolved gas. 2013-05-31 14:59:56 +02:00
Atgeirr Flø Rasmussen 59e36f72b3 Add DUMP macro for debugging. 2013-05-31 14:59:24 +02:00
Atgeirr Flø Rasmussen 526b4d26e3 Actually initialize densities_ member. 2013-05-31 14:57:04 +02:00
Atgeirr Flø Rasmussen 932660a18c New updateState() method, changes to fluid interfaces. 
- updateState() is a new method that modifies the state object after solution,
   this was formerly done in solveJacobianSystem().
 - Implemented Appleyard chop (not verified yet) for handling variable switching.
 - Added rs as input to fluid interfaces to include rs-derivatives.
 2013-05-30 14:43:32 +02:00
Atgeirr Flø Rasmussen 62d0ad85b8 Use BlackoilPropsAdFromDeck in fully implicit simulator. 2013-05-27 22:28:17 +02:00
Atgeirr Flø Rasmussen e3f39504f4 Fixed error in include guard macros. 
Header file started life as a copy of another header, but include
guard macro was not changed. Time to go for #pragma once?
 2013-05-27 22:26:52 +02:00
Atgeirr Flø Rasmussen f26207d430 Fixes in BlackoilPropsAdFromDeck. Now compiles. 2013-05-27 22:01:20 +02:00
Atgeirr Flø Rasmussen 6f6979e173 Now initialize with new code (for gas-oil ratio). 2013-05-27 22:00:34 +02:00
Atgeirr Flø Rasmussen a6dba405dd Merge remote-tracking branch 'totto82/newfluid' into fully-implicit 2013-05-27 15:46:22 +02:00
Atgeirr Flø Rasmussen 2c206e0cd4 Finished initial attempt at miscibility support. 
Not yet tested. Also, no way to initialize gas-oil ratio yet.
 2013-05-27 11:32:35 +02:00
Atgeirr Flø Rasmussen cbb7b07496 Added method fluidRsMax(), added rs as a primary variable. 
Also increased amount of whitespace between methods for readability.
 2013-05-27 10:29:04 +02:00
Atgeirr Flø Rasmussen 5f4167d800 New interface methods rsMax() in BlackoilPropsAdInterface. 
Notes:
 - Interface was already present, just disabled.
 - Class BlackoilPropsAd cannot properly implement rsMax() with derivatives,
   and implements only a throw statement.
 2013-05-27 10:26:41 +02:00
Atgeirr Flø Rasmussen 78fa581417 Fix some bugs: referring to the wrong phase in two places. 2013-05-27 00:24:38 +02:00
Atgeirr Flø Rasmussen 09c4362e3c Added solveJacobianSystem() method, finished step(). 
Code is now functionally complete apart from lacking miscibility,
not writing to all promised output variables and not writing the
promised output to disk. Initial testing has been unsuccessful,
so there are bugs in the code.
 2013-05-26 11:49:44 +02:00
Atgeirr Flø Rasmussen 1d4af250ac Add well contributions to mass balance residuals. 2013-05-26 09:52:58 +02:00
Atgeirr Flø Rasmussen 8a740eeab4 Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit 2013-05-25 10:50:00 +02:00
Atgeirr Flø Rasmussen b88dfd6af2 Added assembly of well equations. 
This has not been tested.
Well contributions to mass balance equations are not done yet.
 2013-05-25 10:47:22 +02:00
Atgeirr Flø Rasmussen 2ebd58fad2 Added bhp as a primary variable. 
Changed interface of constantState() and variableState() to also
take a WellState as input. Some comments added with minor layout
changes.
 2013-05-24 23:20:15 +02:00
Atgeirr Flø Rasmussen dfbf8dd80e Commented the assemble() function. 2013-05-24 22:30:54 +02:00
Atgeirr Flø Rasmussen 9894fdc2d4 Renamed residual_.reservoir -> residual_.mass_balance. 
Also initialize in initializer list, eliminating the need for
the allocateResidual() method.
 2013-05-24 22:16:06 +02:00
Atgeirr Flø Rasmussen a3be33a312 Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit 2013-05-24 21:46:11 +02:00
Atgeirr Flø Rasmussen dc83ecb18e Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit 2013-05-24 21:11:41 +02:00
Atgeirr Flø Rasmussen 937df8869b Added unit test for Span class. 2013-05-24 16:07:51 +02:00
Atgeirr Flø Rasmussen cd42d4af34 Added missing dereference operator. 2013-05-24 16:07:27 +02:00
Atgeirr Flø Rasmussen fa02639dbf Use Span. 2013-05-24 15:38:31 +02:00
Atgeirr Flø Rasmussen 535a1fd272 Added Span. 2013-05-24 15:38:19 +02:00
Atgeirr Flø Rasmussen c569fb2a14 Created fully implicit simulator sim_fibo_ad. 2013-05-24 12:32:28 +02:00
Atgeirr Flø Rasmussen a94f1921dd Added simulator class for fully implicit blackoil. 2013-05-24 11:40:58 +02:00
Atgeirr Flø Rasmussen e367f08732 Moved implementation to .cpp file. 2013-05-24 11:14:05 +02:00
Atgeirr Flø Rasmussen 3d008c033d Class FullyImplicitBlackoilSolver is no longer a template. 2013-05-24 11:00:55 +02:00
Atgeirr Flø Rasmussen f916153747 Added (empty) implementation file. 2013-05-24 10:52:49 +02:00
Atgeirr Flø Rasmussen 57a3bd2113 Renamed ImplicitBOStep -> FullyImplicitBlackoilSolver. 2013-05-24 10:49:59 +02:00
Atgeirr Flø Rasmussen 6f55996441 Merge branch 'master' into fully-implicit 2013-05-24 10:40:35 +02:00
Atgeirr Flø Rasmussen 394a851b41 Clarify some variables' purposes. 2013-05-24 10:39:10 +02:00
Atgeirr Flø Rasmussen 9277e10552 Temporarily ignore viscosity derivatives. 2013-05-24 10:38:23 +02:00
Atgeirr Flø Rasmussen 8afdef61b6 Merge remote-tracking branch 'bska/master' 2013-05-24 09:06:50 +02:00
Atgeirr Flø Rasmussen 542b7eb03d Removed qs from the set of primary variables. 2013-05-24 08:14:43 +02:00
Atgeirr Flø Rasmussen 07fbdf7608 Fix initialization issue with gpot_. 2013-05-23 16:39:15 +02:00
Atgeirr Flø Rasmussen 70ebd21cfd Moved some calculations to computeExplicitData() method. 2013-05-23 15:08:21 +02:00
Atgeirr Flø Rasmussen e5bd6547ae Add gravity() method. 2013-05-23 14:48:34 +02:00
Atgeirr Flø Rasmussen d171f043e5 Added simulator class and program using ImpesTPFAAD. 
This copies similar code from opm-core and replaces
CompressibleTpfa with ImpesTPFAAD. Produces same results
for initial simple test cases.
 2013-05-22 22:53:40 +02:00