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

1051 Commits

Author SHA1 Message Date
Pål Grønås Drange
607e4e2b9a Renamed getNNC() to getInputNNC() avoids confusion 
* The NNC in the eclipse state is and will always be the nnc from deck
* updated tests
 2016-05-13 14:09:29 +02:00
Jørgen Kvalsvik
99829e1696 Ignore RPTONLY 2016-05-10 14:43:19 +02:00
Jørgen Kvalsvik
42992d9b91 Add missing member constructor call. 2016-05-10 10:08:29 +02:00
Joakim Hove
afc76ccd7e Merge pull request #797 from jokva/summary-config-from-eclipsestate 
Summary config from eclipsestate
 2016-05-10 09:55:11 +02:00
Jørgen Kvalsvik
3106e6ae8a Create SummaryConfig object in EclipseState 2016-05-09 15:10:21 +02:00
Jørgen Kvalsvik
00066e225f Special-case handling of RUNSUM keyword 
The RUNSUM keyword is identified as a Region-type keyword, but isn't
really. It's to be ignored by the SummaryConfig construction.
 2016-05-09 15:09:43 +02:00
Jørgen Kvalsvik
79a8f6efc5 Clean up initialisation order in EclipseState 
The previous order was inaccurate and confusing. Clean up member and
initialisation order to more closely reflect the actual intent and
behaviour.
 2016-05-09 15:09:42 +02:00
Jørgen Kvalsvik
0aa3e533f8 Remove unused EclipseGrid argument from Compsegs 2016-05-09 14:56:04 +02:00
Jørgen Kvalsvik
caa10631b0 IOConfig::handle* takes references over shared_ptr 2016-05-09 14:56:04 +02:00
Jørgen Kvalsvik
1d5ae5ea55 EclipseGrid::getNXYZ which returns xyz as array 2016-05-09 14:55:24 +02:00
Jørgen Kvalsvik
ee8710d3cb SummaryConfig does not require EclipseState 
Rewrite construction to accept EclipseState components instead of the
full state. Enables having SummaryConfig as a member in EclipseState.
 2016-05-09 14:55:24 +02:00
Jørgen Kvalsvik
28ae15cf0f Move getRegions into 3DProperties 2016-05-09 14:55:24 +02:00
Joakim Hove
3289b046c3 Check deck for ACTNUM keyword. 2016-05-09 09:44:31 +02:00
Pål Grønås Drange
091dc196f3 Added parse functions for Parser, for simpler creation of state and grids 2016-05-06 12:21:41 +02:00
Pål Grønås Drange
b8b1ba9528 ParseContext is now a member of EclipseState 
* EclipseState now copies input ParseContext and keeps it as member
* Made the argument (ParseContext) default as ParseContext()
* Now you can make a new EclipseState with only deck as argument
* Removed test that tested address equality of ParseContext objects
 2016-05-06 11:37:26 +02:00
Pål Grønås Drange
672b240e00 fixed bug in Parser, use openRootFile 2016-05-03 15:22:34 +02:00
Pål Grønås Drange
d9eb3ebf86 Added test for IOConfigBaseName and fixed a self-introduced bug in E.S. 2016-05-03 14:07:01 +02:00
Pål Grønås Drange
3a3ec10649 moved initialization of primary's to header, fixed rebase 2016-05-03 13:22:57 +02:00
Pål Grønås Drange
5a7dcc5427 Made FaultCollection reference in State thereby fixing compiler warn 2016-05-03 13:22:57 +02:00
Pål Grønås Drange
63e452167c Introduce deckptr-less EclipseState and EclipseGrid 2016-05-03 13:22:56 +02:00
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