Commit Graph

4885 Commits

Author SHA1 Message Date
Markus Blatt
2bf7f8efa7 Revert "Moved copyright notice to top of header BlackoilModelEbosTypeTags.hpp"
This reverts commit d341de0d8b796b66f7bd6d871c84e1c2db265ff1.
2017-04-04 11:08:17 +02:00
Markus Blatt
e56e2cae15 Added requested braces. 2017-04-04 11:08:17 +02:00
Markus Blatt
6b8b8b971e Use global wellsActive to see whether wells are active at all.
This bug must have sneaked in during rebasing. Kudos to Atgeirr for
spotting this.
2017-04-04 11:08:17 +02:00
Markus Blatt
cde162b3d6 Use the global number of cells for the average.
This number is still wrong in master but well become correct once
PR #1107 is merged.
2017-04-04 11:07:57 +02:00
Markus Blatt
a6f6e4806e Moved copyright notice to top of header BlackoilModelEbosTypeTags.hpp 2017-04-04 11:06:41 +02:00
Markus Blatt
29fb281406 Updated Copyright stuff 2017-04-04 11:06:41 +02:00
Markus Blatt
781eadb561 Removed unused method detail::convergenceReduction 2017-04-04 11:06:41 +02:00
Markus Blatt
0e83496740 Make getWellConvergence parallel and omit unnecessary computations.
detail::getConvergence computes a lot more than we actually need.
We only need the average over B and the maximum of the well residual.

Therefore we now compute these quantities in getWellConvergence and
do the global reductions manually.
2017-04-04 11:05:50 +02:00
Markus Blatt
4768bc9e90 Remove usage of cachedIntensiveQuantities from getWellConvergence 2017-04-04 11:05:50 +02:00
Markus Blatt
f6153f8133 Factor out ewoms typetag system to separate header.
We will need the typetag information also for the wells.
If it is not in a separate header we get problems
with recursive inclusion of the headers (BlackoilEbos.hpp
includes the header that also needs the typetag information).
2017-04-04 11:05:50 +02:00
Atgeirr Flø Rasmussen
1232a7a021 Merge pull request #1111 from blattms/make-updateState-work-for-non-interior-elements
Make update state  and getConvergence work for non interior elements
2017-04-04 10:47:39 +02:00
Atgeirr Flø Rasmussen
81dbfc8205 Merge pull request #1107 from blattms/fix-ebos-global-cell
[Ebos,bugfix] Correctly compute the global number of cells.
2017-04-04 10:33:22 +02:00
Joakim Hove
5a29a012e8 Merge pull request #1117 from joakim-hove/travis-install-bc
Install bc in travis.
2017-04-03 13:49:44 +02:00
Joakim Hove
45863ac88d Install bc in travis. 2017-03-30 10:59:02 +02:00
Markus Blatt
2b0a9351d5 Iterate over Interior_Partition instead of All_Partition and if-clause 2017-03-24 12:25:28 +01:00
Markus Blatt
863bef4722 Fix superfluous dereferencing that broke compilation. 2017-03-24 08:22:32 +01:00
Markus Blatt
30e8753288 Use Interior_Partition when iterating over grid instead of if(..) continue.
Makes the code a bit cleaner.
2017-03-22 11:51:52 +01:00
Robert Kloefkorn
085df34183 [cleanup] Only iterate over grid once during getConvergence.
Resolved cherry-pick conflicts by @blattms.
2017-03-21 10:52:37 +01:00
Arne Morten Kvarving
bc35ddf8bb fixup SPE script 2017-03-20 20:02:33 +01:00
Arne Morten Kvarving
7f247c1cc9 fixup norne script 2017-03-20 20:02:30 +01:00
Andreas Lauser
c5fd9ddb48 make the unit tests to explicitly use flow_legacy instead of flow
the results of `flow_legacy` and `flow_ebos` are not bit-wise
identical. The same tests using `flow_ebos` should to be added when
re-organizing the unit tests the next time.
2017-03-20 20:01:59 +01:00
Markus Blatt
990ea7c44c Remove unused variable warning for endElementIt.
It was redefined and initialized in an inner scope.
2017-03-20 19:53:27 +01:00
Markus Blatt
ad1fe8fac0 Prevent using dangling references in BlackoilModelEbos::getConvergence.
Using cachedIntensiveQuantities on parallel grids will cause/is causing
dereferencing a null pointer here. Therefore we resort to iterating over
the grid and using the element Context.

If this turns out ot be performance regression @andlaus owes me a beer!
2017-03-20 16:46:10 +01:00
Markus Blatt
aa5940a2ff Prevent using dangling references in BlackoilModelEbos::updateState.
Using cachedIntensiveQuantities on parallel grids will cause/is causing
dereferencing a null pointer here. Therefore we resort to iterating over
the grid and using the element Context.

If this turns out ot be performance regression @andlaus owes me a beer!

