Commit Graph

4299 Commits

Author SHA1 Message Date
Andreas Lauser
54bb57cce0 Merge pull request #881 from andlaus/frankenstein_merge_master_v7
Frankenstein merge master v7
2016-10-28 09:32:06 +02:00
Andreas Lauser
4be9e95f0f fix the build
wellsToState() now seems to require a phase usage argument...
2016-10-28 09:27:57 +02:00
Andreas Lauser
ddecdc9dbe Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v7
* origin/master:
  Bugfix: use correct object in sequential model.
  Bugfix: properly handle two-phase cases.
  Bugfix: pass both normal and extra data to output.
  Update well data output integration.
  Adapt to API change in opm-parser.
  Ensure logging only on first rank.
  Add isIORank_ member to avoid repeated calls.
  Rename isRankZero() -> isIORank() for consistency.
  Ensure only first-rank logging.
  Add isRankZero() utility.
  Bugfix: missing return.
  do not set limits for prt log and set correct value for Note.
  correct function call order and add whitespace.
  supprot MESSAGES default vaule.
  wellToState reads new opm-output data exchange
  Write control to data::Wells. Missing ability to restore.
  Avoid using buggy wellstate api
  Stop report early if there are no wells
  Update to interface change in opm-output
2016-10-28 09:22:38 +02:00
Andreas Lauser
73d7a3ca10 use accessor methods to access the value and derivatives of Evaluation objects 2016-10-27 17:29:29 +02:00
Atgeirr Flø Rasmussen
732786f014 Merge pull request #878 from atgeirr/fix-twophase
Bugfix: properly handle two-phase cases.
2016-10-27 14:07:19 +02:00
Atgeirr Flø Rasmussen
e762844cdf Bugfix: use correct object in sequential model.
Discovered as a side effect of two-phase fix.
2016-10-27 13:20:10 +02:00
Atgeirr Flø Rasmussen
1fe610ef5a Bugfix: properly handle two-phase cases.
Errors were found in FIP handling and output.
2016-10-27 11:02:04 +02:00
Atgeirr Flø Rasmussen
dbf902e704 Merge pull request #876 from atgeirr/fix-extra-RPTRST-data
Bugfix: pass both normal and extra data to output.
2016-10-25 18:39:14 +02:00
Atgeirr Flø Rasmussen
7da420869b Bugfix: pass both normal and extra data to output.
Normal meaning SWAT, PRESSURE, RS etc.
Extra meaning KR, VISC etc. as asked for in RPTRST.
2016-10-25 15:27:59 +02:00
Atgeirr Flø Rasmussen
b2a64c2ddd Merge pull request #875 from atgeirr/completion-data-changes
Update well data output integration.
2016-10-25 13:58:33 +02:00
Atgeirr Flø Rasmussen
17a9f28fb8 Update well data output integration.
Includes the following changes:
 - update to match API change in opm-output (vector not map for data::Wells::completions),
 - restore WellStateFullyImplicitBlackoil::perfPhaseRates() from output,
 - restore WellStateFullyImplicitBlackoil::currentControls() from output.

Remaining non-restored well-related data are:
 - well potentials,
 - the dynamic list of econ-limited completions.
2016-10-25 10:53:40 +02:00
Atgeirr Flø Rasmussen
77abb6de1c Merge pull request #840 from jokva/output-data-wells-sans-vectors
WIP: Output data wells sans vectors
2016-10-21 15:00:39 +02:00
Robert Kloefkorn
31724030c9 Merge branch 'frankenstein' into PR/remove-Eigen-from-BMEbos 2016-10-21 14:13:58 +02:00
Robert Kloefkorn
c8374a4b95 [cleanup] Remove Eigen from BlackoilModelEbos. 2016-10-21 13:26:48 +02:00
Atgeirr Flø Rasmussen
1edbc9f238 Merge pull request #866 from atgeirr/convergence-failure-not-error
Convergence failure classification, fix for parallel logging
2016-10-21 12:49:07 +02:00
Atgeirr Flø Rasmussen
10e7875734 Merge pull request #873 from atgeirr/fix-compile-error
Compile fix
2016-10-21 11:23:33 +02:00
Atgeirr Flø Rasmussen
2d15c1ffec Adapt to API change in opm-parser. 2016-10-21 11:21:02 +02:00
Atgeirr Flø Rasmussen
3a6353a455 Merge pull request #820 from qilicun/support-MESSAGES
support MESSAGES keyword.
2016-10-21 11:04:39 +02:00
Atgeirr Flø Rasmussen
d527b6862a Ensure logging only on first rank. 2016-10-20 22:47:30 +02:00
Atgeirr Flø Rasmussen
a2c9e64291 Add isIORank_ member to avoid repeated calls. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
e4731fc14d Rename isRankZero() -> isIORank() for consistency. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
8ed3418245 Ensure only first-rank logging.
Also classify convergence troubles or out-of-bounds residuals as
"problem" not "error".
2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
5559fbd233 Add isRankZero() utility. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
9e1ba49554 Bugfix: missing return. 2016-10-20 22:40:24 +02:00
Andreas Lauser
67ce00a9cb Merge pull request #872 from andlaus/frankenstein_merge_master_v6
Frankenstein merge master v6
2016-10-20 20:23:06 +02:00
Andreas Lauser
6754bad00b Merge branch 'master' into frankenstein
* master:
  Update to shared_ptr-less parser interface.
