Atgeirr Flø Rasmussen
96938548c1
Merge pull request #603 from atgeirr/remove-unused-parameter
...
Adapt to removed init() parameter.
2016-03-04 11:22:08 +01:00
Atgeirr Flø Rasmussen
f7f18c70bb
Merge pull request #604 from atgeirr/minor-fixes
...
Fix minor initialization and overriding bugs.
2016-03-04 11:21:09 +01:00
Atgeirr Flø Rasmussen
a19607fabc
Merge pull request #593 from qilicun/integrate_diagnostics
...
integrate relperm diagnostics into flow.
2016-03-04 09:49:10 +01:00
Atgeirr Flø Rasmussen
7bfa8f405e
Fix bug in overriding method.
2016-02-29 11:18:51 +01:00
Atgeirr Flø Rasmussen
b0b42d7dc7
Add missing initializer for 'singlePrecision'.
2016-02-29 11:17:54 +01:00
Atgeirr Flø Rasmussen
6dd3f0ebb3
Adapt to removed init() parameter.
2016-02-29 11:05:35 +01:00
Bård Skaflestad
37a701430d
Merge pull request #600 from jokva/fix-header-parser-695
...
Add missing opm-parser headers
2016-02-26 07:12:56 -06:00
Jørgen Kvalsvik
6ae1613765
Add missing opm-parser headers
...
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2016-02-26 11:56:44 +01:00
Bård Skaflestad
1237251ee4
Merge pull request #599 from joakim-hove/state-updates
...
PolymerState changes
2016-02-24 07:31:37 -06:00
Joakim Hove
7ddd1c1c80
PolymerState changes
...
- The PolymerState class will derive from SimulatorState, instead of
containing a TwoPhaseState instance.
- The Polymer calculation methods take PolymerState& input argument
instead of TwoPhaseState&
2016-02-22 18:42:13 +01:00
Atgeirr Flø Rasmussen
95c645cc72
Merge pull request #598 from andlaus/allow_temperature_to_default
...
BlackoilPropsAdFromDeck: allow the AutoDiffBlock which represents temperature to be empty
2016-02-22 17:09:06 +01:00
Andreas Lauser
7c3020822a
properly create state.temperature in the FullyImplicitCompressiblePolymerSolver class
2016-02-22 15:16:44 +01:00
Bård Skaflestad
db86c367d5
Merge pull request #597 from andlaus/fix_deprecation_warnings
...
fix the deprecation warnings caused by OPM/opm-parser#687
2016-02-21 18:09:48 -06:00
Andreas Lauser
099c958137
fix the deprecation warnings caused by OPM/opm-parser#687
2016-02-21 17:45:56 +01:00
Joakim Hove
dff635e7b9
Merge pull request #579 from jokva/unique-auto-deck
...
Change Deck access methods/types to references
2016-02-19 13:36:06 +01:00
Joakim Hove
a9262e4574
Set abs_diff limit for restart_test to 1e-2
2016-02-19 13:00:27 +01:00
Jørgen Kvalsvik
19e41bd246
Change Deck access methods/types to references
...
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.
https://github.com/OPM/opm-parser/pull/677
2016-02-19 11:55:19 +01:00
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
Liu Ming
b15320b659
change diagnostics function call order.
2016-02-19 16:40:45 +08:00
Liu Ming
fe06257f27
rename LOG to PRT file.
2016-02-19 16:23:31 +08:00
Atgeirr Flø Rasmussen
319960dbda
Merge pull request #592 from blattms/distribute_threshold_pressure
...
Fixes the exception for models with threshold pressures.
2016-02-19 08:49:37 +01:00
Joakim Hove
f5694ffe57
Merge pull request #594 from joakim-hove/fix-restart-test
...
Fix restart test
2016-02-19 08:06:55 +01:00
Joakim Hove
95752bcd97
Added absolute eps for comparison.
2016-02-19 07:42:38 +01:00
Joakim Hove
d1b30f4f48
Changed wording: relative -> absolute
2016-02-19 07:41:53 +01:00
chflo
d7c5c30314
Changed numeric limits for restart test failure
2016-02-19 07:39:41 +01:00
Liu Ming
66cde4e052
integrate relperm diagnostics into flow.
2016-02-19 12:45:23 +08: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
Atgeirr Flø Rasmussen
8bc9789556
Merge pull request #585 from blattms/fix-opm-matrix-dune-2.4
...
Account for variable change in 2.4.1
2016-02-16 21:09:23 +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
23036e8096
Merge remote-tracking branch 'upstream/master' into PR/fast-sparse-add
2016-02-16 15:25:10 +01:00
Robert Kloefkorn
9661973387
Also check outer ptr.
2016-02-16 15:24:52 +01:00
Atgeirr Flø Rasmussen
a6c8db34e0
Merge pull request #584 from jepebe/travis
...
Added Travis support
2016-02-16 11:05:54 +01:00
Robert Kloefkorn
4df4c9147a
fastSparseProduct.hpp --> fastSparseOperations.hpp
2016-02-16 10:25:57 +01:00
Robert Kloefkorn
743fad877a
remove unused typedef.
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
Atgeirr Flø Rasmussen
704603e2b2
Merge pull request #578 from dr-robertk/PR/amg-for-interleaved
...
AMG for Interleaved solver and other goodies.
2016-02-16 10:15:55 +01:00
Jean-Paul Balabanian
5b313aff76
Added Travis support
2016-02-15 16:06:50 +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