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
3,734 Commits 24 Branches 102 Tags
80b8b5f12ff68f8661b3957fd0db7e5c83bb50bb
Commit Graph

3734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
80b8b5f12f Merge pull request #737 from atgeirr/sequential 
Experimental sequential solvers
 2016-06-27 11:38:13 +02:00
Atgeirr Flø Rasmussen
7489f15ee9 Add sequential models for black oil. 
This commit adds sequential solvers, including a simulator variant
using them (flow_sequential.cpp) with an integration test (running
SPE1, same as for fully implicit).

The sequential code is capable of running several (but not all) test
cases without tuning or special parameters, but reducing ds_max a bit
(from default 0.2 to say 0.1) helps with transport solver
convergence. The Norne model runs fine (esp. with a little tuning). A
parameter iterate_to_fully_implicit (defaults to false) is available,
when set the simulator will iterate with alternating pressure and
transport solves towards the fully implicit solution. Although that
takes a lot extra time it serves as a correctness check.

Performance is not competitive with fully implicit at this point:
essentially both the pressure and transport models inherit the fully
implicit model and do a lot of double (or triple) work. The point has
been to establish a proof of concept and baseline for further
experiments, without disturbing the base model too much (or at all, if
possible).

Changes to existing code has been minimized by merging most such
changes as smaller PRs already, the only remaining such change is to
NewtonIterationBlackoilInterleaved. Admittedly, that code (to solve
the pressure system with AMG) is not ideal because it duplicates
similar code in CPRPreconditioner.hpp and is not parallel. I propose
to address this later by refactoring the "solve elliptic system" code
from CPRPreconditioner into a separate class that can be used also
from here
 2016-06-27 10:28:09 +02:00
Atgeirr Flø Rasmussen
c1e5a64329 Merge pull request #712 from totto82/fix_2p_equil_init 
Allow for 2 phase initialization using EQUIL
 2016-06-24 14:42:54 +02:00
Joakim Hove
7649e43145 Merge pull request #736 from pgdr/add-tops-to-test-deck 
Added TOPS keyword to test deck
 2016-06-22 08:24:51 +02:00
Atgeirr Flø Rasmussen
ffd96c08e5 Merge pull request #733 from GitPaean/adding_MSW_test 
adding a test for flow_multisegment
 2016-06-21 16:59:03 +02:00
Pål Grønås Drange
0f8b472531 Added TOPS keyword to test deck 2016-06-21 16:30:40 +02:00
Kai Bao
d27524c3a7 adding a test for flow_multisegment 
it is a 2D case with H__ pressure drop specification, and it takes about
2 second to run.
 2016-06-21 14:43:11 +02:00
Atgeirr Flø Rasmussen
79d000812e Merge pull request #735 from atgeirr/fix-mseg-wells 
Clone the Wells pointer for output use later.
 2016-06-21 13:44:55 +02:00
Atgeirr Flø Rasmussen
e7c70ddb71 Clone the Wells pointer for output use later. 2016-06-21 12:00:10 +02:00
Atgeirr Flø Rasmussen
82d0c81c13 Merge pull request #730 from atgeirr/add-store-fluxes 
Changes to well model for supporting sequential approach.
 2016-06-20 22:46:35 +02:00
Joakim Hove
efa9a604a8 Merge pull request #723 from jokva/deprecate-wellptr 
Well shared_ptr alias deprecated
 2016-06-20 14:57:02 +02:00
Atgeirr Flø Rasmussen
ba9e599ec7 Use 'Vector' in place of 'V'. 2016-06-20 14:08:00 +02:00
Atgeirr Flø Rasmussen
9c0ffee8e9 Changes to well model for supporting sequential approach. 
The changes are:
 - Make the WellOps struct public (needed by transport solver).
 - Make it possible to store and retrieve total reservoir volume
   perforation fluxes with getStoredWellPerforationFluxes(), controlled
   by a flag set by setStoreWellPerforationFluxesFlag(), defaulting to
   false (needed by pressure solver).
 2016-06-20 11:02:49 +02:00
Atgeirr Flø Rasmussen
6dfd5ec63d Merge pull request #729 from atgeirr/refine-nonlinear-solver-interface 
Refine nonlinear solver interface
 2016-06-17 12:37:15 +02:00
Atgeirr Flø Rasmussen
b811ec7715 Merge pull request #728 from atgeirr/improve-solverselection 
Refine setting of (linear) solver_approach.
 2016-06-17 12:23:19 +02:00
Atgeirr Flø Rasmussen
f1af4f945c Make variable const. 2016-06-17 11:48:04 +02:00
Atgeirr Flø Rasmussen
82e935d92b Merge pull request #727 from atgeirr/use-update-stabilization 
Add use_update_stabilization parameter.
 2016-06-17 11:40:09 +02:00
Atgeirr Flø Rasmussen
d29355d17d Remove unneeded (implicit) template argument. 2016-06-17 11:39:00 +02:00
Atgeirr Flø Rasmussen
19f4cef6c1 Add new step() overload taking initial states separately. 2016-06-17 11:14:32 +02:00
Atgeirr Flø Rasmussen
fab64f5afb Add non-const overload of model(). 2016-06-17 11:14:21 +02:00
Atgeirr Flø Rasmussen
d8390590f8 Refine setting of (linear) solver_approach. 
Ensure that the parameter is printed also if defaulted.
 2016-06-17 11:00:56 +02:00
