Commit Graph

1972 Commits

Author SHA1 Message Date
André R. Brodtkorb
a208f793d5 Set OpenMP default to off 2015-10-19 15:21:08 +02:00
André R. Brodtkorb
40d2262f8e Fixed typo 2015-10-19 14:25:45 +02:00
babrodtk
57c95ecf00 Added missing endline to printout 2015-10-02 10:37:08 +02:00
babrodtk
c991ba8188 Added default setting for number of threads 2015-10-02 10:37:08 +02:00
babrodtk
1d6f12e870 Added OMP pragmas 2015-10-02 10:37:08 +02:00
Atgeirr Flø Rasmussen
57deb18dc4 Merge pull request #484 from dr-robertk/PR/Parallel-output-only-in-parallel-runs
ParallelDebugOutput: only use parallel output when mpi size > 1.
2015-09-30 09:42:28 +02:00
Atgeirr Flø Rasmussen
5c8b6702e7 Merge pull request #491 from blattms/fix-hydrostatic-corrections-for-unperforated-wells
Return 0 as hydrostatic correction for unperforated cells.
2015-09-28 11:23:14 +02:00
Markus Blatt
d7e6886f4b Return 0 as hydrostatic correction for unperforated cells.
There might be wells without any perforations. It it happens
to be the last well will supscript over the bounds. In other
cases we actually return the correction for the next well.

Not sure whether returning 0 makes any sense, though.
2015-09-24 14:47:45 +02:00
Bård Skaflestad
a333755a2b Merge pull request #481 from babrodtk/faster-form-interleaved
Faster form interleaved
2015-09-24 09:19:54 +02:00
babrodtk
85cfd9768e Fixed whitespace issue 2015-09-24 08:47:27 +02:00
Robert Kloefkorn
36ca75c4b7 ParallelDebugOutput: fix bug in creation of local to global map on I/O rank. 2015-09-21 16:48:57 +02:00
Robert Kloefkorn
299b0aa3cf ParallelDebugOutput: fix initialization of wells for the I/O rank. 2015-09-21 14:05:35 +02:00
Robert Kloefkorn
04ec4eb2bf ParallelDebugOutput: disable wells, seems to not work after latest changes in opm-core. 2015-09-21 12:52:37 +02:00
Robert Kloefkorn
f63487ad0f ParallelDebugOutput: initialize globalIndex in serial run too. 2015-09-21 12:42:41 +02:00
Robert Kloefkorn
dacb4013ed ParallelDebugOutput: only use parallel output when mpi size > 1. 2015-09-21 12:24:07 +02:00
Bård Skaflestad
2c84414641 Merge pull request #480 from atgeirr/silence-warning
Silence unused argument warning.
2015-09-21 10:45:58 +02:00
babrodtk
206dbd3b56 Updated documentation 2015-09-21 08:28:57 +02:00
babrodtk
a58dcce654 Minor changes to how the interleaved system is built 2015-09-17 16:00:44 +02:00
Atgeirr Flø Rasmussen
1f6d957cd4 Change the way the interleaved matrix is built.
Note that this implementation may not be robust since the getSparse()
method throws if the AutoDiffMatrix is not of general sparse type (S),
2015-09-17 15:59:56 +02:00
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