OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,445 Commits 18 Branches 75 Tags
dcc3668fdd1662b4b4364d48fc22bd486a93d53e
Commit Graph

1031 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
1622a5bd49 Use explicit loop invariant in loadFromDeckKeyword 
gcc doesn't seem to do this for us.
 2016-05-03 09:16:28 +02:00
Kjell W. Kongsvik
db7958d439 Return type -> const & 2016-05-02 10:13:28 +02:00
Kjell W. Kongsvik
34dbf826de Support explicit setting of BaseName 
Needed when reading deck from string and trying to write to disk.
If this is not set there is no baseName to base the file name on.
 2016-04-29 16:04:16 +02:00
Atgeirr Flø Rasmussen
28d6237749 Silence warning in brace-init of std::array. 2016-04-29 13:45:26 +02:00
Joakim Hove
d86343f8a5 Merge pull request #784 from kjellkongsvik/clean_EclipseWriter 
Clean eclipse writer
 2016-04-29 11:42:41 +02:00
Kjell W. Kongsvik
bedd431b10 Use path of input as default output path 
Custom output path can be set explicitly using IOConfig::setOutputDir(path)
 2016-04-29 11:24:48 +02:00
Joakim Hove
bc000899c8 Merge pull request #777 from joakim-hove/ignore-skiprest 
Ignore skiprest
 2016-04-28 22:20:44 +02:00
Kjell W. Kongsvik
65277fcc9f Removed getDeckFileName as the usage of it in EclipseWriter is not needed 
Remove in opm-output
 2016-04-28 16:19:56 +02:00
Joakim Hove
d32b409c27 Added Eclipse3DProperties PRESSURE, SGAS & SWAT. 2016-04-28 16:03:29 +02:00
Joakim Hove
25ef8781c9 Added ability to set restart parameters. 2016-04-28 16:03:29 +02:00
Kjell W. Kongsvik
b3b8cebeff Simplified deck filename handling. Only set filename if successfully opened 2016-04-28 15:42:07 +02:00
Kjell W. Kongsvik
79ab818c3a Default output dir is current active directory 
Optionally specify using IOCondig::setOutputDir()
 2016-04-28 13:45:09 +02:00
Kjell W. Kongsvik
5fb3a6fc53 Add dataFile to Deck if loaded from file 
If loaded from string keep empty
 2016-04-28 13:45:08 +02:00
Kjell W. Kongsvik
1640ad0826 Removed meaningless "path" paramater in tests 
This parameter will be used in a more meaningful way
 2016-04-28 13:45:08 +02:00
Kjell W. Kongsvik
206e16fba5 Added fields to IOConfig so parameters can be removed from EclipseWriter 
std::string     m_deck_filename;
bool            m_output_enabled;
std::string     m_output_dir;
 2016-04-28 13:45:08 +02:00
Joakim Hove
54579155a1 Merge pull request #782 from jokva/grid-properties-std-function 
Refactor GridPropertyInitializers to use std::function
 2016-04-28 09:02:25 +02:00
Pål Grønås Drange
e1ab313cb7 Added method getIJK in EclipseGrid 2016-04-27 12:55:14 +02:00
Jørgen Kvalsvik
e7bdb796da Replace boost::lexical_cast with std::to_string 2016-04-27 11:51:45 +02:00
Jørgen Kvalsvik
eb1182da27 Moved temp init into GridProperty 
The GridPropertyInitializers files now really only held the temperature
initialisation function, and has been merged into GridProperty.
 2016-04-27 11:51:45 +02:00
Jørgen Kvalsvik
0889c8c286 Bind parameters individually to init/post hooks 
With the inflexible GridProperty*Function replaced with std::function,
bind parameters individually to each property, indicating exactly what
dependencies any function has.
 2016-04-27 11:51:45 +02:00
Jørgen Kvalsvik
5f22a99a96 Replace Grid*Function with std::function 
Replaces the home-grown capturing function object with std::function.
Using the library provided std::function enables creating the objects
via std::bind, enabling non-uniform signatures and relieves us of a
maintenance burden.
 2016-04-27 11:51:45 +02:00
Joakim Hove
22c766acf8 Merge pull request #779 from jokva/group-get-wells-method 
Adds Group::getWells method
 2016-04-27 11:30:29 +02:00
Jørgen Kvalsvik
20b5b63f72 Adds Group::getWells method 
Add support for querying what wells are in a given group at a certain
time step.
 2016-04-26 10:40:42 +02:00
Joakim Hove
37381af2d6 Merge pull request #772 from qilicun/remove-OpmLog 
Remove OpmLog usages in Parser folder.
 2016-04-26 07:51:30 +02:00
