Arne Morten Kvarving
4bea041ec8
add jenkins script for running Norne case
2016-04-05 09:14:55 +02:00
Arne Morten Kvarving
9e5bc628db
add jenkins script for running SPE cases
2016-04-05 09:14:55 +02:00
Atgeirr Flø Rasmussen
16c8ca40cd
Merge pull request #634 from totto82/fix_test_solventProps
...
Fixes to test_solventprops_ad
2016-04-05 09:11:29 +02:00
Tor Harald Sandve
21ad35b691
Fixes to test_solventprops_ad
...
- fix mismatch between grid size and the test cell size
- avoid using new
2016-04-05 08:48:54 +02:00
Atgeirr Flø Rasmussen
eefa5d7864
Merge pull request #631 from andlaus/update_dune.module
...
dune.module: add all modules which opm-autodiff depends on explicitly
2016-04-04 19:07:45 +02:00
Arne Morten Kvarving
709a66a971
Merge pull request #629 from akva2/jenkins_reboot
...
Jenkins reboot
2016-04-04 18:02:50 +02:00
Arne Morten Kvarving
edd54ea4f4
add jenkins build scripts
2016-04-04 17:35:23 +02:00
Andreas Lauser
b9f5fb8b78
dune.module: add all modules which opm-autodiff depends on explicitly
...
this restores the ability to build opm-autodiff and all dependencies
using `dunecontrol`. Except for opm-common adding these dependencies
is not really required because they were inherited from other modules,
but stating them explicitly is good style IMO.
2016-04-04 15:43:31 +02:00
Atgeirr Flø Rasmussen
0e7e45c129
Merge pull request #627 from totto82/well_potentials
...
Compute well potentials
2016-04-04 15:11:19 +02:00
Atgeirr Flø Rasmussen
cf6ed11f46
Merge pull request #626 from qilicun/adapt-changes
...
adapt changes to relpermDiagnostics.
2016-04-04 15:04:50 +02:00
Tor Harald Sandve
a2bff9149a
Remove unused argument from computeWellPotentials()
2016-04-04 15:03:59 +02:00
Atgeirr Flø Rasmussen
e07c8f05a8
Merge pull request #611 from totto82/TLpressure
...
Implement pressure effects in the Todd-Longstaff mixing parameter
2016-04-04 14:45:22 +02:00
Tor Harald Sandve
e4b52a457f
Only calculate well potentials for cases with well groups
2016-04-04 09:03:13 +02:00
Tor Harald Sandve
bd81bda57b
Remove well_perforation_pressure_diffs fr WellStateFullyImplicitBlackoil
...
- Calculate the well perforatino pressure difference based on bhp and
perforation pressures instead of storing it in
WellStateFullyImplicitBlackoil
2016-04-04 08:35:59 +02:00
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
Tor Harald Sandve
30bd24f2fe
Compute well potentials
...
The well potentials are caculated based on the well rates and pressure
drawdown at every time step. They are used to calculate default guide
rates used in group controlled wells.
well_perforation_pressure_diffs is stored in
WellStateFullyImplicitBlackoil as it is needed in the well potential
calculations.
2016-04-01 14:58:46 +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
778d318bb3
adapt changes to relpermDiagnostics.
2016-04-01 12:33:02 +08: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