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

5526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Joakim Hove
1661ac8f58 Merge pull request #956 from jokva/remove-unused-wrapper 
Remove unused Wrapper includes from Deck/Utility
 2016-02-17 17:10:43 +01:00
Jørgen Kvalsvik
62d7c7bed2 Remove unused Wrapper includes from Deck/Utility 2016-02-17 14:46:15 +01:00
Atgeirr Flø Rasmussen
dc918fcff9 Merge pull request #947 from andlaus/fix_wet_gas_pvt_extrapolation 
PvtLiveGas: do not special case in the extrapolation code
 2016-02-16 12:44:53 +01:00
Andreas Lauser
8f0d81db2f fix the build 
it broke because EclipseState::get*GridProperty() now returns a
pointer to a constant object.
 2016-02-15 15:06:05 +01:00
Joakim Hove
6515b57632 Merge pull request #950 from joakim-hove/simulatorstate-refactor 
Removed opm_memcmp_double() - use cmp from common.
 2016-02-15 12:55:53 +01:00
Joakim Hove
5172652e73 Removed opm_memcmp_double() - use cmp from common. 2016-02-14 21:41:51 +01:00
Joakim Hove
88aad94f54 Merge pull request #951 from jepebe/travis 
Travis support
 2016-02-08 12:07:26 +01:00
Jean-Paul Balabanian
ab3ea52384 Added Travis support 2016-02-08 06:56:30 +01:00
Bård Skaflestad
279799ee80 Merge pull request #949 from joakim-hove/build-fixup 
Build fixup
 2016-02-04 11:46:56 -06:00
Joakim Hove
9b1efd7810 Revert: Removed unused SimulatorState comparison. 
This reverts commit 5ce1d84ac1.
 2016-02-04 18:39:40 +01:00
Joakim Hove
b241fde63c Revert: Removed unused SimulatorState::setFirstSat 2016-02-04 18:39:39 +01:00
Joakim Hove
4e46bb3fa4 Merge pull request #948 from joakim-hove/simulatorstate-remove-unused 
Simulatorstate remove unused
 2016-02-04 15:57:59 +01:00
Joakim Hove
5ce1d84ac1 Removed unused SimulatorState comparison. 2016-02-03 05:54:24 +01:00
Joakim Hove
df0d11b8de Removed unused SimulatorState::setFirstSat() 2016-02-03 05:51:05 +01:00
Andreas Lauser
e6c89a595b PvtLiveGas: do not special case in the extrapolation code 
at least, don't special case that much. This caused a discrepancy with
the opm-material PVT relations for Norne after 23 report steps. (which
takes an hour or two to get to with debugging options on my machine.)
As you can probably imagine, finding this was *a lot* of fun...
 2016-01-28 14:42:10 +01:00
Bård Skaflestad
6365167109 Merge pull request #946 from jokva/clean-up-header 
Improve includes from opm-parser
 2016-01-26 15:58:25 +01:00
Bård Skaflestad
d738138afa Merge pull request #943 from qilicun/update_relperm_diagnostics 
Update relperm diagnostics
 2016-01-26 15:12:28 +01:00
Jørgen Kvalsvik
697763a4b9 Improve includes from opm-parser 
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
 2016-01-26 13:30:58 +01:00
Joakim Hove
282cac57ea Merge pull request #945 from joakim-hove/simulator-state-no-grid 
Removed SimulatorState::init( UnstructureGrid& )
 2016-01-25 17:49:05 +01:00
Joakim Hove
ba1c06d415 Removed SimulatorState::init( UnstructureGrid& ) 2016-01-25 07:30:03 +01:00
Liu Ming
10baa52828 Omit some usages of to_string function. 2016-01-25 11:18:56 +08:00
Liu Ming
56868d8a6e Add more parser mode options. 2016-01-25 11:13:19 +08:00
Liu Ming
9e9287f20d change headline to saturation functions diagnostics. 2016-01-25 11:00:23 +08:00
Liu Ming
039f9ce1cc Format output and add SATNUM for scaled saturation endpoints. 2016-01-25 10:58:50 +08:00
Liu Ming
229282c310 fix bugs: counter warning as error. 2016-01-25 09:38:55 +08:00
Liu Ming
009f1b101b Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics 
Conflicts:
	opm/core/props/satfunc/RelpermDiagnostics.cpp
 2016-01-22 13:04:01 +08:00
Bård Skaflestad
1686b45221 Merge pull request #944 from jokva/fix-header-include-parser656 
Fixes includes wrt opm-parser PR-656
 2016-01-21 11:13:32 +01:00
Jørgen Kvalsvik
c7349b5586 Fixes includes wrt opm-parser PR-656 
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
 2016-01-21 09:42:51 +01:00
Liu Ming
8e397ef7ce fix typo. 2016-01-21 16:10:31 +08:00
Liu Ming
ce0ec1e466 remove comments. 2016-01-21 14:04:01 +08:00