OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 10:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,340 Commits 24 Branches 101 Tags 97 MiB
f771049f93
Commit Graph

5773 Commits

Author SHA1 Message Date
Andreas Lauser
cfdf9f3e4d fix build on some Linux distributions 
i.e., mine (openSuse Tumbleweed). the problem seems to be that the
specialization of `ISTLSolver::constructAMGPrecond()` is ambiguous and
some compilers seem to be more strict about this than others. Simply
removing the problematic method seems to work fine.

That said, for non-legacy `flow` this codepath is not taken at runtime
anyway because the `ISTLSolverEbos` class is used!?
 2018-09-21 13:53:38 +02:00
Kai Bao
6e2334dcad removing the extra ; after BEGIN_PROPERTIES and END_PROPERTIES 
which causes compilation warning.
 2018-09-18 13:35:27 +02:00
Joakim Hove
e6be0f5ca6 Make sure the restart files used when testing are OPM style 2018-09-14 14:28:04 +02:00
Bård Skaflestad
c3de357f30
Merge pull request #1567 from blattms/tighten-regex-for-parallel-output 
Let ParallelFileMerger only warn about CASENAME.[0-9]*.EXT files.
 2018-09-12 12:21:47 +02:00
Joakim Hove
1a0ab98255
Merge pull request #1548 from joakim-hove/connection-updates 
Get connection properties directly from the opm-common
 2018-09-11 13:19:07 +02:00
Arne Morten Kvarving
af863c82a0
Merge pull request #1562 from andlaus/threading_fixes 
flow: default to 2 threads if OpenMP is available
 2018-09-11 12:37:13 +02:00
Joakim Hove
b9df94a70f Use Well CF and Kh calculations from opm-common 2018-09-10 12:23:59 +02:00
Markus Blatt
8455c0457b ParallelFileMerger: Remove old local regex and fileWaringRegex_ instead 2018-09-05 16:42:13 +02:00
Markus Blatt
5aab0dfb7b Really only warn about CASENAME.[0-9]+.[A-Z]+. 
Previously we did warn about files not starting with CASENAME.
 2018-09-05 16:06:36 +02:00
Markus Blatt
07bc4396ab Let ParallelFileMerger only warn about CASENAME.[0-9]*.EXT files. 
Previously the regex issued warning for all files containing ".[0-9]*." in the name
in the output directory. That was too general and created more warnings than we wanted.
 2018-09-05 16:06:36 +02:00
Markus Blatt
0863f665aa [bugfix] Make parallel file merge work again for any --output-dir. 
This fixes fallout from the merge of PR #1512. Since then the
ParallelFileMerger was always given the current directory even if
another output directory was requested. This resulted in
CASENAME.<procid>.<ext> files in that directory never being merged and removed.
Now the ParallelFileMerger gets the output directory path again.
 2018-09-05 14:03:00 +02:00
Robert Kloefkorn
97f8f76d13 [bugfix][ISTLSolverEbos] make compile with current dune master. 2018-09-04 12:39:40 +02:00
Andreas Lauser
05dfe43fd2 flow: default to 2 threads if OpenMP is available 
I still think it is better to specify `--threads-per-process`
explicitly, but this patch is better than the current machinery...
 2018-08-31 12:32:41 +02:00
Markus Blatt
9a692b2d09 Improvements to MILU help strings 2018-08-30 18:22:17 +02:00
Markus Blatt
324cb70d3e Renamed MIluVariant to MiluVariant to correct --m-ilu-variant parameter. 
It should be --milu-variant and is it now. Maybe the parameter system
could be a bit smart and detect consecutive upper case letters and treat
them correctly.
 2018-08-30 18:02:24 +02:00
Atgeirr Flø Rasmussen
c4c461b389
Merge pull request #1558 from totto82/changeDefaultTolMB 
Change default ToleranceMB from 1e-5 to 1e-6
 2018-08-27 16:09:09 +02:00
