OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-09 07:53:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,112 Commits 24 Branches 102 Tags 87 MiB
725a29709e
Commit Graph

1112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
725a29709e Merge pull request #215 from bska/fix-build-gcc44 
Don't use 'typename' in non-template context
 2014-10-06 13:23:48 +02:00
Bård Skaflestad
9124b6f56b Don't use 'typename' in non-template context 
This fixes the build on GCC 4.4.

Pointy hat: @bska
 2014-10-06 12:33:08 +02:00
Bård Skaflestad
9b10f7827b Merge pull request #210 from atgeirr/dune-matrix-hack 
Add a horrible hack: DuneMatrix class.
 2014-10-06 11:43:05 +02:00
Bård Skaflestad
7ee66047b1 Merge pull request #214 from atgeirr/fix-pressure-usage 
Fix usage of result from computePressures().
 2014-10-06 11:16:07 +02:00
Atgeirr Flø Rasmussen
304e0a7bfc Remove unneeded template argument. 2014-10-06 11:08:44 +02:00
Atgeirr Flø Rasmussen
0186d95d0b Fix usage of result from computePressures(). 2014-10-06 10:55:53 +02:00
Atgeirr Flø Rasmussen
328477e521 Merge pull request #208 from qilicun/fvf_phase_pressure 
use phase pressure to compute FVF.
 2014-10-06 09:08:45 +02:00
Bård Skaflestad
3c97fa0d64 Merge pull request #212 from dr-robertk/master 
separat solver parameters
 2014-10-01 18:19:15 +02:00
Robert K
ce996c2a6c intialialize parameter with given param. 2014-10-01 13:04:23 +02:00
Robert K
21593cf7eb only initialize solver parameters once to avoid default parameter output. 2014-10-01 12:57:17 +02:00
Robert K
739be5a873 revert to upstream/master. 2014-10-01 12:54:30 +02:00
Robert K
23a12421a8 revert changes. 2014-10-01 12:50:46 +02:00
Robert K
2a33063966 added solver parameters to void reading in every step. 2014-10-01 12:48:41 +02:00
Robert K
b337873e7f First version of time step control. Not really fully functioning yet. 2014-09-30 15:53:43 +02:00
Atgeirr Flø Rasmussen
463e05a83d Obtain dune-istl version for config.h. 
Required by DuneMatrix.hpp.
 2014-09-30 13:46:01 +02:00
Atgeirr Flø Rasmussen
31197e268f Remove unused code. 2014-09-30 10:12:10 +02:00
Atgeirr Flø Rasmussen
e256be267c Compile fix for Dune 2.2. 
Some BCRSMatrix members are new in 2.3.
 2014-09-30 09:57:45 +02:00
Atgeirr Flø Rasmussen
1602fce6b9 Add DuneMatrix class. 
This is a hack to get a more efficient constructor for dune-istl
matrices from Eigen matrices.
 2014-09-26 15:03:59 +02:00
Andreas Lauser
7e472d66e6 Merge pull request #209 from atgeirr/improve-subset-superset 
Improve performance of subset() and superset().
 2014-09-25 14:22:30 +02:00
Atgeirr Flø Rasmussen
6c7061096a Improve performance of subset() and superset(). 
Using a different construction method for the sparse matrix
used makes the methods a little faster. There is probably
still room for improvement by refactoring to avoid the
sparse matrix products.
 2014-09-25 11:38:48 +02:00
Liu Ming
5657d32884 use phase pressure to compute FVF. 2014-09-25 14:34:04 +08:00
Atgeirr Flø Rasmussen
7fffc2c99a Merge pull request #207 from atgeirr/params-for-amg 
Add parameters controlling amg usage in cpr preconditioner.
 2014-09-23 22:46:02 +02:00
Atgeirr Flø Rasmussen
5d59a97972 Add parameters controlling amg usage in cpr preconditioner. 
New parameters are:
 - cpr_use_amg      (default false) if true, use AMG preconditioner for elliptic part
 - cpr_use_bicgstab (default true)  if true, use BiCGStab (else use CG) for elliptic part
 2014-09-22 10:10:11 +02:00
Atgeirr Flø Rasmussen
7874f177b6 Merge pull request #206 from atgeirr/disable-thirdparty-warnings 
Refactor disabling of third-party warnings
 2014-09-22 08:47:12 +02:00
Atgeirr Flø Rasmussen
25c9b36d4f Use new location of warning suppression header. 2014-09-20 10:39:34 +02:00
Atgeirr Flø Rasmussen
fa5d725bc3 Remove header generation, add define for warning suppression. 
Thanks to @akva2 for original patch.
 2014-09-20 10:39:34 +02:00
Atgeirr Flø Rasmussen
fe7e408e46 Merge pull request #204 from bska/fix-oob-pix 
Fix out-of-bounds indexing into PVT function table
 2014-09-20 08:45:26 +02:00
Joakim Hove
2a9f6e8d35 Merge pull request #203 from andlaus/table_improvements 
dapt the the table related API changes of opm-parser
 2014-09-19 15:27:35 +02:00
