Commit Graph

5806 Commits

Author SHA1 Message Date
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
Liu Ming
e12ca5a825 change .LOG to .SATFUNCLOG. 2016-03-02 14:58:37 +08:00
Jørgen Kvalsvik
27a240ae7f Remove Equil + EquilWrapper, replace with upstream
Upstream (opm-parser) now provides a better Equil + EquilRecord, and
simultaneously deprecated EquilWrapper. This patch fixes the resulting
breakage.

One important note: The new Equil does not expose integers for live
oil/wet gas initialization procedure methods, but rather booleans
through constRs/constRv methods. This is how the variable behaves
according to the Eclipse reference manual (EQUIL keyword section).

Code has been updated to reflect this.
2016-03-01 09:59:54 +01:00
Joakim Hove
85232bb355 Merge pull request #964 from atgeirr/fix-sign-warning
Silence sign comparison warning.
2016-02-29 14:48:48 +01:00
Atgeirr Flø Rasmussen
5c2257cafa Remove unused 'restart' parameter from SimulatorTimer::init(). 2016-02-29 11:03:08 +01:00
Atgeirr Flø Rasmussen
01df431198 Silence sign comparison warning. 2016-02-29 10:58:43 +01:00
Bård Skaflestad
8f042081f7 Merge pull request #963 from jokva/missing-headers-parser-695
Add missing opm-parser headers
2016-02-26 07:39:55 -06:00
Jørgen Kvalsvik
82472a1dfd Add missing opm-parser headers
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2016-02-26 11:49:40 +01:00
Bård Skaflestad
893e6c851f Merge pull request #954 from joakim-hove/set-component
Changes in SimulatorState:
2016-02-24 07:11:36 -06:00
Joakim Hove
df6e6a2347 Replaced TwoPhaseState -> SimulatorState 2016-02-22 22:03:43 +01:00
Joakim Hove
6ca10ea57d Added SimulatorState::getCellData() 2016-02-22 22:03:42 +01:00
Joakim Hove
6c5fae2f9d Added free function initSaturation().
The state argument is of type SimulatorState& - and no longer a template
parameter.
2016-02-22 22:03:41 +01:00
Joakim Hove
a214c10595 Changes in SimulatorState:
1. Added method setCellDataComponent()
 2. Removed setFirstSat()

Implemented saturation initialisation using setCellDataComponent()
instead of setFirstSat(). This way the template<class Props> has been
removed from the SimulatorState class.
2016-02-22 08:42:04 +01:00
Bård Skaflestad
089229adf4 Merge pull request #959 from andlaus/fix_build
Fix build
2016-02-21 12:47:22 -06:00
Andreas Lauser
377b844862 fix build breakage of the unit tests due to OPM/opm-parser#687
While the patch is quite trivial (some forgotten 'const'), the havoc
was caused because I usually configure my modules with --disable-tests
(to get much better turn-around times when switching all modules from
debug to optimization flags) and the usual way to force them to
compile ('make test-suite') does not work for opm-core...
2016-02-21 17:35:33 +01:00
Andreas Lauser
c709e347c3 fix some recent deprecation warnings
these are caused by OPM/opm-parser#687. While they are harmless, they
are certainly annoying. (that's their point!)
2016-02-21 17:29:43 +01:00
Atgeirr Flø Rasmussen
be1ea358ff Merge pull request #953 from andlaus/const_gridproperties
fix the build
2016-02-19 11:46:32 +01:00
Atgeirr Flø Rasmussen
0297d6c657 Merge pull request #957 from joakim-hove/cmp-template
Using template for cmp::vector_equal()
2016-02-19 11:41:07 +01:00
Joakim Hove
58f355935f Using template for cmp::vector_equal() 2016-02-19 07:57:02 +01:00
Liu Ming
61ebad5bba use standard filename for output log file. 2016-02-19 09:35:15 +08:00
Joakim Hove
7909311749 Merge pull request #952 from jokva/unique-auto-deck
Change Deck access methods/types to references
2016-02-18 23:17:17 +01:00
Jørgen Kvalsvik
b8edc8b5b4 Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00