OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 12:33:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,846 Commits 24 Branches 101 Tags 75 MiB
e325dcd04b
Commit Graph

4846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
e325dcd04b Excessive nonlinear iterations is reported as problem, not error. 2017-04-06 14:52:19 +02:00
Atgeirr Flø Rasmussen
431abb0012 Merge pull request #1087 from babrodtk/somax_in_restart 
Added somax to input/output to restart file
 2017-04-06 06:15:51 +02:00
Atgeirr Flø Rasmussen
df2b1190de Merge pull request #1121 from akva2/fix_update_paths 
fixed: paths in data update script
 2017-04-05 12:54:11 +02:00
babrodtk
e0e1ca51e6 Added soMax to flow_legacy 2017-04-05 12:32:43 +02:00
babrodtk
bd0507cc3b Added somax to input/output to restart file 2017-04-05 12:32:43 +02:00
Arne Morten Kvarving
5d1e108c26 fixed: these should also use flow_legacy 2017-04-05 12:17:02 +02:00
Arne Morten Kvarving
866001d148 fixed: paths in data update script 
forgot to update these in https://github.com/OPM/opm-simulators/pull/1096
 2017-04-05 12:04:26 +02:00
Atgeirr Flø Rasmussen
69835d2cde Merge pull request #1114 from blattms/parallel-dens-wells 
Parallelize and dunify/ewomsify StandardWellDense
 2017-04-05 09:10:16 +02:00
Arne Morten Kvarving
32d50eab4a Merge pull request #1096 from andlaus/use-flow_legacy-for-unit-tests 
make the unit tests to explicitly use flow_legacy instead of flow
 2017-04-04 11:09:36 +02:00
Markus Blatt
30f3d4e2d0 Get rid off TypeTag system in StandardWellsDense. 
Previously, we kind of hard coded the problem using the TypeTag system.
Instead of this we now simply pass the only additional thing needed, the
ElementContext, as an additional template parameter.

Removes the include of removed header BlackoilModelEbosTypeTags.hpp.
 2017-04-04 11:08:17 +02:00
Markus Blatt
312aa24f86 Revert "Factor out ewoms typetag system to separate header." 
This reverts commit 05c70491257a615472e68fb44776bcd7effb60b8.
 2017-04-04 11:08:17 +02:00
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