Closes #1110
2017-03-20 16:46:00 +01:00
Atgeirr Flø Rasmussen
0b0ef7e20f Merge pull request #1108 from andlaus/apply_wells_in_assemble
BlackoilModelEbos: apply the well residual in assemble()
2017-03-20 08:44:32 +01:00
Atgeirr Flø Rasmussen
2eb8816507 Merge pull request #1103 from totto82/output_rsrv_pc
Fix output of rs and rv.
2017-03-20 06:47:17 +01:00
Atgeirr Flø Rasmussen
553f345670 Merge pull request #1088 from GitPaean/correcting_bhp_limits_for_well_potentials
more careful determination of the most restrictive bhp value
2017-03-19 14:08:13 +01:00
Atgeirr Flø Rasmussen
f504ca34f4 Merge pull request #1041 from blattms/fix-output_writer-setup
Fix output writer setup
2017-03-17 18:12:52 +01:00
Atgeirr Flø Rasmussen
eaf9d136bf Merge pull request #1091 from GitPaean/calculating_surface_volume_fraction
[WIP] using surface volume fraction instead of wellVolumeFraction() and wellVolumeFractionScaled() in a few places
2017-03-17 14:31:31 +01:00
Bård Skaflestad
bdba47e5ac Merge pull request #1105 from atgeirr/change-default-output-dir
Change default output dir
2017-03-17 13:58:08 +01:00
Andreas Lauser
093310c437 BlackoilModelEbos: apply the well residual in assemble()
This used to be done in solveJacobianSystem(), but this method is only
supposed to solve the linearized system of equations, not to modify it
IMO.

I tested this patch with Norne: It did not change anything.
2017-03-17 11:39:41 +01:00
Bård Skaflestad
d700f3e946 Merge pull request #1104 from atgeirr/allow-restart-without-opmextra
Allow restarting without OPMEXTRA field in restart file.
2017-03-17 11:18:06 +01:00
Markus Blatt
13956625b6 Removed duplicate output writer setup.
The cat must have dragged that in during some of the various rebases of this branch.
This introduced a segmentation fault as for the second setup eclIO was already null.
2017-03-17 11:08:55 +01:00
Markus Blatt
bb7934b1a2 [Ebos,bugfix] Correctly compute the global number of cells.
Currently, all parallel DUNE grid store some cells in addition to
interior cells. Therefore assuming that the global number of cells
(i.e. the number of cells a sequential grid needs to cover the same
whole domain with indentical cells) is not the sum of the number of
cells of the local grid. Previously, the latter was used.
2017-03-17 10:26:00 +01:00
Atgeirr Flø Rasmussen
a89af9c92f Updated output_dir in test driver scripts/ 2017-03-16 17:18:14 +01:00
Atgeirr Flø Rasmussen
059367e14d Change default output dir for flow_ebos. 2017-03-16 16:05:33 +01:00
Atgeirr Flø Rasmussen
4ea87b31b2 Change output dir default.
With this the default output dir is the location of the deck file
(as stored in the IOConfig), rather than the current working directory.
2017-03-16 15:43:46 +01:00
Atgeirr Flø Rasmussen
4eda4d9ff6 Remove unused code and simplify.
- The output_interval_ member is no longer used (here).
 - After setup, the IOConfig contains the output dir, use it.
2017-03-16 15:40:24 +01:00
Markus Blatt
0650f9b42e Deactivate gather code when MPI is not available.
In this case some of the used classes do not exist.
2017-03-16 14:52:59 +01:00
Markus Blatt
35ff439ee1 Make ParallelDebugOutput constructable with global or distributed grid view.
That makes coding a little more me/fool proof.
2017-03-16 14:52:59 +01:00
Markus Blatt
03cb9f4afa ParalleDebugOutput needs the distributed grid.
Because for the global grid the communicator sees just one process.
Unfortunately this is not documented.
2017-03-16 14:52:59 +01:00
Markus Blatt
2f95e33d59 Do not use the equilGrid in Ebos as it is deleted after the constructor.
Instead we create our own global grid representation.
2017-03-16 14:52:59 +01:00
Markus Blatt
fd3e3596a9 Setup output writer and write initial values in parallel correctly.
Before this commit only the solution of process 0 was written.
To fix this we make the equilGrid of Ebos available. It is used
for the output writer. The properties written initially are gathered from
all processes first using the new gather/scatter utility.
2017-03-16 14:52:59 +01:00
Markus Blatt
45cee3d9f4 Added missing header include. 2017-03-16 14:52:59 +01:00
Atgeirr Flø Rasmussen
711e9bacb7 Allow restarting without OPMEXTRA field in restart file. 2017-03-16 13:34:24 +01:00
Atgeirr Flø Rasmussen
5517b8a3f3 Merge pull request #963 from blattms/allow-amg-with-matrix-block
Specialize direct solver for Dune::MatrixBlock.
2017-03-16 11:43:16 +01:00
Tor Harald Sandve
6c859836f3 Hack to make the intial output of rs and rv Ecl compatible.
For cells with swat == 1 Ecl outputs; rs = rsSat and rv=rvSat, in all
but the initial step where it outputs rs and rv values calculated by the
initialization. To be compatible we overwrite rs and rv with the values
passed by the localState. Volume factors and densities needs to be
recalculated with the updated rs and rv values.
2017-03-16 10:22:27 +01:00
Tor Harald Sandve
d640a16e5a Update rs and rv value for free oil and gas case
The rs and rv values are not used by the simulator for the case with
free oil and gas (or water only case), but they must be updated for
output.
2017-03-16 10:20:09 +01:00
Atgeirr Flø Rasmussen
b8adfbb52f Merge pull request #1101 from joakim-hove/allow-undefined-wells
Policy change: warn when missing well/group.
2017-03-15 20:50:27 +01:00
Joakim Hove
bdc9ffb578 Policy change: warn when missing well/group. 2017-03-15 15:41:25 +01:00