2016-10-20 20:16:42 +02:00
jokva
1697212b98 Merge pull request #863 from jokva/remove-shared-ptr
The great shared_ptr purge
2016-10-20 19:18:50 +02:00
Liu Ming
7c51158ec4 do not set limits for prt log and set correct value for Note. 2016-10-20 21:00:51 +08:00
Jørgen Kvalsvik
1c6a4b34da Update to shared_ptr-less parser interface. 2016-10-20 14:08:04 +02:00
Liu Ming
0695555a77 correct function call order and add whitespace. 2016-10-20 16:27:46 +08:00
Liu Ming
164f74c93c supprot MESSAGES default vaule. 2016-10-20 15:54:02 +08:00
Andreas Lauser
2a9a803135 Merge pull request #871 from andlaus/frankenstein_merge_master_v5
Frankenstein merge master v5
2016-10-19 13:48:33 +02:00
Andreas Lauser
7cfe8322e2 Merge branch 'master' into frankenstein
* master:
  adapt to the removal of the unit system of opm-core
2016-10-19 13:30:44 +02:00
Andreas Lauser
b824c30e0c Merge pull request #870 from totto82/frankenstein_cache_reuse_fix
Frankenstein: InvalidateCache when restaring the timestep
2016-10-19 13:16:25 +02:00
Tor Harald Sandve
3600c45619 Merge pull request #865 from andlaus/frankenstein_fix_valgrind_errors
frankenstein: fix some valgrind complaints
2016-10-19 12:35:10 +02:00
Andreas Lauser
5007d99c0d flow_ebos: re-eanable the 'tempV.maxCoff()' convergence check for the well model
the 'tempV' object currently only contains garbagee but the condition
is needed and will thus be fixed in a different PR.

thanks goes to @totto82 for the clarifications.
2016-10-19 12:28:07 +02:00
Tor Harald Sandve
89fcbe3e60 InvalidateCache when restaring the timestep
Keep track of whether it is a restart or not and invalidate the
intensive quantitiesCache in ebos when restarting the timestep due to
convergence issues.
2016-10-19 12:08:49 +02:00
Jørgen Kvalsvik
26f1a69903 wellToState reads new opm-output data exchange 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
545f55bd3b Write control to data::Wells. Missing ability to restore. 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
df4e163796 Avoid using buggy wellstate api 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
dfb7f8ff63 Stop report early if there are no wells 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
6ba21fd4c0 Update to interface change in opm-output 2016-10-19 12:06:43 +02:00
Atgeirr Flø Rasmussen
93ffb318cd Merge pull request #855 from andlaus/opm-parser_units
adapt to the removal of the unit system of opm-core
2016-10-18 15:25:42 +02:00
Andreas Lauser
45f11d8820 StandardWellsDense: fix some valgrind complaints
note that I don't know if these changes are semantically correct (I
doubt it), but this patch fixes the valgrind complaints I saw for
SPE9_CP and on Norne.

Also, this makes the timing of flow_ebos for SPE9 determinisic between
runs: without this, I got some random time steps fail in a given run
and in the next run a completely different set of timesteps
failed. Since this was on the same same machine, without any
recompiles and no changes to the deck or any other input parameters, I
initially attributed the behavior to cosmic rays ;)

@totto82: could you have a thorough look on this?
2016-10-17 18:56:38 +02:00
Andreas Lauser
aaf21f4eff Merge pull request #868 from andlaus/frankenstein_geo_events
flow_ebos: support for geology changes during the simulation
2016-10-17 18:40:50 +02:00
Andreas Lauser
b8e5a6e12d flow_ebos: support for geology changes during the simulation
the actual work is done in the EclProblem. Removing the stuff here is
just necessary in order not to apply the modifier deck twice...
2016-10-17 17:06:20 +02:00
Andreas Lauser
2dc69b4551 *arg* I accidentally merged some local changes with the last PR... 2016-10-17 16:32:28 +02:00
Andreas Lauser
9dc30cc0ac Merge pull request #867 from andlaus/frankenstein_merge_master_v4
Frankenstein merge master v4
2016-10-17 16:31:47 +02:00
Andreas Lauser
1c1e0c18b7 flow_ebos: fix the build
once again, the culprit was an API change in opm-output. I suppose
this means that the frankenstein branch should be merged soon after
the release in order to avoid to continue breaking the flow_ebos build
twice a week.
2016-10-17 16:24:49 +02:00
Andreas Lauser
6a093c3e24 Merge remote-tracking branch 'origin/master' into frankenstein 2016-10-17 14:33:34 +02:00