Atgeirr Flø Rasmussen
3776ccab9e Add use_update_stabilization parameter. 
This makes it easier to run without, for example for debugging.
The default is 'true', preserving existing behaviour.
 2016-06-17 10:44:53 +02:00
Atgeirr Flø Rasmussen
6fed5a50c3 Merge pull request #726 from atgeirr/const-preparestep 
Use const reference parameters for prepareStep()
 2016-06-17 09:21:27 +02:00
Atgeirr Flø Rasmussen
b21f4e16da Merge pull request #725 from atgeirr/add-to-helperops 
Add connection_cells member of HelperOps.
 2016-06-17 09:03:26 +02:00
Atgeirr Flø Rasmussen
194288865b Fix forgotten prepareStep() signatures. 2016-06-17 08:41:12 +02:00
Atgeirr Flø Rasmussen
bf5fecfe9a Make prepareStep() parameters const. 2016-06-17 08:41:02 +02:00
Atgeirr Flø Rasmussen
5f51fea874 Add connection_cells member of HelperOps. 2016-06-16 16:21:37 +02:00
Joakim Hove
d6b3650160 Merge pull request #724 from jokva/eclipse-writer-nnc-constructor 
Pass NNC to OutputWriter constructor
 2016-06-16 15:56:14 +02:00
Jørgen Kvalsvik
dfac3adaea Pass NNC to OutputWriter constructor 
Keep up with an interface change in opm-output.
 2016-06-16 13:34:29 +02:00
Jørgen Kvalsvik
ef51e9a2eb Well shared_ptr alias deprecated 
The shared_ptr aliasing is deprecated, and in the Well case this has
been removed upstream.
 2016-06-16 10:01:04 +02:00
Atgeirr Flø Rasmussen
691969eb86 Merge pull request #721 from qilicun/minor-format-change 
Add blank line before and after "Reading Parameters"
 2016-06-16 08:57:55 +02:00
Liu Ming
49fbf5e493 document function and switch implementation. 2016-06-16 14:02:34 +08:00
Liu Ming
8224e7cef9 switch function calling order. 2016-06-16 09:48:39 +08:00
Atgeirr Flø Rasmussen
77562c8cbb Merge pull request #718 from akva2/move_opm_output_upstream 
update jenkins build scripts
 2016-06-15 15:12:16 +02:00
Liu Ming
936cd8dc33 Add separate function for setup logging. 2016-06-15 15:24:05 +08:00
Joakim Hove
9c146eb611 Merge pull request #719 from joakim-hove/travis-reorg 
Using build-all travis configuration.
 2016-06-13 10:29:09 +02:00
Liu Ming
969ce5ca53 add blank line before and after "Reading Parameters" 2016-06-13 13:43:50 +08:00
Joakim Hove
56574d529a Using build-all travis configuration. 2016-06-10 13:52:16 +02:00
Arne Morten Kvarving
07ef957352 update jenkins build scripts 
update build order, opm-output moved in the dependency tree
 2016-06-10 13:29:21 +02:00
Joakim Hove
dd5d9b34a2 Merge pull request #688 from jokva/refactor-output-restart 
Breaking opm-core dependency in opm-output; new summary implementation
 2016-06-10 13:15:46 +02:00
Atgeirr Flø Rasmussen
a8760654f7 Merge pull request #717 from qilicun/use-prefix 
use default prefix.
 2016-06-10 11:19:54 +02:00
Liu Ming
8f04300ce3 use default prefix. 2016-06-10 09:27:49 +02:00
Atgeirr Flø Rasmussen
ccde26143c Merge pull request #709 from qilicun/add-new-type 
Support new message type: Prtinfo
 2016-06-08 11:35:31 +02:00
Tor Harald Sandve
d1d3b86299 Allow for 2 phase initialization using EQUIL 2016-06-08 09:22:52 +02:00
Liu Ming
7ca182f962 change Prtinfo to Note. 2016-06-08 09:18:10 +02:00
Atgeirr Flø Rasmussen
e861c495b8 Merge pull request #710 from blattms/use-real-parallel-l-infinity-norm 
Fix the parallel L-infinity norm calculation.
 2016-06-07 20:30:43 +02:00
Markus Blatt
82d6d949db Fix the parallel L-infinity norm calculation. 
It was computing a global maximum before, which obviously is not the same thing.
 2016-06-07 15:10:25 +02:00
Atgeirr Flø Rasmussen
5d38c77881 Merge pull request #707 from blattms/support-ignoreconvergencefailure-for-cpr 
Make CPR preconditioner honor linear_solver_ignoreconvergencefailure
 2016-06-07 14:13:52 +02:00
Liu Ming
b2c126f7c2 Support new message type: Prtinfo 2016-06-07 14:11:24 +02:00
Markus Blatt
82556ca1d0 Fix uninitialized value 2016-06-07 12:40:24 +02:00