OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,893 Commits 24 Branches 102 Tags 82 MiB
929cc619f6
Commit Graph

1893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
babrodtk
929cc619f6 Fixed warnings 2016-09-06 07:50:02 +02:00
babrodtk
273c99b36f Merge branch 'master' of github.com:OPM/opm-core 2016-08-30 14:53:11 +02:00
Pål Grønås Drange
656e9438c8 Minor tweaks and updates in test blackoilstate 2016-08-08 15:58:17 +02:00
Pål Grønås Drange
7ff2328f3f transmult and initconfig are ref's, use ref for EclipseState constructor 2016-08-08 10:02:53 +02:00
Andreas Lauser
c4e5db2153 also keep track of the number of linearizations needed for the simulation 2016-08-02 14:05:14 +02:00
Andreas Lauser
2f3cdfd9e0 fix incorrect derivative of rock compressibility w.r.t. pressure 
since

f(x) = 1 + 0.5*g(x)*g(x)

the derivative is

f'(x) = 0 + 2*0.5*g(x) * g'(x) = g(x)*g'(x)

note that the previous incorrect values do not affect the quality of
the obtained results (if the tolerance of the non-linear solver is
chosen to be small enough), but it may have deteriorated convergence
rates.
 2016-07-19 18:19:30 +02:00
Kai Bao
b0a4387573 adding default constructor for DynamicListEconLimited 2016-07-04 16:21:55 +02:00
Kai Bao
18b76331eb addressing comments. 
no functional change.
 2016-06-30 16:20:38 +02:00
Kai Bao
b4fa2b4944 removing some commented lines. 2016-06-30 15:17:13 +02:00
Kai Bao
28636aad5c adding stopped wells list to DynamicListEconLimited 
when well is closed due to rate economic limits, based on the auto
shut-in configuration, the well can be STOP or SHUT.

When well is closed due to all the connections are closed, it should be
SHUT.
 2016-06-30 14:41:14 +02:00
Kai Bao
eb163e648c handling connection closing in DynamicListEconLimited 
due to econ limits.
 2016-06-30 14:41:14 +02:00
Kai Bao
c64d33fbd3 adding list_econ_limited to setupWellControls 2016-06-30 14:41:14 +02:00
Kai Bao
7dac2201bb WIP in adding class DynamicListEconLimited 
to handle the closed wells and connection dynamically based on the
economic limits provied by keyword WECON
 2016-06-30 14:41:14 +02:00
Markus Blatt
b5f6513520 Use NULL instead of 0 in null comparison. 2016-06-27 14:38:30 +02:00
Markus Blatt
f976c6ee9d Make wells_equal work for only one null pointer. 2016-06-27 13:29:44 +02:00
Markus Blatt
88ebfeba28 Make wells_equal work for null wells. 
This is needed to run test cases without wells with debugging on.
Without this commit we get segmentation fault in an assert statement.
 2016-06-27 12:21:45 +02:00
Atgeirr Flø Rasmussen
24fa367fda Merge pull request #1027 from totto82/fix_2p_equil_init 
Fix two phase equil initialization
 2016-06-24 14:42:48 +02:00
Tor Harald Sandve
1d7e4146ed Fixing some nitpicks 2016-06-24 13:36:05 +02:00
Pål Grønås Drange
63191a6392 Added DX/DY/DZ to norne_pvt.data 2016-06-21 16:10:32 +02:00
Atgeirr Flø Rasmussen
675bc960db Merge pull request #1043 from pgdr/remove-return-type-warn 
Remove warnings (by throwing), added copyright header
 2016-06-20 22:34:40 +02:00
Pål Grønås Drange
4acd859559 Using OPM_THROW to log messages, fixed Copyright headers 2016-06-20 17:20:33 +02:00
Joakim Hove
f909d071d9 Merge pull request #1041 from jokva/removal-shared_ptr-well 
WellPtr and GroupPtr deprecated
 2016-06-20 14:57:10 +02:00
Pål Grønås Drange
e9c2382b45 Remove [-Wreturn-type] warnings (added throw), added copyright header 2016-06-20 14:13:29 +02:00
Tor Harald Sandve
cc100a6217 Fix bug for OIL-GAS case 
- Differentiate between active and canonical phase index
 2016-06-20 11:14:36 +02:00
