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

5577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Andreas Lauser
dfda345661 BlackoilPropertiesFromDeck: properly calculate the Rs and Rv values for viscosity 
the dissolution factors used for the viscosities were always zero so
far. this was not discovered earlier because flow is completely
unaffected by this since the only place where this class is used in
flow is the equilibration code and the equilibration code does not
need phase viscosities.

thanks to @atgeirr for finding this.
 2016-03-08 11:07:20 +01:00
Atgeirr Flø Rasmussen
41faabe61a Merge pull request #955 from andlaus/opm-material_blackoil_PVT 
replace the blackoil PVT classes by the ones of opm-material
 2016-03-07 13:40:24 +01:00
Andreas Lauser
23088f987f replace the blackoil PVT classes by the ones of opm-material 
the opm-material classes are the ones which are now used by
opm-autodiff and this patch makes it much easier to keep the opm-core
and opm-autodiff results consistent. Also, the opm-material classes
seem to be a bit faster than the opm-core ones (see
https://github.com/OPM/opm-autodiff/pull/576)

I ran the usual array of tests with `flow`: SPE1, SPE3, SPE9 and Norne
all produce the same results at the identical runtime (modulo noise)
and also "Model 2" seems to work.
 2016-03-05 19:11:44 +01:00
Joakim Hove
0c05fc4dc0 Merge pull request #966 from jokva/initconfig-equil 
Remove Equil + EquilWrapper, replace with upstream
 2016-03-04 18:18:57 +01:00
Atgeirr Flø Rasmussen
eb0f59f96d Merge pull request #965 from atgeirr/remove-unused-parameter 
Remove unused 'restart' parameter from SimulatorTimer::init().
 2016-03-04 11:22:01 +01:00
Atgeirr Flø Rasmussen
72b9bdabf4 Merge pull request #969 from atgeirr/master 
Fix minor issues with RelpermDiagnostics
 2016-03-04 09:14:50 +01:00
Atgeirr Flø Rasmussen
9a83cbaddf Only include normal (not _impl.hpp) header from client code. 2016-03-04 09:12:43 +01:00
Atgeirr Flø Rasmussen
2a4ca8a34e Only .cpp files should include config.h. 2016-03-04 09:10:19 +01:00
Atgeirr Flø Rasmussen
54ac4bd5e4 Include template implementation file. 2016-03-04 09:09:52 +01:00
Atgeirr Flø Rasmussen
10468bafab Merge pull request #968 from qilicun/template-grid 
make grid as template parameter.
 2016-03-04 08:30:58 +01:00
Liu Ming
58f53cae2a make grid as template parameter. 2016-03-04 09:09:38 +08:00
Atgeirr Flø Rasmussen
a703bfbcf1 Merge pull request #958 from qilicun/rename_logfile 
use standard filename for output log file.
 2016-03-02 08:29:20 +01:00