OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-28 03:53:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
457 Commits 24 Branches 101 Tags 74 MiB
51cb4f2cb8
Commit Graph

457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alf Birger Rustad
16e92f9f7b Merge pull request #14 from akva2/eigen3_external 
added: download and build eigen3 from git if not found on system
 2013-07-09 04:41:54 -07:00
Andreas Lauser
7139f4addf do use eigen's umfpack support anymore 
use BiCGStab instead. it might be slower, but at least it is always
available...
 2013-07-09 13:33:57 +02:00
Bård Skaflestad
221a7261a8 Exclude examples/sim_simple.cpp if UMFPACK is unavailable 
Not all systems provide UMFPACK so even if Eigen provides the required
bindings, we should not assume that the underlying library and/or
headers are available.  Currently, only examples/sim_simple.cpp uses
UMFPACK unconditionally, so the simplest solution is to exclude that
example unless UMFPACK is available.
 2013-07-09 13:32:35 +02:00
Arne Morten Kvarving
d6563b298f added: download and build eigen3 from git if not found on system 2013-07-09 12:44:30 +02:00
Alf Birger Rustad
df2964729a Merge pull request #12 from bska/non-tr1 
Use the shared_ptr<> from Boost.
 2013-07-09 03:40:04 -07:00
Bård Skaflestad
a43fe760c1 Use the shared_ptr<> from Boost. 
Not all implementations support the TR1, and if they do, the type
might not be in a namespace called std::tr1 .  Favour the
implementation from Boost for reasons of portability.

This is inspired (and necessitated) by commit OPM/opm-core@68eb3fb
which, incidentally, cleaned up some header pollution on which we
inadvertently depended.
 2013-07-04 20:59:29 +02:00
Bård Skaflestad
f044d5189a Merge pull request #11 from rolk/011_eigen 
Set path to Eigen3 directory with -DEIGEN3_ROOT=
 2013-06-25 09:23:11 -07:00
Roland Kaufmann
6b9d1e2da5 Search common suffixes for include files 
This allows us to set e.g. -DEIGEN3_ROOT=/usr/local, and have the
files actually be located in /usr/local/include/eigen3
 2013-06-25 14:54:22 +02:00
Roland Kaufmann
eef87e48ad Use standard code to handle not found case 
Instead of setting EIGEN3_FOUND ourselves, rely on the standard method
to check arguments and raise an error if not found.
 2013-06-25 14:49:11 +02:00
Roland Kaufmann
05e516bb4a Allow mixed case name in variable (as for package) 
Since the package is named Eigen3 (in mixed case), we should allow
for the variable to be named this way, too.
 2013-06-25 14:49:11 +02:00
Roland Kaufmann
b446ac99e2 Allow user to specify path to Eigen3 library 
By setting EIGEN3_ROOT, we can point directly to the path of the
library checkout we want to use. No other searching will then take
place.

Notice that if you have found an Eigen3 installation in a previous
configure, it will not find a new version even if you introduce the
EIGEN3_ROOT variable!
 2013-06-25 14:49:11 +02:00
Roland Kaufmann
82c217d0e3 Require the newer 3.1 version of Eigen 2013-06-25 14:49:10 +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
Bård Skaflestad
3e2965a301 Indent file lists using <tab> rather than <space> 
This is the common convention throughout all OPM modules' CMake-based
build systems.
 2013-06-09 20:40:57 +02: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
Bård Skaflestad
b0c09f73be Merge pull request #4 from atgeirr/fully-implicit 
Fully implicit simulator
 2013-06-03 01:02:47 -07: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
Bård Skaflestad
8bab9f9ff8 Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit 2013-06-03 00:16:04 +02:00
Bård Skaflestad
a67ca87fd3 Encapsulate DUMP contents in "do { ... } while (0)" 
This makes the macro more function-like and easier to read.
 2013-06-03 00:15:40 +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
Bård Skaflestad
2606d94935 Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit 2013-05-31 16:07:12 +02:00
Bård Skaflestad
7a44eb8254 Remove blank lines at EOF 2013-05-31 16:07:03 +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
Bård Skaflestad
bac1a3a364 Add a couple of debugging aids to assist in FIBO development. 2013-05-30 18:43:11 +02:00
Bård Skaflestad
d23a1c3066 Coalesce two adjacent '!NDEBUG' sections into one. 2013-05-30 17:56:49 +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
Tor Harald Sandve
1cf1e3383b Add new interface to BlackoilPropsAdFromDeck 
-- not finished --
 2013-05-27 14:55:32 +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