Commit Graph

2643 Commits

Author SHA1 Message Date
Tor Harald Sandve
f8bf7c392c Fix some temporary fallouts in the outputwriter 2016-11-15 12:23:46 +01:00
Andreas Lauser
e1178455a2 flow_ebos: fix a memory error in the fluid in place code
as usual for such errors, this was found using valgrind.
2016-11-14 19:49:33 +01:00
Andreas Lauser
293f7ca1c7 Merge pull request #916 from totto82/frankenstein_fix_appleyard2
Improvments in convergence for flow_ebos
2016-11-14 15:02:00 +01:00
Andreas Lauser
e84de929cf flow_ebos: alter the startup message
... to make apparent from the output which simulator was used.
2016-11-14 14:18:11 +01:00
Andreas Lauser
4271da8d84 flow_ebos: fix the build
mainly, the "linsolver_" attribute is called "istlSolver_" in the
BlackoilModelEbos class. Also, this problem possibly only occured if
MPI was enabled...
2016-11-14 13:36:01 +01:00
Tor Harald Sandve
739c0906ef Improvments in convergence for flow_ebos
- restrict pressure changes. Set default to 1.0 (this also effects flow)
- change default number of linear iterations to 150
- tell stabilized newton the residual occilates even if it occilates in
only one phase (this also effects flow)
- avoid problems realated to division on small numbers

Tested on SPE9, norne and Model 2 with significant improvments.
2016-11-14 13:26:38 +01:00
Tor Harald Sandve
36ce159411 Calculation the original FIP at the beginning 2016-11-14 10:16:57 +01:00
Tor Harald Sandve
5a917a4828 Output FIP in flow_ebos 2016-11-14 09:34:40 +01:00
Andreas Lauser
d989c1e2fc Merge remote-tracking branch 'origin/master' into frankenstein
* origin/master:
  Do not throw for unrecognized file when merging log files.
  Do not populate cellData but issue a warning in parallel.
  Removed ternary operator in inline initialization.
  Correctly mark transfer of ownership for ouptut writer
  Indent nested #if
  Remove Solution.sdc assignment
  Cater variable name change in BCRSMatrix of DUNE 2.5
  Fix using local active cells for writing eclipse files in parallel.
  add restart test for SPE1CASE2_ACTNUM
  rename the 'flow' binary to 'flow_legacy' and set a symbolic link
  Added ctest for restart files
2016-11-11 18:29:46 +01:00
Atgeirr Flø Rasmussen
129db89dc0 Merge pull request #900 from blattms/fix-parallel-eclipse-writing
Fix using local active cells for writing eclipse files in parallel.
2016-11-11 15:28:46 +01:00
Atgeirr Flø Rasmussen
38abf56d5e Merge pull request #905 from blattms/do-not-throw-for-unrecognized-parallel-file
Do not throw for unrecognized file when merging log files.
2016-11-11 15:23:42 +01:00
Andreas Lauser
5c67d79c72 adapt to the rename of "applications/ebos" to "ebos" inside eWoms 2016-11-11 15:05:13 +01:00
Andreas Lauser
42e55ee38b fix the build if MPI is not available
I'm not really sure if the fix is semantically correct (Dune
communicators are strange beasts if you're new to them), but at least
this patch fixes the build without MPI and the resulting flow_ebos
binary seems to work fine.
2016-11-11 14:25:19 +01:00
Markus Blatt
1882d3315a Do not throw for unrecognized file when merging log files.
The regex we are using might also consider a file named bla.2.blub.
In that case it is not nice to throw an exception. Instead we print
a message to std::cerr.
2016-11-11 12:00:49 +01:00
Markus Blatt
8632c71cef Do not populate cellData but issue a warning in parallel.
This will lead to some data missing in the parallel runs
but will allow successful runs.
2016-11-10 17:46:49 +01:00
Markus Blatt
747c93e898 Removed ternary operator in inline initialization.
This made the code rather hard to read. Now we do the initialization
in the constructor body if needed.
2016-11-10 13:28:21 +01:00
Markus Blatt
3eba3353d0 Correctly mark transfer of ownership for ouptut writer 2016-11-10 13:04:30 +01:00
Atgeirr Flø Rasmussen
736585e85b Merge pull request #902 from blattms/support-dune-2.5
Cater for variable name change in BCRSMatrix of DUNE 2.5
2016-11-09 12:19:41 +01:00
Markus Blatt
85c0bbcc10 Indent nested #if 2016-11-09 10:08:56 +00:00
Jørgen Kvalsvik
2bdc46c557 Remove Solution.sdc assignment 2016-11-09 10:46:26 +01:00
Markus Blatt
3f7f81ef03 Cater variable name change in BCRSMatrix of DUNE 2.5
One of the variables now has a trailing underline.
2016-11-08 18:59:08 +00:00
Markus Blatt
077dc02481 Fix using local active cells for writing eclipse files in parallel.
Previously, the eclipseGrid used by EclipseWriter was constructed from
the one in the EclipseState with the current CpGrid. Unfortunately the
latter was the distributed version resembling only the local part that
the processor works on. Therefore the information about the active cells
was wrong when writing results (which raised an exception in the writer).

