Robert K
05608a6145
stick to previous method of parameter extraction. grouping is not what we wanted here.
2014-10-22 15:29:20 +02:00
Robert K
2a7f951e25
provide default for parameter group.
2014-10-22 15:00:10 +02:00
Robert Kloefkorn
937555bb3b
use group for timestep parameters.
2014-10-20 15:18:14 +02:00
Robert Kloefkorn
e68c58fb59
added linear to docu.
2014-10-20 14:47:45 +02:00
Robert Kloefkorn
42e4043c18
remove unused variable.
2014-10-20 14:47:33 +02:00
Robert Kloefkorn
fb32376d8f
throw exception when convergence failed, also in NewtonSolver.
2014-10-17 12:40:25 +02:00
Robert Kloefkorn
cd7b6ce7f0
remove blank at end of line.
2014-10-17 12:25:13 +02:00
Robert Kloefkorn
28bac5ebc9
Merge remote-tracking branch 'upstream/master' into timestepcontrol
2014-10-17 12:24:00 +02:00
Bård Skaflestad
55226c3b86
Merge pull request #220 from qilicun/fix_phase_idx
...
phaseIdx in this for statement is actual active phase index, should not active once again.
2014-10-11 11:14:16 +02:00
Liu Ming
b183fdfa6d
if all the phase are stagnate then stagnate will be true.
2014-10-11 13:46:24 +08:00
Joakim Hove
664120880a
Merge pull request #221 from andlaus/fix_pr213_fallout
...
fix the fallout caused by the slightly too premajure merge of PR #213
2014-10-10 16:51:13 +02:00
Andreas Lauser
4f44cde846
fix the fallout caused by the slightly too premature merge of PR #213
...
I should have put some message at the end of that PR when the API of
opm-parser changed...
2014-10-10 16:17:41 +02:00
Joakim Hove
68cf022a9d
Merge pull request #213 from andlaus/print_parser_log
...
sim_fibo_ad*: print the log messages from the parser/EclipseState
2014-10-10 15:40:56 +02:00
Liu Ming
5b28b38056
make the for statement more readable.
2014-10-10 17:01:05 +08:00
Liu Ming
66bb1fae8f
phaseIdx in this for statement is actual active phase index, should not
...
active once again.
2014-10-10 16:21:29 +08:00
Robert Kloefkorn
c9859f6293
Merge remote-tracking branch 'upstream/master' into timestepcontrol
2014-10-09 15:45:43 +02:00
Atgeirr Flø Rasmussen
585ab6da52
Merge pull request #218 from dr-robertk/dunematrix
...
Dunematrix uses wrong allocation.
2014-10-09 14:36:36 +02:00
Robert Kloefkorn
9f58ad5476
bugfix, Mismatched free() / delete / delete [] in DuneMatrix due to use of new instead
...
of the matrix internal allocators.
This fix also avoid the copying of the BCRSMatrix by providing a contructor that creates
the DuneMatrix for a given Eigen SparseMatrix.
2014-10-09 14:06:02 +02:00
Robert Kloefkorn
ed75a02ac0
Merge remote-tracking branch 'upstream/master'
2014-10-09 14:03:42 +02:00
Robert Kloefkorn
62cefb3a3e
print warning when off-diagonal element is found in Schur complement instead of OPM_THROW.
2014-10-07 10:00:38 +02:00
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
Andreas Lauser
b4f9a49bd6
fixup! sim_fibo_ad*: print the log messages from the parser/EclipseState
2014-10-06 10:12:57 +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
Andreas Lauser
566c7c03d7
sim_fibo_ad*: print the log messages from the parser/EclipseState
2014-10-03 15:53:57 +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
