OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,481 Commits 24 Branches 102 Tags 90 MiB
850d9571e8
Commit Graph

4481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser
49a279bfac Merge pull request #894 from andlaus/frankenstein_merge_master_v9 
Frankenstein merge master v9
 2016-11-04 13:58:12 +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
Atgeirr Flø Rasmussen
d3e8a83bae Merge pull request #893 from atgeirr/bump-version 
dune.module: change version to 2017.04-pre
 2016-11-04 12:30:09 +01:00
Atgeirr Flø Rasmussen
da70227807 dune.module: change version to 2017.04-pre 2016-11-04 12:26:59 +01:00
Atgeirr Flø Rasmussen
70f67d1698 Merge pull request #891 from andlaus/fix_catch22 
FlowMain: use std::cout to print exceptions to the terminal
 2016-11-03 21:20:28 +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
627c8944d3 Merge pull request #890 from andlaus/frankenstein_merge_master_v8 
Frankenstein merge master v8
 2016-11-03 14:49:01 +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
Arne Morten Kvarving
09d4b89c60 Merge pull request #889 from akva2/use_compareECL 
Use compareECL in integration tests
 2016-11-03 11:18:07 +01:00
Arne Morten Kvarving
3607ba9127 changed: drop usage of python based comparison script in spe integration tests 
use compareECL from opm-output instead
 2016-11-03 09:10:26 +01:00
Arne Morten Kvarving
5c308614b6 changed: drop usage of python based comparison script in polymer integration test 
replace with compareECL from opm-output
 2016-11-03 09:10:08 +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
Andreas Lauser
fc15fb821a Merge pull request #885 from totto82/frankenstein_refactor_wellState 
Frankenstein: Cleaning and remove Eigen from StandardWellsDense
 2016-11-01 16:26:59 +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
Tor Harald Sandve
ae0ebf1200 Merge branch 'frankenstein' of git://github.com/OPM/opm-simulators into frankenstein 2016-11-01 13:42:04 +01:00
Tor Harald Sandve
1e67b30f94 Merge branch 'master' of git://github.com/OPM/opm-simulators into frankenstein 2016-11-01 13:41:41 +01:00
Andreas Lauser
e81dd8ee16 Merge pull request #884 from andlaus/frankenstein_merge_master_v5 
Frankenstein merge master v5
 2016-11-01 13:31:31 +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
Andreas Lauser
da344222d9 Merge pull request #879 from andlaus/Evaluation_accessors 
use accessor methods to access the value and derivatives of Evaluation objects
 2016-11-01 13:16:37 +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
Tor Harald Sandve
7eb6f3abd1 Merge pull request #874 from dr-robertk/PR/remove-Eigen-from-BMEbos 
Remove Eigen from BlackoilModelEbos.
 2016-11-01 11:32:42 +01:00
Andreas Lauser
cb7fef7f2a Merge pull request #882 from andlaus/frankenstein_jenkins_add_ewoms_upstream 
add ewoms to the list upstream modules for jenkins
 2016-10-31 19:44:07 +01:00
Andreas Lauser
7f7fe7daf7 add ewoms to the list upstream modules for jenkins 
thanks goes to [at]akva2 for pointing this out...
 2016-11-01 18:00:28 +01:00
Robert Kloefkorn
134bf914dc Merge branch 'frankenstein' into PR/remove-Eigen-from-BMEbos 2016-10-28 16:24:55 +02:00
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