Commit Graph
3536 Commits
Author SHA1 Message Date
Liu Ming dcd12f052a rename ParseMode as ParseContext. 2016-03-17 09:57:59 +08:00
Liu Ming 91a4346a27 rename ParseMode in examples folder. 2016-03-17 09:46:12 +08:00
Liu Ming debf039175 rename ParseMode as ParseContext. 2016-03-17 08:55:52 +08:00
Tor Harald Sandve 753909b8b9 Fix convergence issues for negative relperm endpoints.
The relative permeabilty endpoints are scaled by the miscibility
function. The endpoints is not supposed to be negative therefore all
negative values are replaced by zero.
2016-03-16 11:04:56 +01:00
Tor Harald Sandve 41aa55ec82 Allow for shut wells in solvent run 2016-03-16 11:00:00 +01:00
Atgeirr Flø Rasmussen a3ae13b892 Merge pull request #612 from qilicun/enable-solvent-diagnostics
enable relperm diagnostics for solvent model.
2016-03-16 10:32:18 +01:00
Joakim Hove c17ffbb111 Merge pull request #614 from qilicun/use-prtlog
use EclipsePRTLog.
2016-03-15 08:29:35 +01:00
Liu Ming f0a2959a6d use EclipsePRTLog. 2016-03-15 09:43:18 +08:00
Liu Ming b4b821521e enable relperm diagnostics for solvent model. 2016-03-10 14:41:10 +08:00
Atgeirr Flø Rasmussen 77ea648e6a Merge pull request #610 from GitPaean/performance_multisegment
adding flag to wops_ms_ to indicate if MSW is involved.
2016-03-09 12:54:30 +01:00
Kai Bao 8115d918dd adding flag to wops_ms_ to indicate if MSW is involved.
to reduce some extra cost when MSW is not involved.
2016-03-09 11:20:16 +01:00
Andreas Lauser bf283f8684 threshold pressures: consider the saturated case and fix a typo
the typo was caused the surface density of the oil phase to be used
instead of the one of gas. This caused the density to be off by a
factor of typically about 900.

using saturated FVFs does not change much, but it does not hurt
because it is also done that way in the simulator.

This makes the defaults for the threshold pressures reasonable again,
but for some reason they are not exactly the same as in the old
implementation. (although the differences are very tolerable.)

On the question why only "Model 2" is affected by this: the other
decks don't use threshold pressures (SPE-X) or do not default any
values (Norne).
2016-03-08 14:52:09 +01:00
Atgeirr Flø Rasmussen d75516a705 Merge pull request #609 from totto82/powADB
Add power method for general f^g in the AutoDiffBlock
2016-03-08 11:15:00 +01:00
Tor Harald Sandve 35b34f1b3a Add pow() for constant base raised to variable exponent in AutoDiffBlock
- associated tests are added
- this PR also contains some clean up
2016-03-08 10:35:29 +01:00
Atgeirr Flø Rasmussen 235bdedc55 Merge pull request #605 from totto82/supportForPMISC
Add support for PMISC
2016-03-08 10:03:03 +01:00
Atgeirr Flø Rasmussen 597cda6cbb Merge pull request #608 from totto82/relperm_diagnostic_solvent
Skip the relperm diagnostics for the solvent model.
2016-03-08 08:41:27 +01:00
Tor Harald Sandve b2e02f6d2b Add power method for general f^g in the AutoDiffBlock
A power method where both f and g are ADB variables is added
using the general derivative rule
(f^g)' = f^g * ln(f) * g' + g * f^(g-1) * f'

Tests are added to test_block.cpp
2016-03-07 14:23:45 +01:00
Atgeirr Flø Rasmussen bfda0e13f6 Merge pull request #588 from andlaus/opm-material_blackoil_PVT
fix the fallout of the removal of the opm-core black-oil PVT classes
2016-03-07 13:40:27 +01:00
Andreas Lauser b39e579197 fix the fallout of the removal of the opm-core black-oil PVT classes 2016-03-07 11:32:12 +01:00
Tor Harald Sandve 20819b8a03 Skip the relperm diagnostics for the solvent model. 2016-03-07 09:19:42 +01:00
Liu Ming 74fedcc53b Save PRT in the same folder as summary file. 2016-03-07 09:58:17 +08:00
Andreas Lauser 1f1dfbfc65 replace the blackoil PVT classes by the ones of opm-material
the opm-material classes are the ones which are now used by
opm-autodiff and this patch makes it much easier to keep the opm-core
and opm-autodiff results consistent. Also, the opm-material classes
seem to be a bit faster than the opm-core ones (see
https://github.com/OPM/opm-autodiff/pull/576)

I ran the usual array of tests with `flow`: SPE1, SPE3, SPE9 and Norne
all produce the same results at the identical runtime (modulo noise)
and also "Model 2" seems to work.
2016-03-05 19:11:44 +01:00
Tor Harald Sandve 948d985f56 Add support for PMISC
Pressure effects are added to relative permeability, capillary pressure,
viscosity and density miscibility
2016-03-04 11:34:31 +01:00
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 5bb705fda8 Merge pull request #953 from andlaus/const_gridproperties
fix the build
2016-02-19 11:46:32 +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