Tor Harald Sandve
b0101647a1 Change default ToleranceMB from 1e-5 to 1e-6 2018-08-27 11:54:32 +02:00
Arne Morten Kvarving
518634f994 fixed: need to init ewoms thread manager 2018-08-24 15:44:09 +02:00
Tor Harald Sandve
61b4b34ad6
Merge pull request #1542 from andlaus/use_ewoms_blackoil_update 
flow: use the update procedure of the eWoms blackoil model
 2018-08-21 09:16:35 +02:00
Andreas Lauser
445a36972b FlowMainEbos: remove unused typedef ThreadManager 
this may avoid a compiler warning under some circumstances.
 2018-08-20 13:10:15 +02:00
Andreas Lauser
455b38e729 remove some now unused parameters 2018-08-17 13:16:11 +02:00
Andreas Lauser
66b95c7f8d flow: use the update procedure of the eWoms blackoil model 2018-08-17 13:03:37 +02:00
Andreas Lauser
f2b0630040 flow: minor parameter related fixes 
- Change the brief description slightly
- Do not print anything anymore if there are no unused parameters
- Change the boiler plate text for printing the parameters to the
  PRT/DBG files

in part, this has been requested by [at]atgeirr.
 2018-08-15 23:36:56 +02:00
Andreas Lauser
620a89587c fix a few parameter names 
bph should be "bhp" and "DWellFractionMax" looks weird as a command
line parameter (-d-well-fraction-max). now, it only looks slightly
weird in the c++ code.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
43ac2e36c6 remove the Flow prefixes of parameters only used by flow 
this has been requested by [at]atgeirr.

Note: The FlowLinearSolverVerbosity, FlowNewtonMaxIterations and
FlowNewtonMinIterations parameters are still prefixed because they
clashes with parameters registered deeply within eWoms.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
1ac74c62ee flow: print the parameters at the beginning of the .PRT and .DBG files 2018-08-15 23:34:32 +02:00
Andreas Lauser
0714ab5930 add the parameters which were introduced by the MILU PR 
i.e., make it possible to specify them via the eWoms parameter system.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
61650a22df fix the fallout of OPM/opm-simulators#1495 2018-08-15 23:34:32 +02:00
Andreas Lauser
076312b28a fix the CPR warning 
this was probably a rebase mistake. thanks to [at]blattms for noticing
this.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
d94be85a9d flow: do not mention unused parameters in the help message 
while they do no longer appear in the help message, in the code they
are still there and can be specified and used as normal.

also, this patch makes --print-parameters=1 and --print-properties=1
work.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
66b749c2eb undo most of the variable changes of the previous commits 
a few were probably forgotten.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
394790475f make it possible to disable the terminal output 
the well model and (probably) the ECL output writing code look like
they cannot be gagged.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
b5cddef928 flow: switch it to use the eWoms parameter system 
this has several advanges:

- a consistent and complete help message is now printed by passing the
  -h or --help command line parameters. most notably this allows to
  generically implement tab completion of parameters for bash
- the full list of runtime parameters can now be printed before the simulator
  has been run.
- all runtime parameters understood by ebos can be specified
- no hacks to marry the two parameter systems anymore
- command parameters now follow the standard unix convention, i.e.,
  `--param-name=value` instead of `param_name=value`

on the negative side, some parameters have been renamed and the syntax
has changed so calls to `flow` that specify parameters must adapted.
 2018-08-15 23:34:32 +02:00
Andreas Lauser
976ab03f68 fork ISTLSolver into a legacy and non-legacy version 
this is necessary because only the latter can use the property system.
 2018-08-15 23:33:50 +02:00
Andreas Lauser
ca2428cf13 adapt to the rename of the EclOutputDir parameter to OutputDir in eWoms 2018-08-14 10:37:24 +02:00
Bård Skaflestad
b087cf54af
Merge pull request #1495 from blattms/red-black-ilu 
Added support for red black ilu
 2018-08-01 18:52:07 +02:00
