Atgeirr Flø Rasmussen
2d4c10d919
Silence unused argument warning.
2015-09-17 14:56:59 +02:00
Atgeirr Flø Rasmussen
e49f852b98
Merge pull request #477 from dr-robertk/PR/terminal-output-in-parallel
...
SolverFullyImpl: avoid multiple output of redundant information in parallel.
2015-09-16 18:43:45 +02:00
Atgeirr Flø Rasmussen
57840a3153
Merge pull request #479 from akva2/fix_sibling_builds
...
fixed: make sure opm-common can be (re-)found
2015-09-16 16:30:56 +02:00
Robert Kloefkorn
e8fad08d81
ParallelDebugOutput: workaround for ancient gcc bug.
2015-09-16 14:59:37 +02:00
Robert Kloefkorn
c32749b129
SolverFullyImpl: avoid multiple output of redundant information in parallel.
2015-09-16 14:36:28 +02:00
Arne Morten Kvarving
1ac43da951
fixed: make sure opm-common can be (re-)found
...
see https://github.com/OPM/opm-common/issues/40#issuecomment-140720316
2015-09-16 14:22:24 +02:00
Atgeirr Flø Rasmussen
55f8ebacfc
Merge pull request #476 from dr-robertk/PR/ParallelDebugOutput
...
Pr/parallel debug output fixes
2015-09-16 13:25:49 +02:00
Robert Kloefkorn
a807aceb26
Merge remote-tracking branch 'upstream/master' into PR/ParallelDebugOutput
2015-09-16 13:10:46 +02:00
Robert Kloefkorn
c3568a64d6
BlackoilOutput: make matlab output work in parallel.
2015-09-16 13:05:23 +02:00
Robert Kloefkorn
0696dbc1bb
ParallelDebugOutput: remove warnings due to unused variables.
2015-09-16 13:05:00 +02:00
Atgeirr Flø Rasmussen
35136f5f6a
Merge pull request #471 from dr-robertk/PR/ParallelDebugOutput
...
ParallelDebugOutput: make the output in ecl format work in parallel.
2015-09-16 12:48:49 +02:00
Robert Kloefkorn
591a6e86fe
flow_solvent: create BlackoilWriter after grid has been partitioned.
2015-09-16 12:40:41 +02:00
Robert Kloefkorn
dd4f362aa4
WellStateFullyImplicitBlackoil: call init of base class first.
2015-09-16 12:40:14 +02:00
Robert Kloefkorn
7c175a816a
Output: only create ParallelDebugOutput when output is enabled in general.
2015-09-16 09:48:22 +02:00
Robert Kloefkorn
326faa99d7
ParallelDebugOutput: make the output in ecl format work in parallel by communicating
...
to an io rank and then proceed with serial output.
2015-09-16 09:48:22 +02:00
Atgeirr Flø Rasmussen
9a0f0a944c
Merge pull request #463 from bska/active-regions
...
Chase API update of opm-core's RegionMapping
2015-09-16 09:04:48 +02:00
Bård Skaflestad
a94fe3ed4f
Chase API update of opm-core's RegionMapping
...
In the process, generalise the notion of region properties. We
introduce a new helper class
Details::RegionAttributes<RegionId, Attributes>
that provides lookup from a RegionId, typically an int, to a
user-defined set of Attributes--in this case pressure and
temperature.
While here, mark 'SurfaceToReservoirVoidage::calcCoeff()' as 'const'
because it doesn't need to modify any internal state and refactor
the implementation to eliminate repeated calculations of
ADB::constant(X)
2015-09-14 19:21:54 +02:00
Bård Skaflestad
d43b259886
Merge pull request #469 from atgeirr/silence-warnings
...
Silence some more warnings.
2015-09-14 19:18:06 +02:00
Atgeirr Flø Rasmussen
85993f4eb0
Silence some more warnings.
2015-09-14 17:23:20 +02:00
Bård Skaflestad
8517fd29a6
Merge pull request #468 from atgeirr/remove-args
...
Update for removed constructor args.
2015-09-14 17:07:54 +02:00
Atgeirr Flø Rasmussen
23c28201a5
Update for changes in SaturationPropsFromDeck.
2015-09-14 15:05:32 +02:00
Atgeirr Flø Rasmussen
62d633a8ff
Update for removed constructor args.
2015-09-14 10:32:07 +02:00
Atgeirr Flø Rasmussen
c19df37af5
Merge pull request #466 from blattms/fix-MatrixBlockError-on-some-processes
...
Introduces parallel exception handling for ILU0 preconditioner.
2015-09-14 08:19:03 +02:00
Atgeirr Flø Rasmussen
6474e22c7e
Merge pull request #465 from akva2/rename_common
...
changed: sync with renaming to opm-common
2015-09-09 11:37:22 +02:00
Markus Blatt
32b8ed654e
Prevent memory leaks in case SeqILU0 throws an exception.
2015-09-08 14:38:29 +02:00
Arne Morten Kvarving
5a9bf34e7e
Merge pull request #1 from andlaus/dunecontrol_compatibility
...
restore dunecontrol compatibility after the opm-cmake -> opm-common rename
2015-09-08 12:10:29 +02:00
Markus Blatt
3c1498ce92
Only construct SeqILU0 in try block.
...
The rest is not needed and this simplyfies code.
2015-09-08 12:06:03 +02:00
Markus Blatt
2d50408b5f
Catch and process exception during ILU0 in parallel for CPR, too.
2015-09-08 12:05:27 +02:00
Andreas Lauser
f46189ee1e
restore dunecontrol compatibility after the opm-cmake -> opm-common rename
2015-09-08 11:57:14 +02:00
Markus Blatt
c97f125b56
Include rank into error message.
2015-09-08 11:48:06 +02:00
Markus Blatt
315251da2c
Fix typo wether->whether.
2015-09-08 11:44:46 +02:00
Atgeirr Flø Rasmussen
6728bb1672
Merge pull request #445 from GitPaean/improving_scaling
...
update scaling factors for mass balance equations.
2015-09-08 11:22:59 +02:00
Markus Blatt
de8c638308
Put space around braces where it seems approppriate.
2015-09-08 11:15:46 +02:00
Kai Bao
a3872a4bbd
chaning std::arrary to std::vector for more flexibility
2015-09-08 11:13:44 +02:00
Kai Bao
49d6cfb188
renaming tempB to temp_b to adress the comment.
2015-09-08 10:57:19 +02:00
Kai Bao
b1b9c171b3
update scaling factors for mass balance equations.
2015-09-08 10:57:18 +02:00
Arne Morten Kvarving
28ab615b06
changed: sync with renaming to opm-common
2015-09-08 10:47:05 +02:00
Markus Blatt
ccac548420
Introduces parallel exception handling for ILU0 preconditioner.
...
When running Norne with the interleaved solver sometimes exceptions
(diagonal matrix block is not invertible) occur for some rows in the
ILU decomposition. In a parallel run this means that some, but not all
processes will see the exceptions. This leads to a classic deadlock.
With this commit we catch the exception during the setup of the preconditioner,
determine with the other processes whether there were any exceptions, and
in this case all the processes will throw an exception.
Currently this limited to Dune::MatrixBlockError, but we could extend this.
2015-09-08 09:46:35 +02:00
Atgeirr Flø Rasmussen
89ae28d3c5
Merge pull request #456 from babrodtk/autodiff-matrix-types
...
Autodiff matrix types
2015-09-08 08:34:43 +02:00
babrodtk
83c3d51ae0
Removed need for delegating constructors
2015-09-07 15:33:46 +02:00
babrodtk
38865cac31
Cleaned up comments
2015-09-07 13:01:31 +02:00
babrodtk
39154f04fe
Added tests for autodiffmatrix
2015-09-07 13:01:31 +02:00
babrodtk
4c82e9abc7
Fixed bug in diagonal*vector product
2015-09-07 13:01:31 +02:00
babrodtk
9855d7340f
Minor performance updates
2015-09-07 13:01:31 +02:00
babrodtk
466f1947a3
Fixed Eigen 3.3 compatibility
2015-09-07 13:01:31 +02:00
babrodtk
395c12a2d5
Refactoring to more readable names
2015-09-07 13:00:41 +02:00
babrodtk
0a2b898b33
Minor reformulations
2015-09-07 13:00:41 +02:00
babrodtk
2f83f9268e
Found the culprit
2015-09-07 13:00:41 +02:00
babrodtk
3a3e9d9e4a
Reverted more changes
2015-09-07 13:00:41 +02:00
babrodtk
8d82d9f89e
Reverted some changes
2015-09-07 13:00:41 +02:00