Atgeirr Flø Rasmussen
af2455fdbe
Merge pull request #590 from dr-robertk/PR/bugfix-in-backup-restore
...
Bugfix in backup/restore.
2016-02-19 11:37:57 +01:00
Markus Blatt
c0b871a38a
Improves NNC error message.
2016-02-18 22:05:01 +01:00
Markus Blatt
51b8d9acb1
Fixes the exception for models with threshold pressures.
...
Since the support for threshold pressures running Norne with
flow_mpi aborted error messages like
```
Program threw an exception: [/home/mblatt/DUNE-test/opm-autodiff/opm/autodiff/BlackoilModelBase_impl.hpp:383] Illegal size of threshold_pressures input ( 153924 ), must be equal to number of faces + nncs ( 78316 + 0 ).
```
This commit now distributes the threshold pressures (if present) just like the rest
of the model properties and Norne does not abort here any more.
Please note:
1. If there are NNCs flow_mpi will abort with an error.
2. We might want to resort to reading and calculating the threshold pressure
(and maybe other properties) on distributed grids instead of using communication.
2016-02-18 17:00:08 +01:00
Atgeirr Flø Rasmussen
569df33ab2
Merge pull request #583 from totto82/solventSupportRegions
...
Support regions in the solvent model
2016-02-18 15:43:27 +01:00
Robert Kloefkorn
8b08be2b78
fastSparseAdd/Substruct: use operator += and -=.
2016-02-18 15:31:35 +01:00
Robert Kloefkorn
ce04e22399
BackupRestore: bugfix due to mixup of size_t and unsigned int.
2016-02-18 15:30:52 +01:00
Atgeirr Flø Rasmussen
8dfc8d82fc
Merge pull request #582 from dr-robertk/PR/fast-sparse-add
...
Fast sparse add.
2016-02-17 19:55:15 +01:00
Robert Kloefkorn
d001cac5b7
equalSparsityPattern: address nitpicks.
2016-02-17 15:59:34 +01:00
Robert Kloefkorn
bc71458d44
AutoDiffMatrix: added braces in operator += and -=.
2016-02-17 14:24:55 +01:00
Tor Harald Sandve
fd219dd544
Add whitespaces and comments to beautify the code
2016-02-17 10:43:01 +01:00
Markus Blatt
696dfc23ee
Account for variable change in 2.4.1
...
Due to the upcomming release the name changes (j->j_, nnz->nnz_)already appear
in 2.4.1. This commit now checks for 2.4.1 and newer instead of 3.0 and newer.
2016-02-16 19:17:27 +00:00
Robert Kloefkorn
75ffd897da
AutoDiffBlock: revert changes in operator /.
...
equalSparsityPattern: also include outer index in check.
2016-02-16 17:18:04 +01:00
Robert Kloefkorn
9661973387
Also check outer ptr.
2016-02-16 15:24:52 +01:00
Robert Kloefkorn
4df4c9147a
fastSparseProduct.hpp --> fastSparseOperations.hpp
2016-02-16 10:25:57 +01:00
Robert Kloefkorn
2eebf73e1a
computeWellFlux: use operator -= when possible.
2016-02-16 10:25:57 +01:00
Robert Kloefkorn
98c49fd52f
AutoDiffMatrix: use operator += to add matrices
2016-02-16 10:25:57 +01:00
Robert Kloefkorn
fadf5528e3
squash
2016-02-16 10:25:56 +01:00
Robert Kloefkorn
d5b6566e06
AutoDiffMatrix: use fastSparse{Add,Substract} when sparsisty patterns match.
2016-02-16 10:25:56 +01:00
Tor Harald Sandve
b02589316f
Add support for MISC regions
...
- element wise power operator impemented in AutoDiffBlock
- TL parameters are given pr cell
2016-02-15 14:44:14 +01:00
Tor Harald Sandve
9328bd5af5
Support pvt and saturation regions in SolventPropsAdFromDeck
2016-02-15 10:07:47 +01:00
Robert Kloefkorn
530c0fe57f
MatrixBlock: cleanup invert implementation to be less confusing.
2016-02-12 12:17:01 +01:00
Robert Kloefkorn
3aa8ed200f
NewtonBlackoilInterleaved: increase maximal allowed iteration to 75.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
37e49a62c8
BlackoilModelBase: use single precision for solver when dt < 20 days.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
e3b578d685
NewtonIterationBlackoilInterleaved: single precision can be used whether UMFpack is
...
there or not.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
4111797822
BlackoilModelBase: added parameter singlePrecision and print residual to large at right
...
place.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
915177979c
SimulatorBase: also show total time at each time step for performance comparison.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
82d508727f
MatrixBlock: added function firstmatrixelement.
...
NewtonBlackoilInterleaved: some cleanup and variable naming.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
783f158c93
NewtonBlackoilInterleaved: anable the use of AMG preconditioner.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
31812bd2f9
NewtonBlackoilInterleaved: add solver option for single precision.
2016-02-12 12:14:02 +01:00
Robert Kloefkorn
37dc877074
CPRPreconditioner: extract creation of AMG into a function.
2016-02-12 12:14:02 +01:00
Atgeirr Flø Rasmussen
eb228835c2
Merge pull request #577 from totto82/solventMiscible
...
Add miscible effects to the solvent model
2016-02-12 11:21:56 +01:00
Tor Harald Sandve
0a30d912e8
Some more cleanup adressing PR comments.
2016-02-12 11:02:03 +01:00
Tor Harald Sandve
dee96db6b2
Cleaning and adding comments
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
c85f10046c
Density and viscosity as inputs instead of computed in computeMassFlux
...
Density and viscosity are given as input instead of calculated inside
computeMassFlux. This allow for modifying the properties prior to
calling computeMassFlux which avoids code duplication in the solvent
implementation.
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
0745be3eba
Various bugfixes in computing effective ToddLongstaff parameters
...
The most significant bug was in the computation of effective saturation
fraction for the gas phase. The current implementation differs from the
manual.
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
cf29eb9aa4
Adapt to changes in the TableContainer
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
a38964c641
Some cleaning
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
13117153a9
Use effective properties in the computation of well segment densities
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
beafccc038
Refactor the ToddLongstaffModel in separate function
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
b8e20917cc
Add Todd and Longstaff model
...
Add method to calculateEffectiveProperties (viscosity and density)
using the Todd and Longstaff model.
The effective properties are stored in mu_eff_ and b_eff_ in the
BlackoilSolventModel and accessed using fluidReciprocFVF and
fluidViscosity
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
17554b4921
Add support for TLMIXPAR
...
Add support for Todd-Longstaff mixing paramters
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
38c8cd981e
BUGFIX. Fix surfaceDensity calculations
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
1e64409f28
Scaling of relative permeability endpoints by the miscibility function
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
bcb0abd9c9
Fix well input and prepare for critical saturations
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
e448548d5a
Some refactoring to avoid code duplication
...
computeMassFlux in BlackoilSolventModel_impl.hpp is refactored to avoid
code duplication
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
238e7c19f3
Add support for miscibilty in the relperms
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
bbee43ef7a
Refactor computeMassFlux in the SolventModel
...
The computeMassFlux in the solventModel is refactored to allow for
modification of relperms for all phases.
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
3d2b7f23c0
Read MSFN and SOF2 and create accociated function
...
- makeAD() is added to avoid copying
2016-02-12 10:42:26 +01:00
Atgeirr Flø Rasmussen
3b294beb51
Merge pull request #575 from dr-robertk/PR/make-compile-with-current-master
...
DuneMatrix: adjust to changes in dune 3.0
2016-02-12 10:23:40 +01:00
Atgeirr Flø Rasmussen
885e3aa561
Merge pull request #576 from andlaus/opm-material_PVT
...
use the blackoil PVT classes from opm-material instead of the opm-core ones
2016-02-11 22:39:38 +01:00