Markus Blatt
8482b435eb Added clarifying comment on definedness of const_cast 2018-08-01 18:06:45 +02:00
Markus Blatt
f850f04c93 Prevent unnecessary copies of vectors using references. 2018-08-01 15:22:07 +02:00
Markus Blatt
458cd8768f Rely less on implicit includes of header files 2018-08-01 15:20:45 +02:00
Atgeirr Flø Rasmussen
b4bdea1d3f
Merge pull request #1535 from akva2/remove_unnecessary_includes 
Remove unnecessary includes
 2018-07-30 16:40:57 +02:00
Andreas Lauser
ac2bc410f3 adapt to the fluid system naming convention change in opm-material 
note that almost the only thing which is affected is legacy code.
 2018-07-27 12:54:02 +02:00
Markus Blatt
019835b123 Added support for red-black ordering to ILUn. 2018-07-20 14:43:40 +02:00
Markus Blatt
865a690243 Allow usage of red-black ILU0. 
We introduced two runtime parameters for this: ilu_redblack and
ilu_reorder_spheres. If the last one is false, we try to preserve
the ordering within in the colors. Otherwise we try to achieve a D2
(alternative diagonal) ordering.
 2018-07-20 14:43:40 +02:00
Markus Blatt
190272e21d Added two alternatives for reordering based on colors 2018-07-20 14:43:40 +02:00
Markus Blatt
3953b20215 Also return the number of vertices for each color from Welsh-Powell-Algorithm. 2018-07-20 14:43:40 +02:00
Markus Blatt
a1650a58f4 Added Welsh Powell graph coloring 2018-07-20 14:43:40 +02:00
Markus Blatt
43c1714478 Added various other variants of MILU. 
These versions are inspired by the ones used in SuperLU and the enums
to choose them have simuilar names, but without leading S (MILU_1-MILU_3).

The following variants are supported (chosen by the enum MILU_VARIANT):
ILU: plain ILU
MILU_1:  lump diagonal with dropped row entries.
MILU_2:  lump diagonal with the sum of the absolute values of the dropped row
         entries.
MILU_3: if diagonal is positive add sum of dropped row entrires. Otherwise substract them.
MILU_4: if diagonal is positive add sum of dropped row entrires. Otherwise do nothing
 2018-07-20 14:43:40 +02:00
Markus Blatt
63058559bc Added various other variants of MILU. 
These versions are inspired by the ones used in SuperLU and the enums
to choose them have simuilar names, but without leading S (MILU_1-MILU_3).

The following variants are supported (chosen by the enum MILU_VARIANT):
ILU: plain ILU
MILU_1:  lump diagonal with dropped row entries.
MILU_2:  lump diagonal with the sum of the absolute values of the dropped row
         entries.
MILU_3: if diagonal is positive add sum of dropped row entrires. Otherwise substract them.
MILU_4: if diagonal is positive add sum of dropped row entrires. Otherwise do nothing
 2018-07-20 14:42:46 +02:00
Markus Blatt
e0a138e23c [MILU] Add dropped elements only to diagonal. 
We did add the dropped matrix blocks to the diagonal blocks,
but this is not MILU where oone only modifies the diagonal.
With this patch we fix this behaviour and now only modify the
diagonal of the diagonal block.
 2018-07-20 14:42:46 +02:00
Markus Blatt
0bae240a42 Allow user to choose modified ILU0 decomposition. 
Using the parameter ilu_milu=true|false (default=false) the user can now choose
to use the modified ILU0 decomposition. If selected values will
not be dropped for nonzero entries but added to the diagonal of U.
This approach will result in A*e = L*U*e for vector e with all entries
beging 1.
 2018-07-20 14:42:46 +02:00