Atgeirr Flø Rasmussen
46eaf781be Merge pull request #199 from dr-robertk/master 
enabled DUNE-ISTL::AMG and DUNE-ISTL::CGSolver in CPRPreconditioner.
 2014-09-19 13:59:03 +02:00
Andreas Lauser
0f436e12c9 adapt the the table related API changes of opm-parser 2014-09-18 16:49:29 +02:00
Robert Kloefkorn
f299b5f5d0 apply nitpicks comments and avoid delete. 2014-09-18 15:11:50 +02:00
Robert Kloefkorn
f4129742a5 Merge remote-tracking branch 'upstream/master' 2014-09-18 14:56:50 +02:00
Bård Skaflestad
a0567cc887 Fix out-of-bounds indexing into PVT function table 
The 'props_' table of PVT functions has one entry for each active
phase.  Fix four instances of indexing into the table using the
canonical rather than active phase indices.

This is necessary, but not sufficient, to run two-phase problems
without a "dummy" third phase.
 2014-09-18 00:19:35 +02:00
Atgeirr Flø Rasmussen
042755bcf1 Merge pull request #200 from totto82/fix_updateState2 
Update oil saturation from changes in water and gas saturations
 2014-09-17 22:30:43 +02:00
Tor Harald Sandve
bde173a1d3 Add comments and change order for readability. 2014-09-10 14:31:51 +02:00
Tor Harald Sandve
bbf6d56000 Calculate oil saturation from changes in water and gas saturation 
First the change in oil saturation is calculated from changes in water
and oil saturation. Then oil saturation is updated based on this change
instead of just fixed to 1-sw-sg. With this change the oil saturation is
less sensitive towards numerical errors that may cause very small oil
saturations. Witch again may cause the simulator to think that the gas
phase is saturation with vaporized oil when it is not.
 2014-09-10 14:19:34 +02:00
Robert Kloefkorn
d46fbe6728 enabled DUNE-ISTL::AMG and DUNE-ISTL::CGSolver. 
The default is the same as before, i.e. DUNE-ISTL::ILU0 and DUNE-ISTL::BiCGSolver
for solving the elliptic problem.
 2014-09-04 17:06:00 +02:00
Atgeirr Flø Rasmussen
65ce6b4d22 Merge pull request #196 from totto82/bugfix_thpress 
Apply threshold pressure for all dp
 2014-09-04 15:26:19 +02:00
Atgeirr Flø Rasmussen
e597bbeca6 Merge pull request #193 from blattms/fix-176 
Makes distinction between functions more clear. (#176)
 2014-09-04 08:37:33 +02:00
Atgeirr Flø Rasmussen
3a575d1f84 Merge pull request #197 from andlaus/use_cpr 
sim_fibo_ad*: change the default for the use_cpr parameter from false to...
 2014-09-03 14:27:08 +02:00
Andreas Lauser
5f61781afd sim_fibo_ad*: change the default for the use_cpr parameter from false to true 
SPE9 and Norne are basically unusable if UMFPack is used as linear solver...
 2014-09-03 13:35:28 +02:00
Tor Harald Sandve
024fe9c7b6 Apply threshold pressure for all dp 
The threshold pressure is applied for all dp.
The sign of the threshold pressure is given by the sign of the dp.
 2014-09-03 11:05:14 +02:00
Atgeirr Flø Rasmussen
2d146b2a63 Merge pull request #195 from totto82/rs_rv_output 
Add output of RS and RV to outputStateMatlab
 2014-09-02 15:50:09 +02:00
Tor Harald Sandve
e4dc5c28b3 Add output of RS and RV to outputStateMatlab 2014-09-02 15:08:22 +02:00
Bård Skaflestad
be589ba5f3 Merge pull request #189 from atgeirr/add-minpv 
Add MINPV support to grid creation for fully implicit sims.
 2014-08-29 09:16:55 +02:00
Bård Skaflestad
d0b677920a Merge pull request #190 from atgeirr/threshold-pressure 
Threshold pressure
 2014-08-29 09:14:24 +02:00
Bård Skaflestad
de33d39f46 Merge pull request #191 from atgeirr/fix-warnings 
Suppress warnings of various kinds.
 2014-08-28 16:11:27 +02:00
Markus Blatt
7127101c1c Makes distinction between functions more clear. 
Currently, there are two abstract interface for the grids. One that
usually returns pods and arrays of them that also can be used by C
and is used also in opm-core, and one that returns Eigen datastructures
 needed within opm-autodiff.

This commit adds a postfix ToEigen to those functions (faceCells, and
cellCentroidsZ) one could imagine to also return pods and arrays of them.
This should at least resolve the confusion about the two faceCells functions.

The next step will be issue #192
Fixes #176
 2014-08-28 14:44:13 +02:00
Atgeirr Flø Rasmussen
971e01fdd7 Suppress warnings of various kinds. 2014-08-27 19:56:13 +02:00
Atgeirr Flø Rasmussen
6ba5068928 Make simulator programs actually obtain threshold pressures. 2014-08-27 18:23:11 +02:00