OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,839 Commits 9 Branches 35 Tags 15 MiB
36bedfcf67
Commit Graph

5839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pål Grønås Drange
9dbae15cc9 uses new api, made reference instead of copy 2016-04-08 16:31:59 +02:00
Pål Grønås Drange
8a7bf1ef3c Updated opm-core to use new EclipseState API in opm-parser 2016-04-08 16:30:01 +02:00
Atgeirr Flø Rasmussen
277b3a2e58 Merge pull request #993 from atgeirr/remove-unused-code 
Removed SimulatorOutput class from this module.
 2016-04-07 15:47:56 +02:00
Atgeirr Flø Rasmussen
90e9374a2b Renoved SimulatorOutput class from this module. 2016-04-07 15:41:40 +02:00
Atgeirr Flø Rasmussen
ccb34c14ec Merge pull request #992 from atgeirr/module-renaming 
Module renaming
 2016-04-06 15:37:44 +02:00
Arne Morten Kvarving
33bb10b98f fixed: use shallow clones on jenkins 2016-04-06 10:10:23 +02:00
Atgeirr Flø Rasmussen
b5cbf0ea2d Rename HAVE_DUNE_CORNERPOINT -> HAVE_OPM_GRID. 
Note that this is quite strange since opm-core is upstream and not downstream
from opm-grid. However, when this file is used from opm-autodiff the macro is used.
 2016-04-05 15:14:02 +02:00
Atgeirr Flø Rasmussen
2b9b1f8b05 Merge pull request #987 from qilicun/refactor-relpermDiagnostics 
Refactor relperm diagnostics using OpmLog functionalities.
 2016-04-04 15:04:44 +02:00
Arne Morten Kvarving
ccac8fe6ac Merge pull request #989 from akva2/jenkins_reboot 
Jenkins reboot
 2016-04-04 14:40:01 +02:00
Arne Morten Kvarving
7bc1ec7693 add jenkins build scripts 2016-04-04 14:36:24 +02:00
Atgeirr Flø Rasmussen
a20da3a6d2 Merge pull request #988 from totto82/gc_default 
Calculate default guide rates using the well potentials
 2016-04-04 14:12:48 +02:00
Tor Harald Sandve
e1298ff21b Minor fixes based on PR comments 
- fix comments, typos add missing reference arguments.
 2016-04-04 08:10:24 +02:00
Liu Ming
5e6e4b2a38 mistake: count warning as error. 2016-04-02 11:53:36 +08:00
Liu Ming
53485a7ae7 do not write error summary twice. 2016-04-02 11:45:18 +08:00
Tor Harald Sandve
0fb81945f6 Calculate default guide rates using the well potentials 
The default guide rates are caculated using the well potentials.
The well potentials are calculated in the simulator and given as input
to the wellsManager.
 2016-04-01 15:00:21 +02:00
Liu Ming
88d41057c0 refactor relperm diagnostics using OpmLog functions. 2016-04-01 12:27:03 +08:00
Atgeirr Flø Rasmussen
09c31b67ca Merge pull request #984 from totto82/bugfix_groupcontrol 
BUGFIX. Call setupGuideRates before groupcontrol is applied
 2016-03-31 13:28:08 +02:00
Atgeirr Flø Rasmussen
730f1e88b7 Merge pull request #977 from kjellkongsvik/Remove_OutputWriter 
Remove output writer
 2016-03-31 09:42:33 +02:00
Tor Harald Sandve
b8bad8b26b BUGFIX. Call setupGuideRates before groupcontrol is applied 2016-03-31 09:32:09 +02:00
Kjell W. Kongsvik
77a6c4229a Replace comment with "ifdef DISABLE_OUTPUT" 2016-03-29 14:57:58 +02:00
Kjell W. Kongsvik
8e68a4d815 Deleted all files in opm/core/io 
This removes OutputWriter and eclipse, vtk, vag as this
functionality has moved to opm-output.
 2016-03-29 14:57:58 +02:00