Tor Harald Sandve
3247aaa557 Fix reference pressure for oil-water problem 
In opm-material the wetting phase is the reference phase for two-phase
problems i.e water for oil-water system, but for flow it is always oil.
Add oil capillary pressure value to shift the reference phase to oil
 2016-06-20 10:36:24 +02:00
Tor Harald Sandve
5641876d1d Fix two phase EQUIL initialization 2016-06-20 10:36:24 +02:00
Atgeirr Flø Rasmussen
010480a7de Merge pull request #1039 from atgeirr/fix-compile-maxabs-unsigned 
Avoid ambiguous calls to abs with unsigned integers.
 2016-06-17 08:02:20 +02:00
Atgeirr Flø Rasmussen
d76cfbed5f Merge pull request #1038 from qilicun/equil-check 
Rise up a warning if equil region has no active cells.
 2016-06-16 10:02:49 +02:00
Jørgen Kvalsvik
03104f2320 WellPtr and GroupPtr deprecated 
shared_ptr aliases are considered deprecated and has largely been
removed upstream (and replaced by raw pointers).
 2016-06-16 09:33:43 +02:00
Atgeirr Flø Rasmussen
f5d1cbfb75 Make specialization for all unsigned integer types. 2016-06-16 08:47:21 +02:00
Bård Skaflestad
e444a03f34 Merge pull request #1037 from atgeirr/add-phasepresence-ops 
Add operator== and operator!= to PhasePresence.
 2016-06-15 19:56:11 +02:00
Bård Skaflestad
c5c5893591 Merge pull request #1040 from atgeirr/fix-linsolverfactory-default-solver 
Set default solver depending on configuration.
 2016-06-15 17:34:41 +02:00
Atgeirr Flø Rasmussen
7c45264a77 Merge pull request #1034 from qilicun/minor-format-change 
Minor format changes
 2016-06-15 15:10:57 +02:00
Atgeirr Flø Rasmussen
c6c452765c Merge pull request #1029 from blattms/make-ownermask-accessible 
Make ParallelIstlInformation::ownerMask_ accessible.
 2016-06-15 15:08:58 +02:00
Atgeirr Flø Rasmussen
854296d710 Address review comments. 2016-06-15 15:01:45 +02:00
Atgeirr Flø Rasmussen
22c2093426 Set default solver depending on configuration. 2016-06-15 14:32:00 +02:00
Atgeirr Flø Rasmussen
06ebdc9268 Avoid ambiguous calls to abs with unsigned integers. 2016-06-15 10:55:42 +02:00
Liu Ming
1231594600 it should be the same number in EQLNUM. 2016-06-15 16:53:51 +08:00
Liu Ming
a9c2128daa use correct region number. 2016-06-15 16:52:32 +08:00
Liu Ming
a920b43e21 Rise up a warning if equil region has no active cells. 2016-06-15 15:40:38 +08:00
Atgeirr Flø Rasmussen
d065a2c095 Make new ops const. 2016-06-15 09:20:19 +02:00
Atgeirr Flø Rasmussen
b0c6e43cf8 Add operator== and operator!= to PhasePresence. 
This makes it simpler to write code debugging or inspecting changed phase configurations.
 2016-06-15 08:57:20 +02:00
Liu Ming
3179a1bf5d fix indentation issue. 2016-06-15 11:26:06 +08:00
Liu Ming
f0900e6752 unify output. 2016-06-15 11:24:20 +08:00
Arne Morten Kvarving
33b29e9991 Revert "Check for HAVE_UMFPACK in LinearSolverFactory" 
This reverts commit f54c74db0637640f5fb224fab243b294cd034f15.
 2016-06-13 10:43:21 +02:00
Liu Ming
dd26ef620c add "\n" at the end of the message. 2016-06-13 13:55:01 +08:00
Liu Ming
5fe0452bd5 minor format changes 2016-06-13 13:49:58 +08:00
Jørgen Kvalsvik
84b0c8bc59 Check for HAVE_UMFPACK in LinearSolverFactory 
Check for the right preprocessor define to enable umfpack support.
Matches the directive set in config.h
 2016-06-10 17:00:34 +02:00
Joakim Hove
52752ea1e4 Merge pull request #1016 from jokva/refactor-output-restart 
Breaking opm-core dependency in opm-output; new summary implementation
 2016-06-10 13:15:34 +02:00
Markus Blatt
7762974354 Make ParallelIstlInformation::ownerMask_ accessible. 
This is needed in opm-simulator to calculate the parallel euclidian
product of the saturations.
 2016-06-08 11:02:13 +02:00