Markus Blatt
e1e289dc1e Added MILU0 decomposition 2018-07-20 14:42:46 +02:00
Arne Morten Kvarving
1b44ba751a FlowMainEbos: only need the interface for blackoil newton iterations 2018-07-12 11:39:31 +02:00
Arne Morten Kvarving
57ddd9dc05 FlowMainEbos: remove unused includes 2018-07-12 10:12:13 +02:00
Arne Morten Kvarving
ab4d0e63af BlackOilModelEbos: remove unused include 2018-07-12 10:12:13 +02:00
Andreas Lauser
7f8120d609 flow: do not set the ExportGlobalTransmissibility property anymore 
this has not been required anymore since the output code was moved to
the ebos core.
 2018-07-11 13:49:17 +02:00
Arne Morten Kvarving
4fe6ac5bab
Merge pull request #1531 from andlaus/better_well_API 
use a raw pointer to specify the auxiliary module for wells
 2018-07-10 13:26:33 +02:00
Joakim Hove
b4fa06f305 Mark keyword ACTIONX as not supported 2018-07-10 09:37:25 +02:00
Andreas Lauser
ccd0da2e4c use a raw pointer to specify the auxiliary module for wells 
this is necessiated by the replacement of `std::shared_ptr` by raw
pointers for the eWoms auxiliary equation infrastructure. Note that by
default `flow` will *not* create an auxiliary equation module because
it modifies the operator that is used by the linear solver instead.
 2018-07-09 12:14:43 +02:00
Tor Harald Sandve
4a2780d161 split close wells from close connection 2018-07-03 15:13:30 +02:00
Tor Harald Sandve
a5f5581441 Fix more minor issues based on review 2018-07-03 14:07:53 +02:00
Tor Harald Sandve
6606bb75b2 Minor fix based on code review 2018-06-29 13:33:56 +02:00
Tor Harald Sandve
d769e7649a Name completion and connection consistently 2018-06-28 13:47:10 +02:00
Tor Harald Sandve
834f680587 Add support for COMPLUMP in WECON and WTEST 2018-06-28 13:28:30 +02:00
Tor Harald Sandve
22755cc257 Add support for combination of multi-segmented wells and WTEST 2018-06-28 10:16:29 +02:00
Tor Harald Sandve
3e53ed6386 implement WTEST support 2018-06-28 10:16:29 +02:00
Joakim Hove
7568ec0f90
Merge pull request #1519 from joakim-hove/completion-refactor 
Completion refactor
 2018-06-28 09:58:51 +02:00
Tor Harald Sandve
b1e03d5196
Merge pull request #1523 from atgeirr/fix-currentDateTime 
Cast argument for milliseconds() call to an integer.
 2018-06-28 07:51:53 +02:00
Andreas Lauser
c794028bcf flow: fix the time held by the simulator object 2018-06-27 12:13:50 +02:00
Atgeirr Flø Rasmussen
53e46ca017 Cast argument for milliseconds() call to an integer. 
Apparently required by boost::posix_time::milliseconds.
 2018-06-27 11:11:27 +02:00
Joakim Hove
514cdc574c Completion refactor 2018-06-26 12:30:54 +02:00
Atgeirr Flø Rasmussen
576612c4b2 Rename .CASE.DEBUG -> CASE.DBG. 2018-06-25 22:22:29 +02:00
Alf Birger Rustad
e72ef6bcc7 Reduce default number of threads from four to two with OpenMP 2018-06-24 21:51:04 +02:00
Joakim Hove
06149a3b05
Merge pull request #1500 from joakim-hove/rename-completion-set 
Refactor of connections & completions
 2018-06-21 08:13:56 +02:00
Joakim Hove
94d57f686c Refactor of connecrions & completions 2018-06-20 11:51:00 +02:00
Tor Harald Sandve
a255f8cc6f
Merge pull request #1497 from andlaus/pass_async_output_param 
Pass the async_output parameter to core ebos
 2018-06-20 10:38:14 +02:00
Markus Blatt
1bd735428f Deactivate selection of CPR via eclipse keyword 
as this preconditioner is still considered experimental
and fails miserably for some models. Users can select
CPR using the command line.
 2018-06-15 15:34:01 +02:00
