OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,602 Commits 24 Branches 102 Tags 90 MiB
0730ffcb69
Commit Graph

3602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
8367eaacb3 first attempt to introduce StandardWells struct. 
To replace the const Wells struct in BlackoilModelBase.
Only testing with Flow for the moment. Will update other Flow siblings
later.
 2016-04-06 12:54:00 +02:00
Robert Kloefkorn
54ea243c5f SimulatorFullyImplicitBlackoilOutput: added threaded asynchronous output. 2016-04-06 11:10:01 +02:00
Arne Morten Kvarving
b406be3839 added: trigger support for opm-data on jenkins builds 2016-04-06 10:16:11 +02:00
Arne Morten Kvarving
4becc05314 fixed: use shallow clones on jenkins 2016-04-06 10:16:11 +02:00
Atgeirr Flø Rasmussen
b7fc614356 Merge pull request #636 from bska/travis-request-opm-output 
Request requisite module opm-output in Travis builds
 2016-04-05 13:59:43 +02:00
Bård Skaflestad
814a94e058 Request requisite module opm-output in Travis builds 2016-04-05 12:54:44 +02:00
Atgeirr Flø Rasmussen
25cd84b6a2 Merge pull request #622 from totto82/refact_sovlent 
Refactor the solvent model
 2016-04-05 10:46:28 +02:00
Arne Morten Kvarving
68d02c0002 add jenkins script for running simple2D polymer case 2016-04-05 09:42:56 +02:00
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
Tor Harald Sandve
e5254f3779 Adapt to changes interface of extractWellPerfProperties 
The BlockoilmultisegmentModel is updated to account for changes in the
extractWellPerfProperties() interface.
 2016-04-05 09:13:29 +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
764d8a1c3f Remove leftovers from a merge process going wrong 2016-04-05 09:03:22 +02:00
Tor Harald Sandve
89e540cb2c Pass solutionState as first parameter 
output parameters go last...
 2016-04-05 08:57:07 +02:00
Tor Harald Sandve
925d0becf3 Fix to make flow_solvent run decks without solvent 2016-04-05 08:57:07 +02:00
Tor Harald Sandve
541475b2db Implement computePropertiesForWellConnectionPressures for solvent model 
The solvent specify part of computeWellConnectionPressures is factored
out to computePropertiesForWellConnectionPressures in order to reuse
the computeWellConnectionPressures from the base model.
 2016-04-05 08:57:07 +02:00
Tor Harald Sandve
9cd0383d36 Factor out computation of properties for well connection pressures 
Computation of properties used in computeConnectionPressureDelta
is factored out to computePropertiesForWellConnectionPressures
The motivation is to be able to use a modified version of
computePropertiesForWellConnectionPressures in the solvent model
 2016-04-05 08:57:07 +02:00
Tor Harald Sandve
7b81facfb0 Make use of extractWellPerfProperties to avoid code duplication 
The following changes are done in order to remove the duplicated code in
assemble().
- extractWellPerfProperties takes SolutionState as input (only used in
the solvent model)
- the computation of effective parameters is moved to computeAccum()
With these changes the solvent model can use assemble() from the base
model.
 2016-04-05 08:53:09 +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