With this commit we construct the EclipseWriter before distributing the grid
and use this writer later on in the OutputWriter.
2016-11-07 19:35:53 +01:00
Andreas Lauser
414dda420a Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v9
* origin/master:
  dune.module: change version to 2017.04-pre
  FlowMain: make sure to always print exception messages to the terminal
2016-11-04 13:56:44 +01:00
Andreas Lauser
0858de32b7 Merge pull request #888 from dr-robertk/PR/wip-frankenstone
[WIP] some cleanup and features for Frankenstone.
2016-11-03 19:02:40 +01:00
Andreas Lauser
edbfdb5ef3 FlowMain: make sure to always print exception messages to the terminal
this patch only uses OpmLog if it is set up properly, else it uses
std::cout. the reason why this is needed is that there's a
chicken-and-egg problem: exceptions which are thrown before the
logging system has been initialized -- most prominently while parsing
the deck -- cause the simulator to silently abort without any user
notification which can be very confusing. On the other hand,
initializing the logging system requires a fully initialized
EclipseState object, i.e. currently to initialze the logging system
the deck must be parsed and in order to print the exceptions thrown
while parsing the deck one needs the logging system.

v2: only prevent using the logging system if has not been set
up. thanks to [at]blattms for the suggestion!
2016-11-03 17:22:51 +01:00
Andreas Lauser
bc4c43a56a Merge branch 'master' into frankenstein
* master:
  changed: drop usage of python based comparison script in spe integration tests
  changed: drop usage of python based comparison script in polymer integration test
  Remove weak enum Opm::Phase
2016-11-03 13:33:45 +01:00
Robert Kloefkorn
90247a02b2 [feature] make convergenceReduction work in parallel (needs testing). 2016-11-02 17:44:06 +01:00
Robert Kloefkorn
4ff23191eb [feature] make flow and flow_ebos use the same linear solver setup. 2016-11-02 16:41:11 +01:00
Robert Kloefkorn
01bb7ee4d7 [cleanup] only print first letter of phaseName in iteration output. 2016-11-02 11:25:43 +01:00
Robert Kloefkorn
11238b1997 [cleanup] Use class variables instead of creating new vectors inside the apply
method of StandardWellsDense.
2016-11-02 10:43:55 +01:00
Atgeirr Flø Rasmussen
59b7d8c8fc Merge pull request #883 from jokva/relax-opm-phase-enum-constexpr
Remove weak enum Opm::Phase; replace with constexpr
2016-11-01 14:52:22 +01:00
Tor Harald Sandve
77d5c8fa38 Remove Eigen from StandardWellsDense 2016-11-01 14:27:05 +01:00
Tor Harald Sandve
f1a9b1f21b Remove unused file and #includes
removes StandardWellsDense_impl.hpp
2016-11-01 13:44:38 +01:00
Tor Harald Sandve
362968c315 New WellStateFullyImplicitBlackoilDense
The WellStateFullyImplicitBlackoil is reverted to master and all
extentions moved to WellStateFullyImplicitBlackoilDense
2016-11-01 13:44:38 +01:00
Andreas Lauser
a773fd4c85 use accessor methods to access the value and derivatives of Evaluation objects 2016-11-01 13:30:41 +01:00
Andreas Lauser
88e2641f1a Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v5
* origin/master:
  use accessor methods to access the value and derivatives of Evaluation objects
2016-11-01 13:27:15 +01:00
Jørgen Kvalsvik
6488cfcfe5 Remove weak enum Opm::Phase
This weak enum is really just an alias for four other constants which in
turn alias another enum. Since they're mostly used for indexing they're
relaxed to constexpr ints.
2016-11-01 12:59:26 +01:00
Robert Kloefkorn
134bf914dc Merge branch 'frankenstein' into PR/remove-Eigen-from-BMEbos 2016-10-28 16:24:55 +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
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
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
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
2d15c1ffec Adapt to API change in opm-parser. 2016-10-21 11:21:02 +02:00