Commit Graph

9578 Commits

Author SHA1 Message Date
Andreas Lauser
44a396d1c8 add ebos_plain to the ebos debug extensions 2019-06-03 11:20:41 +02:00
Andreas Lauser
f5e26df6af ebos: tell the parser not to bail out if it encounters superfluous records
this makes slightly incorrect decks usable with `ebos`. since the
common `flow` variants use a different code path to parse the deck,
they are unaffected. (as far as I can see, the only variant which
might be affected is `flow_ebos_oilwater_polymer_injectivity` and even
for it `flow`'s multiplexing code will abort the run before the
vanguard is even called.)
2019-06-03 11:20:41 +02:00
Andreas Lauser
c315a9a473 ebos: make it possible to disable aquifiers
for now, disabling aquifers is an experimental feature...
2019-06-03 11:20:41 +02:00
Andreas Lauser
ef74025523 ebos: tone down the warning in the startup message slightly
The intend is to make the purpose of `ebos` clearer: while it can be
used in production, the stability guarantees are somewhat lower than
for `flow` and testing is a bit less rigorous (most of the time).
2019-06-03 11:11:41 +02:00
Andreas Lauser
c86470e768 tracer model: fix a few output messages
fixes some typos, adds better wording and fixes some duplication
issues on parallel runs.
2019-06-03 11:11:41 +02:00
Andreas Lauser
b699f40cee fix "checking conservativeness" debug message for parallel runs 2019-06-03 11:11:41 +02:00
Andreas Lauser
c0a2fdf5c6 fix a few harmless compiler warnings 2019-06-03 11:11:41 +02:00
Andreas Lauser
18d989c394 ebos: replace tabs with spaces and remove trailing white space
for some reason this keeps creping back in...
2019-06-03 11:11:41 +02:00
Tor Harald Sandve
8f60a5f9fc
Merge pull request #1841 from andlaus/remove_isSubstep
EclProblem: remove the isSubstep parameter from writeOutput()
2019-06-03 10:41:12 +02:00
Atgeirr Flø Rasmussen
2cc22f99cb
Merge pull request #1868 from andlaus/sparse_matrix_adapter_from_linear_solver
set the SparseMatrixAdapter property in the linear solver type tag
2019-05-31 20:40:10 +02:00
Atgeirr Flø Rasmussen
2d0cd0ecfe
Merge pull request #1869 from GitPaean/adding_comment_getsegmentrateupwinding
adding some comments about getSegmentRateUpwinding()
2019-05-31 20:37:16 +02:00
Kai Bao
8fd1a8b7da assert pressure derivative in getSegmentRateUpwinding is zero 2019-05-31 12:51:50 +02:00
Kai Bao
5aacda1880 adding some comments about getSegmentRateUpwinding() 2019-05-31 11:22:35 +02:00
Andreas Lauser
e36ae88ab9 set the SparseMatrixAdapter property in the linear solver type tag
this is necessary because after OPM/ewoms#513, the
`SparseMatrixAdapter` property will be "owned" by the linear solver
and because ISTLSolverEbos does not build on top of
`Ewoms::ParallelBaseBackend`.
2019-05-31 10:55:13 +02:00
Kai Bao
8796935f7c
Merge pull request #1867 from GitPaean/fixing_resv_prediction
not trying to update RESV target for prediction producers
2019-05-31 09:25:15 +02:00
Kai Bao
c5983eeec5 not trying to update RESV target for prediction producers 2019-05-30 11:58:23 +02:00
Andreas Lauser
80238d9940
Merge pull request #1863 from totto82/fix_init
Make it possible to restart without computing initial conditions
2019-05-29 12:23:40 +02:00
Atgeirr Flø Rasmussen
ff2965e346
Merge pull request #1862 from GitPaean/fixing_multisegment_wells_cleaning_up_restarting_test_1
adding function updateUpwindingSegments() for MSW
2019-05-29 10:09:08 +02:00
Atgeirr Flø Rasmussen
f3b21f8ead
Merge pull request #1861 from totto82/fixFPRP
Fix FPRP output
2019-05-29 09:59:46 +02:00
Joakim Hove
a5eb002ad8
Merge pull request #1864 from joakim-hove/fixup-controls
Fixup: Use ProductionControls and InjectionControls
2019-05-29 07:44:09 +02:00
Joakim Hove
c6af5f11b6 Fixup: Use ProductionControls and InjectionControls 2019-05-29 07:12:15 +02:00
Joakim Hove
dc4f57f7eb
Merge pull request #1831 from joakim-hove/use-wells2-controls
Use wells2 controls
2019-05-29 06:46:58 +02:00
Tor Harald Sandve
ae78cb86df Make it possible to restart without computing initial conditions 2019-05-28 13:04:28 +02:00
Kai Bao
236e4d7e33 adding function updateUpwindingSegments() for MSW
to update the upwinding segment for each segment based on flow direction
2019-05-28 12:35:59 +02:00
Atgeirr Flø Rasmussen
c554fdb5fb
Merge pull request #1802 from totto82/addWellPotMSW
Add well potential output to MSW
2019-05-27 15:31:21 +02:00
Tor Harald Sandve
e8db16554f Fix FPRP output 2019-05-27 11:24:55 +02:00
Tor Harald Sandve
613473082f Address PR comments 2019-05-24 16:45:27 +02:00
Kai Bao
8ac85b892c
Merge pull request #1859 from joakim-hove/use-exit
Return EXIT_FAILURE in main() instead of rethrow
2019-05-24 10:29:59 +02:00
Joakim Hove
7489269172 Return EXIT_FAILURE in main() instead of rethrow 2019-05-24 08:34:12 +02:00
Joakim Hove
511645d12c Use InjectionControls and ProductionControls data classes 2019-05-23 16:27:17 +02:00
Tor Harald Sandve
821794b0ad Add well potential output to MSW
The common part is moved to the well interface class
This commit also adds iterations to the standardWells
well potential calculations to improve the results
2019-05-23 15:32:48 +02:00
Bård Skaflestad
a618a1a777
Merge pull request #1857 from totto82/fix_fip_seg_fault
fix typo in fip output
2019-05-23 10:38:07 +02:00
Joakim Hove
17aee483dd
Merge pull request #1815 from joakim-hove/use-wells2
Use new well implementation Well2 from opm-common
2019-05-22 23:16:59 +02:00
Joakim Hove
b6840db604 Use new well implementation Well2 from opm-common 2019-05-22 21:47:45 +02:00
Tor Harald Sandve
dbf7efa6cb fix typo in fip output 2019-05-22 15:39:57 +02:00
Joakim Hove
a3361794cf
Merge pull request #1853 from joakim-hove/unsupported
Add keywords to the list of unsupported keywords
2019-05-22 11:53:06 +02:00
Atgeirr Flø Rasmussen
025b828e80
Merge pull request #1855 from totto82/fix_throw
throw runtime_error instead of logic_error
2019-05-22 11:39:09 +02:00
Tor Harald Sandve
a33c967ad0 throw runtime_error instead of logical_error 2019-05-22 10:08:55 +02:00
Joakim Hove
4a4a8bb3e7 Add keywords to the list of unsupported keywords 2019-05-22 06:54:05 +02:00
Bård Skaflestad
f293e6520b
Merge pull request #1848 from blattms/write-trans-direct-vertical-neighbors-tranz
Write transmissibility between direct vertical neighbors into TRANZ.
2019-05-21 12:42:17 +02:00
Markus Blatt
337c637fa0 Write transmissibility between direct vertical neighbors into TRANZ.
In the case where two were direct vertical neighbors in the grid
but not in the underlying cartesian grid (e.g. because of MINPV or
pinch outs), we treated them as NNCs and wrote the transmissibilty
to TRANNC.

