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,099 Commits 24 Branches 102 Tags 90 MiB
e323f15d2f
Commit Graph

4099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
e323f15d2f putting more things in the prototyping test. 2016-11-16 13:23:55 +01:00
Kai Bao
e0dd9bfabd keeping putting group control in. 2016-11-16 13:22:52 +01:00
Kai Bao
f62d40fc05 adding a pointer to the well_collection of WellsManger 
might change to reference later. Using pointer now is trying to keep the
WellModel constant.
 2016-11-16 13:22:52 +01:00
Atgeirr Flø Rasmussen
6df917e9e0 Merge pull request #925 from blattms/use-one-outputStateMatlab 
Removed second implementation of matlab output.
 2016-11-16 13:02:57 +01:00
Markus Blatt
b91f747a3e Removed second implementation of matlab output. 
There is already a generic one with the Grid implementation
being the template parameter in the header file. The other
implementation using UnstructuredGrid does exactly the same.
Therefore we remove it with this commit.
 2016-11-16 12:16:40 +01:00
Atgeirr Flø Rasmussen
fd4d57e68c Merge pull request #923 from blattms/fix-spelling-for-unhandled-ouput 
Fix spelling in warning about unhandled parallel ouput.
 2016-11-15 20:50:40 +01:00
Markus Blatt
55362ecdc2 Fix spelling in warning about unhandled parallel ouput. 2016-11-15 12:08:58 +01:00
Atgeirr Flø Rasmussen
ae9cd62a5c Merge pull request #906 from GitPaean/test_residual_checking 
checking the residual for the well control equations.
 2016-11-14 10:44:44 +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
Kai Bao
ce8498c4d7 checking the residual for the well control equations. 2016-11-11 13:26:22 +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
jokva
cb16d1391f Merge pull request #903 from jokva/remove-sdc-pointer 
Remove Solution.sdc assignment
 2016-11-09 11:50:36 +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
Atgeirr Flø Rasmussen
af9df953ed Merge pull request #895 from andlaus/rename_flow_to_flow_legacy 
rename the 'flow' binary to 'flow_legacy' and set a symbolic link
 2016-11-08 11:06:03 +01: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
Atgeirr Flø Rasmussen
e23bd0606f Merge pull request #822 from akva2/kristfho_restart 
Added ctest for restart files
 2016-11-07 14:53:23 +01:00
Arne Morten Kvarving
407ee5fb6e add restart test for SPE1CASE2_ACTNUM 
to cover restarts on decks with ACTNUM
 2016-11-07 12:32:20 +01:00
Andreas Lauser
511a9039ab rename the 'flow' binary to 'flow_legacy' and set a symbolic link 
this is a precursor of merging flow_ebos into the master
branch. hopefully, this won't break any existing setups...
 2016-11-04 16:19:15 +01:00
Arne Morten Kvarving
73e084f9ad Added ctest for restart files 2016-11-04 14:47:59 +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
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
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
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
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
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
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