Atgeirr Flø Rasmussen
271c82d55e
Only include normal (not _impl.hpp) header from client code.
2016-03-04 09:12:43 +01:00
Atgeirr Flø Rasmussen
d6c0e771ca
Only .cpp files should include config.h.
2016-03-04 09:10:19 +01:00
Atgeirr Flø Rasmussen
6b2f1d1507
Include template implementation file.
2016-03-04 09:09:52 +01:00
Liu Ming
355f349470
make grid as template parameter.
2016-03-04 09:09:38 +08:00
Atgeirr Flø Rasmussen
9c189415ab
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
215a3f24d4
change .LOG to .SATFUNCLOG.
2016-03-02 14:58:37 +08:00
Jørgen Kvalsvik
dd77a39d95
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
Jørgen Kvalsvik
33f8446a4e
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
Joakim Hove
016f300c9f
Replaced TwoPhaseState -> SimulatorState
2016-02-22 22:03:43 +01:00
Joakim Hove
4bab7b7f4c
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
84485dde53
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
Andreas Lauser
68be58faa9
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
b9d44c1f4b
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
c40ed3ece6
Using template for cmp::vector_equal()
2016-02-19 07:57:02 +01:00
Liu Ming
d4ac98fb61
use standard filename for output log file.
2016-02-19 09:35:15 +08:00
Jørgen Kvalsvik
04d605159f
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
6f3c4fb618
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
9836712782
Remove unused Wrapper includes from Deck/Utility
2016-02-17 14:46:15 +01:00
Joakim Hove
83a32061f7
Removed opm_memcmp_double() - use cmp from common.
2016-02-14 21:41:51 +01:00
Bård Skaflestad
83f474f118
Merge pull request #946 from jokva/clean-up-header
...
Improve includes from opm-parser
2016-01-26 15:58:25 +01:00
Jørgen Kvalsvik
b0692304d5
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
Liu Ming
cd55b1f4b5
Omit some usages of to_string function.
2016-01-25 11:18:56 +08:00
Liu Ming
dbabffb91a
Add more parser mode options.
2016-01-25 11:13:19 +08:00
Liu Ming
e227b6bb96
change headline to saturation functions diagnostics.
2016-01-25 11:00:23 +08:00
Liu Ming
6aca45b576
Format output and add SATNUM for scaled saturation endpoints.
2016-01-25 10:58:50 +08:00
Liu Ming
aae9169cff
fix bugs: counter warning as error.
2016-01-25 09:38:55 +08:00
Liu Ming
675f730b01
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
Jørgen Kvalsvik
50c1bbdc85
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
6efd22c637
fix typo.
2016-01-21 16:10:31 +08:00
Liu Ming
8b4dda67ed
remove comments.
2016-01-21 14:04:01 +08:00
Liu Ming
ee71a59ece
make const as more as possible
2016-01-21 14:01:02 +08:00
Liu Ming
a7238d0a7d
saturation region should start with 1.
2016-01-21 13:47:57 +08:00
Liu Ming
4daa70292e
fix formatting and grammar issues.
2016-01-21 13:45:32 +08:00
Liu Ming
a7aa2cf2c3
Add region number for output and output summary msg to streamLog
2016-01-18 11:10:51 +08:00
Liu Ming
598f456a29
change error to warning due to eclipse manual.
2016-01-18 11:10:36 +08:00
Liu Ming
30ace9cdcc
Add region number for unscaled endpoints.
2016-01-18 11:10:26 +08:00
Liu Ming
708da37250
1. use scaled_messages_ to store scaled endpoints infor.
...
2. format the terminal output messages.
2016-01-18 11:10:14 +08:00
Liu Ming
6753c84547
Add counter for numbering warning, error, proble, and bugs.
2016-01-18 11:10:04 +08:00
Liu Ming
2f19d0bba6
For that break clipse rules should raise an error.
2016-01-18 11:09:50 +08:00
Liu Ming
5c271db842
add cell index for scaled endpoints error messages output.
2016-01-18 11:09:02 +08:00
Joakim Hove
7cd43cc4ff
Merge pull request #942 from qilicun/debug_relperm
...
fix relperm diagnostics tests issue.
2016-01-11 09:21:10 +01:00
Liu Ming
0470428cab
fix relperm diagnostics tests issue.
2016-01-11 16:05:33 +08:00
Joakim Hove
4a95eb2917
Merge pull request #939 from joakim-hove/table-column
...
Table column
2016-01-08 15:29:10 +01:00
Joakim Hove
718ec8e791
Changed to use new table api from opm-parser.
2016-01-08 14:47:09 +01:00
chflo
c02966f6bc
OPM-163: Use EclipseState instead of Deck for PvtInterface
2016-01-07 16:36:28 +01:00
Joakim Hove
8ff67bd4a1
Removed erroneous test data.
2016-01-05 11:47:20 +01:00
Atgeirr Flø Rasmussen
186d77867a
Silence warnings in test programs.
2015-12-14 15:25:27 +01:00
Atgeirr Flø Rasmussen
c8a1492ca9
Merge pull request #928 from totto82/minpv_pinch
...
compatibility of MINPV and PINCH
2015-12-14 11:33:20 +01:00
Tor Harald Sandve
96b0f2e8cb
Bugfix. Fix face direction in the pinchprocessor
2015-12-14 10:48:26 +01:00
Atgeirr Flø Rasmussen
462b4ca996
Merge pull request #934 from totto82/residualSaturations
...
Add method to access the materialLawManager
2015-12-11 13:08:39 +01:00