With this patch we detect this situation (two neighbor cells with identical
i and i and no active cells between them) and do not create an NNC
in the eclipse output files but write the transmissibility to TRANZ.
2019-05-21 11:24:17 +02:00
Bård Skaflestad
4cee9a01f6
Merge pull request #1846 from bska/update-rft-data
Update Data: Make Protocol Aware of RFT Files

Merging per approval.
2019-05-20 10:49:17 +02:00
Bård Skaflestad
c4134fba76 Update Data: Make Protocol Aware of RFT Files
If a simulation run intentionally changes an RFT file, then that
change should be reflected in the new reference data.
2019-05-16 13:38:57 +02:00
Atgeirr Flø Rasmussen
4e5aab5f14
Merge pull request #1829 from GitPaean/different_control_different_tolerance
letting getResidualMeasureValue() use the same criterion as getWellConvergence()
2019-05-16 13:36:03 +02:00
Kai Bao
080e840f2f using tolerance_wells_ for BHP control tolerance for MSW 2019-05-16 12:20:35 +02:00
Kai Bao
28f0274fb5 fixing bugs spotted in the review comments 2019-05-15 16:28:18 +02:00
Kai Bao
4593453d10 adding function checkConvergenceControlEq to refactor getWellConvergence
only functional change is that rate control or BHP control has different
tolerance for MSW now.
2019-05-15 16:28:18 +02:00
Atgeirr Flø Rasmussen
41ef80dd7d
Merge pull request #1842 from blattms/always-print-version-if-requested
If requested always print version and exit.
2019-05-15 15:13:24 +02:00
Atgeirr Flø Rasmussen
6f4c737700
Merge pull request #1847 from blattms/print-missing-deck-only-on-master
Let only master process print information about exception.
2019-05-15 15:10:24 +02:00
Markus Blatt
b885c1a013 Let only master process print information about exception.
Previously, each process did this in a parallel run which
clutters the terminal output quite a bit in a parallel run.
2019-05-15 11:14:06 +02:00