Robert K
c2e6b368ae
revert Schur fix.
2014-10-06 15:59:01 +02:00
Robert K
a8c0f7df92
apply changes made in opm-core.
2014-10-06 15:53:17 +02:00
Robert K
c42eeffdeb
remove unused output
2014-10-06 14:27:55 +02:00
Robert K
d4802121d3
moved the utility classes to opm-core.
2014-10-06 13:59:21 +02:00
Robert K
faf191b9f1
Merge remote-tracking branch 'upstream/master' into timestepcontrol
2014-10-06 13:58:54 +02:00
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
Robert K
2295718f59
enabled solver restart again.
2014-10-03 16:01:59 +02:00
Robert K
9e9ef0155c
moved TimeStepControl to Simulator::run and make it work again.
2014-10-03 14:31:57 +02:00
Robert K
a723a01f72
some revision, time step control is now completly in the Simulator run method.
...
The solver simply returns a number of iterations.
2014-10-03 14:18:31 +02:00
Robert K
fcf6cd5f90
implemented the PID controler, seems to work fine. More testing needed.
2014-10-02 14:04:59 +02:00
Robert K
c88a2d04d1
Merge remote-tracking branch 'upstream/master' into timestepcontrol
2014-10-02 09:51:42 +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
d3bc836536
make sub stepping a parameter.
2014-10-01 16:36:38 +02:00
Robert K
2602ae7baf
enable substepping.
2014-10-01 15:45:27 +02:00
Robert K
f535761a17
only warn when non-diagonal block is found.
2014-10-01 15:45:11 +02:00
Robert K
d03f9411b6
first attempt to implement a time step control.
2014-10-01 13:50:08 +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