Joakim Hove
fb8c39a8c4 Using compile time constants. 2016-04-25 15:37:46 +02:00
Joakim Hove
d097f95601 Will ignore SKIPREST keyword. 2016-04-25 15:37:46 +02:00
Jørgen Kvalsvik
ee4e447e92 Rename Summary to SummaryConfig 
This object turns out to be the actual configuration object, not a
mediator state to obtain a configuration. It is therefore renamed to
reflect intent and behaviour.
 2016-04-25 11:45:39 +02:00
Liu Ming
59c6569a78 Make mutable MessageContainer member, recover the const qualifier for deck. 2016-04-25 16:25:15 +08:00
Jørgen Kvalsvik
0a5c7c85f8 Fix off-by-one error in satfuncinit. 
Reported by Bård Skaflestad in
https://github.com/OPM/opm-parser/issues/774.
 2016-04-25 08:37:48 +02:00
Liu Ming
9ad0219603 use MessageContainer to logging. 2016-04-22 18:41:34 +08:00
Liu Ming
52af33c7e0 remove const constrain for Deck. 2016-04-22 16:51:04 +08:00
Liu Ming
c42cfafc90 Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class 
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.cpp
	opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
 2016-04-22 14:53:16 +08:00
Liu Ming
b17e11a9ad collect all the messages in intGridProperties and doubleGridProperties. 2016-04-22 14:42:24 +08:00
Atgeirr Flø Rasmussen
1c4e4bd3da Silence some shadowing warnings. 2016-04-21 09:32:25 +02:00
Atgeirr Flø Rasmussen
9e0635d62a Bugfix: actually check the passed-in properties. 2016-04-21 09:30:00 +02:00
Pål Grønås Drange
444f74642c Refactored EclipseState.getEclipseGrid to getInputGrid 2016-04-19 16:47:05 +02:00
Pål Grønås Drange
aaf0a2fcbc Renamed m_eclipseGrid to m_inputGrid internally in EclipseState 2016-04-19 13:06:37 +02:00
Pål Grønås Drange
b94c554249 Added fixture Setup to ThresholdPressureTest thereby removing leaks 2016-04-19 12:43:57 +02:00
Pål Grønås Drange
ba01b7eb53 Fixes support for BOXed ACTNUM 
* Added ACTNUM as keyword to Eclipse3DProperties
* Removed certain checks from EclipseGrid that are no longer of use
* Added tests to EclipseGridTests that test boxed ACTNUM and activeCells
* Made EclipseGrid non-const in EclipseState since we must run resetACTNUM
* Fixed a minor typo in an error message in EclipseGrid
* Fixed typo in GridProperty: Deckeyword -> DeckKeyword
* Fixed two errors in tests recently introduced relating to Ecl3DProps
* Removed test in EclipseGridTests; We now accept too small ACTNUM vectors
* Added ACTNUM test for GridProperties
 2016-04-19 10:54:09 +02:00
Liu Ming
17918ac5b3 use proper function to log filename, line number, msg. 2016-04-19 15:06:03 +08:00
Liu Ming
2fd5477f44 make the memeber function as non-static, use MessageContainer to replace OpmLog. 2016-04-18 15:16:09 +08:00
Liu Ming
e5eb0a7a58 remove some comments. 2016-04-18 15:13:49 +08:00
Liu Ming
dc23a3135d made the member functions as no-static, use message container instead of OpmLog. 2016-04-18 14:27:12 +08:00
Liu Ming
7ddad9bf67 assemble messages in the constructor. 2016-04-18 14:26:39 +08:00
Liu Ming
7176753297 solve conflict. 2016-04-15 09:41:45 +08:00
Liu Ming
940d7f8449 Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class 
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.cpp
 2016-04-15 09:14:00 +08:00
Andreas Lauser
92a55cb267 avoid reserved names for guard macros 
just like for macros that start and end with `__`, `clang++
-Weverything` likes to complain about macros which start and end with
a single underscore. This is basically the same issue as
Ensembles/ert#1048
 2016-04-14 17:19:37 +02:00
Atgeirr Flø Rasmussen
209d30f0d0 Silence missing-braces warning. 
Can switch back when we move to C++14 uniformly.
 2016-04-14 14:51:42 +02:00
Joakim Hove
098ce7b9a8 Merge pull request #734 from jokva/new-summary-keywords 
New summary keywords
 2016-04-14 14:07:15 +02:00
Joakim Hove
244a9f9c1d Merge pull request #720 from jokva/fipnum-register-regions 
Query the name of (FIP) regions in State
 2016-04-14 12:44:33 +02:00