Andreas Lauser
830c119362 Pass the async_output to core ebos 
this was forgotten when moving the output writing code into the ebos
core. (this does not really matter for most people because
asynchronous output is wanted anyway and it was unconditionally
enabled.)
 2018-06-15 11:44:07 +02:00
Joakim Hove
bd57d574d3 Rename Completion -> Connection 2018-06-11 17:23:28 +02:00
Andreas Lauser
5a9b81db33 remove the hasDisgas and hasVapoil arguments from SimulatorFullyImplicitBlackoilEbos 
They seemed to be unused already. I suspect that were only there for
API compatibility reasons.
 2018-06-06 10:59:42 +02:00
Andreas Lauser
37b6a540af remove BlackoilOutputEbos 
after the actual output writing code has been moved to core ebos, this
was just a unnecessary glue layer for API compatibility.
 2018-06-06 10:59:41 +02:00
Andreas Lauser
dfbc24b35f flow: avoid wrangling around with dummy state objects 
these objects are only used by flow_legacy, so not having to deal with
them anymore lets non-legacy flow avoid to jump through a lot of hoops
for the sake of having a common API.

this required a fork of the NonlinearSolver and AdaptiveTimeStepping
classes. this is not a problem because the original classes would get
pruned to look like the new ones once flow_legacy gets moved out of
the opm-simulators module.
 2018-06-06 10:59:41 +02:00
Kai Bao
1b587fa118 removing some whitespaces 2018-06-05 09:24:50 +02:00
kel85uk
e560242a19 Resolved conflicts by taking changes from pull request 2018-06-04 16:33:34 +02:00
kel85uk
1237724c9a Cleans up the BlackoilModelEbos.hpp file to address the final comments. 2018-06-04 15:28:58 +02:00
kel85uk
963d42aab3 Corrects the whitespace again for blackoilmodelebos.hpp 2018-06-04 15:28:57 +02:00
kel85uk
b7fbe66c91 Cleans up the Aquifer model classes. 2018-06-04 15:28:56 +02:00
kel85uk
2fe24e16cf Adds the influx coefficient multipler to the face area fraction calculation. Also removes more unnecessary variables and reordered initialization list to prevent ordering warnings in gcc compiler 2018-06-04 15:28:54 +02:00
kel85uk
1a33e81d9c Cleans up the code and removes unused functions 2018-06-04 15:28:53 +02:00
kel85uk
0df51a8797 Implements the correct check for aquifer face connections to make sure face is connected to the boundary 2018-06-04 15:28:52 +02:00
kel85uk
d8f8646452 Removes Eigen from interpolation of influence tables 2018-06-04 15:28:51 +02:00
kel85uk
e2513038c4 Implemented initialization procedure. 2018-06-04 15:28:49 +02:00
kel85uk
89255da464 Working aquifer object with equations implemented. Still need to do initialization solve. 2018-06-04 15:28:48 +02:00
kel85uk
ac7204fb2b Working and building skeleton which works for multiple aquifers. Also gets the properties of the aquifers using AQUCT keyword. 2018-06-04 15:28:47 +02:00
kel85uk
5a87818bb2 First addition of the class BlackoilAquiferModel. 2018-06-04 15:28:46 +02:00
Tor Harald Sandve
e128dc7e87
Merge pull request #1478 from GitPaean/adding_control_equations 
Adding well control equations
 2018-06-04 15:12:31 +02:00
Kai Bao
477740ca38 introducing aquiferActive() to reduce of the overhead 
for the models that does not include a aquifer model.
 2018-05-31 09:51:54 +02:00