Kjell W. Kongsvik
03d5a5ba25 Commented out usage of OutputWriter in simulator 2016-03-29 14:56:25 +02:00
Kjell W. Kongsvik
9febba59a4 Commented out usage of OutputWriter in tutorials 2016-03-29 14:56:24 +02:00
Joakim Hove
ce6cdb4a47 Merge pull request #962 from joakim-hove/remove-simulator-state 
Replaced SimulatorState -> SimulationDatacontainer
 2016-03-29 13:16:19 +02:00
Atgeirr Flø Rasmussen
7a5e8865b5 Merge pull request #982 from dr-robertk/PR/copyable-simulator-timer 
Allow SimulatorTimers to be copied.
 2016-03-29 11:09:14 +02:00
Atgeirr Flø Rasmussen
e4929b7263 Implement direct fast field access. 2016-03-29 10:46:14 +02:00
Joakim Hove
c360079926 Replaced SimulatorState -> SimulationDatacontainer 
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
 2016-03-29 10:44:49 +02:00
Robert Kloefkorn
3f63d09f86 SimulatorTimerInterface: include missing header for unique_ptr. 2016-03-29 10:42:03 +02:00
Robert Kloefkorn
a2d64e681e SimulatorTimers: added method clone to allow for copying of the objects. 2016-03-29 10:34:16 +02:00
Joakim Hove
fcd4368da4 Merge pull request #979 from jokva/missing-cassert-include 
Add missing <cassert> include
 2016-03-25 07:36:28 +01:00
Joakim Hove
05c2fb7c5e Merge pull request #978 from chflo/move_log_functionality 
Changed include due to OpmLog changed path
 2016-03-21 22:14:48 +01:00
Jørgen Kvalsvik
4f857b71fc Add missing <cassert> include 2016-03-18 15:40:57 +01:00
chflo
755873f5cc Changed include due to OpmLog changed path 2016-03-17 15:59:50 +01:00
Joakim Hove
212e3c26a4 Merge pull request #976 from qilicun/rename-ParseMode 
Rename parse mode
 2016-03-17 09:51:50 +01:00
Liu Ming
81f6c2dd8e rename ParseMode as ParseContext. 2016-03-17 09:57:59 +08:00
Liu Ming
0a5be9ba52 rename ParseMode in examples folder. 2016-03-17 09:46:12 +08:00
Liu Ming
d943cbfe2a rename ParseMode as ParseContext. 2016-03-17 08:56:38 +08:00
Joakim Hove
2ca569d2e4 Merge pull request #973 from andlaus/fix_PERMXYZ 
Fix PERM[XYZ] output
 2016-03-16 11:28:22 +01:00
Atgeirr Flø Rasmussen
6bcca2ea23 Merge pull request #972 from qilicun/solvent-diagnostics 
Solvent diagnostics
 2016-03-16 10:32:12 +01:00
Andreas Lauser
31aac3481d EclipseWriter: deal with the concept of active cells for PERM[XYZ] 
... and also with grids that reorder their cell indices.
 2016-03-14 18:03:41 +01:00
Liu Ming
897aa67b89 use two slashes for comments inside functions. 2016-03-11 17:19:39 +08:00
Liu Ming
26e18bdcc4 use error variable. 2016-03-11 17:15:32 +08:00
Liu Ming
aa32349f19 fix saturation family bug. 2016-03-11 17:13:40 +08:00
Liu Ming
eafa6e2d9a fix indentation and fluid system issues. 2016-03-11 17:03:31 +08:00
Liu Ming
47fefe9e3a Merge remote branch 'remotes/opm/master' into solvent-diagnostics 2016-03-10 14:38:22 +08:00
Liu Ming
b7972eb01c Add solvent saturation functions support. 2016-03-10 14:32:43 +08:00
Liu Ming
95d65222fa Add solvent to fluid system. 2016-03-10 11:17:18 +08:00
Atgeirr Flø Rasmussen
3e8d6b521f Merge pull request #971 from andlaus/fix_thpres_defaults 
threshold pressures: consider the saturated case and fix a typo
 2016-03-09 09:48:37 +01:00
Andreas Lauser
c635d84d37 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
bd91cf6e72 Merge pull request #970 from andlaus/fix_R_in_viscosity 
BlackoilPropertiesFromDeck: properly calculate the Rs and Rv values for viscosity
 2016-03-08 11:28:53 +01:00