OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-03 04:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,230 Commits 31 Branches 117 Tags
4824019b92299c8eb5859de3379dffe724aee2e1
Commit Graph
3230 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve 4824019b92 Adapt to rename of parserMode to parserContext 2016-04-01 16:08:30 +02:00
Tor Harald Sandve 36a73591b0 Fix doc. for pressureMixingParameter 2016-04-01 15:59:17 +02:00
Tor Harald Sandve a02a07289e Implement pressure effects in the Todd-Longstaff mixing parameter 
The Todd-Longstaff model is extended to incorporate pressure effects
The solvent viscosity is then caculated as

mu_eff = mu_s^(1-\alpha * \omega) * mu_mix^(\alpha * \omega)

where \omega accounts for the porous media effects and \alpha =
\alpha(pressure) accounts for the miscibility of the solvent and oil
when contacted.
The \alpha values can be given using the TLPMIXPA keyword

If no entries are given to TLPMIXPA the table specified using PMISC will
be used as default.
IF TLPMIXPA does not appear in the grid \alpha = 1 and the pressure
effect is neglected.
This is tested in test_solventprops_ad.cpp
 2016-04-01 15:55:56 +02:00
Atgeirr Flø Rasmussen 8c9b17b943 Merge pull request #615 from totto82/fixes_solvent_model 
Fixes to the solvent model
 2016-04-01 13:40:00 +02:00
Atgeirr Flø Rasmussen 5c1703c3a5 Merge pull request #607 from qilicun/change-PRT-folder 
Save PRT in the same folder as summary file.
 2016-04-01 08:21:08 +02:00
Liu Ming c314c30e79 if output_dir exists, save PRT file in that folder. 2016-04-01 09:27:39 +08:00
Liu Ming 0108216a68 Merge remote-tracking branch 'remotes/opm/master' into change-PRT-folder 2016-04-01 09:22:59 +08:00
Atgeirr Flø Rasmussen 6549658622 Merge pull request #624 from GitPaean/polymer_linearsolver 
making the interleaved solver works for blackoil polymer simulator.
 2016-03-31 15:39:54 +02:00
Atgeirr Flø Rasmussen 543c1655b9 Merge pull request #616 from jokva/accept-filename-without-DATA 
Flow accepts base name for input Deck
 2016-03-31 15:33:23 +02:00
Atgeirr Flø Rasmussen b5c216f4f3 Merge pull request #621 from totto82/fix_lrat 
Bugfix. Fix setting initial rates in updateWellControls
 2016-03-31 14:33:33 +02:00
Atgeirr Flø Rasmussen 3aa5158842 Merge pull request #619 from kjellkongsvik/Move_OutputWriter_to_opm-output 
Refactored to use OutputWriter from opm-output
 2016-03-31 09:44:09 +02:00
Atgeirr Flø Rasmussen 6a4bd4516c Merge pull request #625 from OPM/revert-623-PR/async-output 
Revert "Asynchronous output."
 2016-03-31 09:43:15 +02:00
Atgeirr Flø Rasmussen 13b86a7825 Revert "Asynchronous output." 2016-03-31 09:43:01 +02:00
Atgeirr Flø Rasmussen e676aa7114 Merge pull request #623 from dr-robertk/PR/async-output 
Asynchronous output.
 2016-03-31 09:42:50 +02:00
Kai Bao b39b9a85a2 making the interleaved solver works for blackoil polymer simulator. 
The CPR solver does not work yet. An error will be thrown if people
specify to use CPR linear solver.
 2016-03-30 16:19:56 +02:00
Robert Kloefkorn 8d11be71e0 SimulatorState --> SimulationDataContainer. 2016-03-30 11:01:34 +02:00
Robert Kloefkorn 9c67c0e135 Merge remote-tracking branch 'upstream/master' into PR/async-output 2016-03-30 10:45:40 +02:00
Jørgen Kvalsvik 9df3b2fda9 Flow accepts base name for input Deck 
Enables flow to accept a basename for a case by appending a .DATA suffix
should it not be provided. It already supported reading the basename
from a .DATA extension file, but not opening said file by handing it to
the parser.
 2016-03-30 08:51:41 +02:00
Robert Kloefkorn 5044a07e46 SimFullImplOutput: added future to ensure that write history is accounted for. 2016-03-29 15:22:33 +02:00
Joakim Hove f3f8ce82c4 Merge pull request #602 from joakim-hove/remove-sim-state 
Replaced SimulatorState -> SimulationDataContainer
 2016-03-29 13:16:38 +02:00
Robert Kloefkorn d5c375f297 SimulatorFullyImplicitOutput: added flag for async output. 2016-03-29 10:49:49 +02:00
Robert Kloefkorn 29053dc18d SimulFulImplBOOutput: asynchronous serial output. 2016-03-29 10:49:49 +02:00
Atgeirr Flø Rasmussen 463866b523 Create state_ in all cases. 2016-03-29 10:48:36 +02:00
Atgeirr Flø Rasmussen 98862f449c Restore compilation (init -> constructor). 
Also suppress new warnings due to unsigned/signed comparisons.
 2016-03-29 10:48:36 +02:00
Joakim Hove 18c07d5d66 Replaced SimulatorState -> SimulationDataContainer 2016-03-29 10:48:36 +02:00
Joakim Hove 0e0e92aa71 Merge pull request #620 from chflo/move_log_functionality 
Changed includes due to OpmLog moved from parser to common
 2016-03-21 22:15:14 +01:00
Tor Harald Sandve d91831b971 Avoid comparsion of floating point numbers 2016-03-18 14:30:47 +01:00
Tor Harald Sandve 94aa360fe6 Bugfix. Fix setting initial rates in updateWellControls 
- The initial rates are only set to target values for single phase
producers (orat, wrat, grat).
- For injectors compi is used to determine the initial target rates.
 2016-03-18 13:16:23 +01:00
chflo e63bf7aead Changed includes due to OpmLog moved from parser to common 2016-03-17 16:19:07 +01:00
Kjell W. Kongsvik ea9e572a65 Refactored to use OutputWriter from opm-output 
As OutputWriter has been deleted from opm-core
Only changes in includes
 2016-03-17 14:45:30 +01:00
Joakim Hove c1b1b9296f Merge pull request #617 from qilicun/rename-ParseMode 
Rename parse mode
 2016-03-17 09:52:45 +01:00
Liu Ming 17e5eb2dee rename ParseMode as ParseContext. 2016-03-17 10:02:50 +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
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