Kai Bao
cb9fea6ba0 changing GTotal to WQTotal for StandardWell 2018-05-30 15:44:05 +02:00
Joakim Hove
dd3fb03286 THPRES API updates 2018-05-30 14:27:32 +02:00
kel85uk
677255055d Cleans up the BlackoilModelEbos.hpp file to address the final comments. 2018-05-30 14:26:07 +02:00
kel85uk
e99fb80ce3 Corrects the whitespace again for blackoilmodelebos.hpp 2018-05-30 14:21:32 +02:00
kel85uk
7f2c2444f0 Cleans up the Aquifer model classes. 2018-05-30 14:21:30 +02:00
kel85uk
2170a00b21 Adds the influx coefficient multipler to the face area fraction calculation. Also removes more unnecessary variables and reordered initialization list to prevent ordering warnings in gcc compiler 2018-05-30 14:21:28 +02:00
kel85uk
8d3d7ccc2f Cleans up the code and removes unused functions 2018-05-30 14:21:24 +02:00
kel85uk
ec680664fd Implements the correct check for aquifer face connections to make sure face is connected to the boundary 2018-05-30 14:21:22 +02:00
kel85uk
0d55b7aace Removes Eigen from interpolation of influence tables 2018-05-30 14:21:21 +02:00
kel85uk
7e1bb457cd Implemented initialization procedure. 2018-05-30 14:21:19 +02:00
kel85uk
5ca8bb676d Working aquifer object with equations implemented. Still need to do initialization solve. 2018-05-30 14:21:17 +02:00
kel85uk
ae22d18e20 Working and building skeleton which works for multiple aquifers. Also gets the properties of the aquifers using AQUCT keyword. 2018-05-30 14:21:14 +02:00
kel85uk
10e896fa6b First addition of the class BlackoilAquiferModel. 2018-05-30 14:21:10 +02:00
Joakim Hove
e09c86c5bf Mark keyword GNETINJE as not supported 2018-05-29 16:48:55 +02:00
Kai Bao
53ab8bc132 lowering the singular limit for the invertMatrix function. 
to avoid failure due to singularity detection.
 2018-05-29 09:36:55 +02:00
Kai Bao
97c51a7d02 addressing some comments 
and handle the situation that a non-zero target specified for a
non-producing phases. We set the rates to zero for this case.
 2018-05-28 16:05:02 +02:00
Kai Bao
ce849fe18e adding a fix for the zero rate control for StandardWell 
to avoid under-determined problem.
 2018-05-28 16:05:02 +02:00
Kai Bao
efbac8a628 adding function updateThp() to StandardWell 
hopefully, to improve the readability.
 2018-05-28 16:05:02 +02:00
Kai Bao
f3f096dbbb recovering some unecessary changes. 
PR #1477 introduced different ways to improve the WellState initialization.
Basically, the WellState initialization will be something challenging to
handle along with the improvement of the well model.
 2018-05-28 16:05:02 +02:00
Kai Bao
18917b81f4 adding THP well control equation 2018-05-28 16:05:02 +02:00
Kai Bao
b2bace449e adding function processFractions() 
to reduce the length of the function updatePrimaryVariablesNewton()
 2018-05-28 16:05:02 +02:00
Kai Bao
e2e24ec355 adding the checking of tolerance of well control equation 2018-05-28 16:05:02 +02:00
Kai Bao
179a03144f more bug fixing 
mainly to recover the runnign related to group control example
 2018-05-28 16:05:02 +02:00
Kai Bao
1d218d2fe4 small bug fixes. 2018-05-28 16:05:02 +02:00
Kai Bao
3b70f5004f adding assembleControlEq to StandardWell 
solvent model needs to be handled for the injector control.
 2018-05-28 16:05:02 +02:00
Kai Bao
62947c85b9 updating updatePrimaryVariablesNewton with new primary variables. 2018-05-28 16:05:02 +02:00
Kai Bao
6066884a3d refactoring updateWellState in StandardWell to be two functions 
for other use.
 2018-05-28 16:05:02 +02:00
Kai Bao
eb851b6580 adding BHP to the primary variables for StandardWell 2018-05-28 16:05:02 +02:00
Joakim Hove
a0538ff4bb
Merge pull request #1470 from joakim-hove/use-restart-value 
Use RestartValue when saving eclipse output
 2018-05-18 08:58:28 +02:00
