Robert Kloefkorn
e3c898030c
[cleanup] ilu_iteration --> ilu_fillin_level.
2017-06-13 15:48:01 +02:00
Robert Kloefkorn
0b90b7863b
[cleanup[ use Dune::Amg::SequentialInformation instead of int.
2017-06-13 15:48:01 +02:00
Robert Kloefkorn
38300a4c9b
[cleanup] avoid over aggressive memory allocation in ILU.
2017-06-13 15:48:01 +02:00
Robert Kloefkorn
1fa04096c3
[bugfix] circumvent bug in dune-istl when matrix was assembled in
...
row_wise mode. Also cleanup of output.
2017-06-13 15:48:01 +02:00
Robert Kloefkorn
e4f1bf9955
[feature] make ILU relaxation and iteration a dynamic parameter.
2017-06-13 15:48:01 +02:00
Robert Kloefkorn
a774128fb7
[feature] Make ILU use CRS for storing lower and upper triangular matrices.
...
Then the backwards in memory iteration for the upper triangular can be
avoided by storing the matrix blocks in the correct order.
2017-06-13 15:48:01 +02:00
Atgeirr Flø Rasmussen
a064f1bae2
Merge pull request #1215 from atgeirr/transport-solver-bugfixes
...
Transport solver bugfixes
2017-06-13 14:26:35 +02:00
Atgeirr Flø Rasmussen
f37a72da71
Merge pull request #1209 from dr-robertk/PR/remove-uninitialized-vars
...
[cleanup] initialized Eval variables with 0.
2017-06-13 08:56:23 +02:00
Atgeirr Flø Rasmussen
e0570fc980
Fix issues for iterated sequential implicit.
2017-06-12 15:36:56 +02:00
Atgeirr Flø Rasmussen
e01eca28ca
Bugfix: avoid modification of flux data every iteration.
2017-06-12 15:36:48 +02:00
Arne Morten Kvarving
85e65415c5
fixed: constructor has been made explicit
2017-06-09 18:45:11 +02:00
Bård Skaflestad
1e0428d821
Merge pull request #1208 from atgeirr/refactor-sequential-solver
...
Refactor sequential solver
2017-06-09 15:10:11 +02:00
Atgeirr Flø Rasmussen
462d90aeb1
Merge pull request #1207 from GitPaean/improve_WellModelMatrixAdapter
...
making wellMod_ in WellModelMatrixAdapter is actually a well model
2017-06-09 10:46:13 +02:00
Robert Kloefkorn
ee7520d896
[cleanup] initialized Eval variables with 0.
2017-06-08 15:35:40 +02:00
Atgeirr Flø Rasmussen
fa4d4fb0fb
Make argument of setParameters() a const reference.
2017-06-08 11:03:27 +02:00
Atgeirr Flø Rasmussen
2f30897c70
Make proper convergence check for iterated sequentical implicit.
2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
fd36a122c6
Modifications to catch up with master branch.
2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
1a3c1d3058
Further templatized sequential model and simulator classes.
...
Now the actual pressure and transport model classes are not specified,
but taken as template template parameters, also grid and well model
are templates for both the sequential model and the simulator class,
although at this point only StandardWells is expected to work with
the sequential model.
2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
6e66d885fb
Pass 0 min_iter for pressure and transport solve.
2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
5290b000ef
Add setParameters(), return int from minIter(), maxIter().
2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
56597a9238
Merge pull request #1205 from atgeirr/tcpu-work
...
Implement TCPU
2017-06-08 09:08:51 +02:00
Atgeirr Flø Rasmussen
60985fdbeb
Merge pull request #1168 from nairr/term_output_mod
...
Logging of multiple problems/warnings
2017-06-07 15:47:34 +02:00
Rohith Nair
c1e76d6b51
edit
2017-06-07 14:49:00 +02:00
Rohith Nair
deaf90f211
edit
2017-06-07 14:47:45 +02:00
Rohith Nair
58285bb8f8
edit
2017-06-07 14:46:04 +02:00
Rohith Nair
348cb5e5a4
Changes made as requested
2017-06-07 14:40:18 +02:00
Kai Bao
908b2bdf81
making wellMod_ in WellModelMatrixAdapter is actually a well model
...
instead of the BlackoilModelEbos, which reduces some confusion and also
removes a few unnecessary wrapping functions.
2017-06-07 14:26:00 +02:00
Tor Harald Sandve
2a66aa23a9
Merge pull request #1198 from dr-robertk/PR/fix-densewell-for-2p
...
[bugfix] Fix invalid read in WellDenseStandard when used with 2P Model.
2017-06-07 13:57:44 +02:00
Rohith Nair
c12665e04f
-Added exception TooManyIterations
...
-Combined log messages from NonLinearSolver_impl.hpp and AdaptiveTimeStepping_impl.hpp
2017-06-07 10:37:25 +02:00
Atgeirr Flø Rasmussen
42aa343d9f
Write total solver time to TCPU.
2017-06-06 21:35:05 +02:00
Atgeirr Flø Rasmussen
2d0701c1e8
Include possibility for arbitrary summary data.
...
This adapts to the upstream API change in opm-data, and adds a
proof-of-concept dummy TCPU field.
2017-06-06 11:42:51 +02:00
Atgeirr Flø Rasmussen
b62d84f7b8
Logging flexibility improvements.
...
Added "all_messages_to_terminal" parameter (defaulting to false),
it true, all messages (including note and debug) will be sent to
the terminal.
In addition, parser messages are tagged, to make the terminal output
less likely to be overwhelmed.
2017-06-02 15:26:23 +02:00
Atgeirr Flø Rasmussen
efc553b175
Merge pull request #1203 from atgeirr/debug-time-report
...
Add DebugTimeReport utility.
2017-06-02 14:14:28 +02:00
Atgeirr Flø Rasmussen
5f66a8ff4f
Add DebugTimeReport utility.
2017-06-02 13:48:24 +02:00
Robert Kloefkorn
46f66e34b9
[bugfix] Only create asyncOutput when output is enabled globally.
2017-06-02 13:09:48 +02:00
Atgeirr Flø Rasmussen
c8e1f31f1d
Fix minor warning (returning a const double).
2017-06-02 11:17:37 +02:00
Atgeirr Flø Rasmussen
37cbdbced2
Merge pull request #1199 from atgeirr/multiphase-upwind-refactor
...
Multiphase upwind refactor
2017-06-02 11:13:14 +02:00
Atgeirr Flø Rasmussen
f5795322fa
Add missing include directive for std::sort().
2017-06-02 08:52:16 +02:00
Atgeirr Flø Rasmussen
7e8ed40714
Use free function for multi-phase upwinding.
2017-06-01 14:15:31 +02:00
Atgeirr Flø Rasmussen
80c38d5a1a
Add connectionMultiPhaseUpwind() free function.
2017-06-01 11:01:25 +02:00
Robert Kloefkorn
3db16ede73
[bugfix] Fix invalid read in WellDenseStandard when used with 2P Model.
2017-05-31 16:17:59 +02:00
Tor Harald Sandve
f671af6cd6
Clean-up of the solvent implementation
2017-05-30 14:33:17 +02:00
Tor Harald Sandve
8b75e2eedc
Minor fixes solvent model
...
1) Fix GRAT controlled wells
2) Fix seg_fault in computeWellPotentials for solvent simulations
3) Fix mem_issus for RESV combinded with solvent
2017-05-30 14:22:19 +02:00
Tor Harald Sandve
683ba7e929
Fix fallout from rebase
2017-05-30 14:22:19 +02:00
Tor Harald Sandve
441a8895ac
Improvments for solvent model
...
- add dss to appleyard chopping
- support for bhp injectors with solvent
- copy perfSolventRates between the time steps.
- fix bug in well access indicies when numComponents ~= numPhases
2017-05-30 14:22:19 +02:00
Tor Harald Sandve
50c1a1404a
Remove BlackoilSolventState
...
The solvent saturation is added to BlackoilState and the
BlackoilSolventState is thus redundant.
2017-05-30 14:22:19 +02:00
Tor Harald Sandve
b987e4b324
Implement solvent model in flow_ebos
...
1) Extends the well model to account for solvent surface volumes
2) Add solvent to updateState
3) Add solvent to well and field output
The solvent parts is encapsled in if (has_solvent_) and should not effect
the standard runs.
2017-05-30 14:22:19 +02:00
Markus Blatt
138eb2c91b
Merge pull request #1193 from dr-robertk/PR/fix-mpi-deadlock-in-output
...
Bugfix: fix MPI deadlock in output when asyncOutput is enabled.
2017-05-30 11:33:54 +02:00
Robert Kloefkorn
e46810d2dc
[bugfix] 1) create asyncOutput object on all ranks to avoid deadlock in
...
MPI_Bcast call in writeTimeStepWithCellProperties.
2) ThreadHandle waits on destruction until all objects have been dealt with.
2017-05-29 18:08:18 +02:00
Tor Harald Sandve
434f96db0a
FIX output the correct next timestep after convergece failure
2017-05-29 09:48:34 +02:00