Joakim Hove
c76898d0c9 Use RestartValue when saving eclipse output 2018-05-15 16:56:03 +02:00
Tor Harald Sandve
2534cc46db WIP fix vfp in flow 2018-05-15 10:24:50 +02:00
Andreas Lauser
483e04c5da
Merge pull request #1471 from totto82/implement_blackoil_energy_PR 
Add blackoil + energy specialization to Flow
 2018-05-08 11:30:12 +02:00
Kai Bao
45023f304e
Merge pull request #1465 from atgeirr/fix-ilu-serial 
Make sure we (re-)throw MatrixBlockError also in the serial case.
 2018-05-08 10:39:15 +02:00
Tor Harald Sandve
54c8a48481 code clean-up based on review 2018-05-08 10:22:47 +02:00
Tor Harald Sandve
f00ad22d98 Fix thermal debug run 2018-05-02 09:15:52 +02:00
Tor Harald Sandve
ee88790dea Add a flow specialization for blackoil with energy conservation 
The energy conservation is enabled by specifying either TEMP or
THERMAL in the deck. The deck also needs to contatin relevant fluid and rock
heat properties.

The blackoil + energy equations are solved fully implicit.
 2018-04-30 13:45:18 +02:00
Tor Harald Sandve
dee7d97b8f
Merge pull request #1464 from totto82/fixilu 
keep using the block inversion algorithm in OPM
 2018-04-24 15:18:17 +02:00
Atgeirr Flø Rasmussen
f9c1fbcbe6 Make sure we (re-)throw MatrixBlockError also in the serial case. 2018-04-24 14:32:43 +02:00
Tor Harald Sandve
f66fb298db keep using the block inversion algorithm in OPM 2018-04-24 11:25:33 +02:00
Joakim Hove
e012363abc
Merge pull request #1462 from GitPaean/fixing_vfp_running_2 
adapting to the interface change of VFP related in parser.
 2018-04-23 16:30:11 +02:00
Joakim Hove
8965fc3138
Merge pull request #1460 from lars-petter-hauge/restart_timestep 
Only load wells that have simulated data
 2018-04-23 12:21:58 +02:00
Arne Morten Kvarving
25fda55778 bring banners into the new ssl enabled world 2018-04-20 11:31:15 +02:00
Kai Bao
78cc2b8ca4 adapting to the interface change of VFP related in parser. 2018-04-20 11:29:22 +02:00
Lars Petter Øren Hauge
0ea2b9afe2 Only load wells that have simulated data 
Wells that are added at the same time step as RESTART is initiated will
not be present in a restart file. Use the previous time step to retrieve
wells
 2018-04-17 14:09:11 +02:00
Arne Morten Kvarving
351c495388 fixed: pass by reference as intended 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
33d2095b07 initialize variable 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
4933c10035 reduce scope of variable 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
ee57c82834 changed: mark constructors explicit 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
fddad72a3e fixed: quell signed/unsigned comparison warning 2018-04-13 11:25:10 +02:00
Atgeirr Flø Rasmussen
63dabb4777
Merge pull request #1450 from GitPaean/update_VFP_related 
adapting to the change related to VFP from the parser.
 2018-04-12 11:20:21 +02:00
Kai Bao
ed49fd1e88 adapting to the change related to VFP from the parser. 2018-04-11 09:22:52 +02:00
Andreas Lauser
55093b4918 adapt to the removal of the ewoms/aux directory 2018-04-10 10:17:31 +02:00
Arne Morten Kvarving
e163c97fc2
Merge pull request #1441 from totto82/fix_co2case 
Some minor fixes to RESV and initial well composition
 2018-04-09 14:30:41 +02:00
Andreas Lauser
3924bb1e6e explicitly disable all extensions supported by black oil model for the base simulator 
this should not really be necessary because they are supposed to be
disabled by default, but it makes things a bit more explicit
 2018-04-06 11:01:33 +02:00