Commit Graph

1575 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
6b59f78293 Improve updateFile and suppress warnings. 2015-06-22 10:17:19 +02:00
Joakim Hove
b83b4b614e Claenup ParserState constructors. 2015-06-18 08:06:41 +02:00
Joakim Hove
875fd86c3c Added strict flag to parser:
Have added a new bool strict flag to the parsing functions, if the
strict flag is set to false the parser will just skip lines with unknwon
keywords, including pure garbage in the input. I.e. for a deck like:

TABDIMS
  1 1 1 /

Crap - not a keyword at all

-- Correctly formatted - unknown keyword
IGNORED
  0 1 /

The parser will load the TABDIMS keyword correctly, and skip the rest.
2015-06-18 08:06:40 +02:00
Joakim Hove
c38b892876 Moved initialization of FaultCollection. 2015-06-18 08:06:39 +02:00
Joakim Hove
f8bc617894 Changed Deck::getKeywordList:
The method will return an empty vector - instead of throwing, if you ask
for a missing keyword.
2015-06-18 08:06:38 +02:00
Joakim Hove
97a9f25260 Added template access to Deck::getKeywordList() 2015-06-18 08:06:37 +02:00
Atgeirr Flø Rasmussen
e11bd93646 Silence shadowing warning. 2015-06-16 14:41:45 +02:00
chflo
34211a34f1 OPM-212: Added nonconst getmethod of IOConfig to EclipseState 2015-06-15 11:50:04 +02:00
chflo
e477aaf3dc OPM-212: Added test of new method in IOCOnfig 2015-06-15 11:49:33 +02:00
chflo
7aea4129b3 OPM-212: Added method for overriding write of restart file interval to IOConfig 2015-06-15 11:49:32 +02:00
Joakim Hove
20170f888b Merge pull request #488 from iLoop2/OPM-97
Added WPIMULT keyword support
2015-06-13 00:17:22 +02:00
Edvin Brudevoll
b163ce400b OPM-211: Added InitConfig member to EclipseState 2015-06-11 12:40:10 +02:00
Edvin Brudevoll
90c023f1f0 OPM-211: Added new InitConfig class, and corresponding test 2015-06-11 12:40:09 +02:00
Edvin Brudevoll
3c5ed85bc0 OPM-211: Added RESTART keyword 2015-06-11 12:40:08 +02:00
Tor Harald Sandve
486182b7de Adress minor comments from PR
1) use addNNC() method to store the NNCs
2) convert all int's to size_t
3) remove .reserve() from the loop
4) use m_xxx instead of xxx_
5) rename xyz1 to ijk1 etc.
2015-06-11 06:43:25 +02:00
Tor Harald Sandve
8e005f953a Add NNC to EclipseState
The NNCs are read from the deck and stored in the EclipseState
2015-06-10 10:23:02 +02:00
Tor Harald Sandve
5221f273b5 Store the NNC in SI units 2015-06-10 10:23:02 +02:00
Tor Harald Sandve
8a2fed1bf8 Address minor comments
Change int to size_t
Remove hasNNC_
2015-06-10 10:23:02 +02:00
Tor Harald Sandve
5cd9a7f7b2 Add NNC class
This class provides the raw non-neighboring connections data as read
from the deck and/or added using the addNNC method.
The NNC data is currently not processed. I.e. multiple NNC connection
between the same cell can exist side by side.
2015-06-10 10:23:02 +02:00
Fredrik Gundersen
186247f40e Added tests for wellpi
cumulative behavior and reset back to 1.0 with COMPDAT
2015-06-10 07:51:50 +02:00
Fredrik Gundersen
d6ee25e3d3 Changed to cumulative behavior for wellpi 2015-06-10 07:50:43 +02:00
Fredrik Gundersen
1e4f4571fd Added default value for wellpi 2015-06-10 07:50:18 +02:00
Fredrik Gundersen
b7d04ae0aa Merge remote-tracking branch 'upstream/master' into OPM-97 2015-06-10 07:19:44 +02:00
Joakim Hove
ba54398cf1 Merge pull request #489 from joakim-hove/create-default
Updated code generation
2015-06-09 17:19:51 +02:00
Joakim Hove
ef42deeb46 Added method globalReset() to DynamicState<T> 2015-06-08 14:15:03 +02:00
Joakim Hove
679ef35d0b Updated code to use compiled defaults 2015-06-08 11:29:21 +02:00
Joakim Hove
c0db611aa8 Added template method Parser::addKeyword<T>() 2015-06-08 11:29:20 +02:00
Joakim Hove
fd87b22f7d Added methods to Deck::getKeyword<T>() 2015-06-08 11:29:19 +02:00
Joakim Hove
1161e1098c Rewritten code generation:
With this commit the generation of built in keywords is completely
changed. The most important changes include:

  1) We have autogenerated a class for each keyword in the new
     ParserKeywords { ... } namespace.

  2) The autogenerated classes derive from ParserKeyword, and the
     default constructor will build of a fully initialized
     ParserKeyword instance, i.e. the keyword used to parse the EQUIL
     keyword can be instantiated as simple as:

         ParserKeywords::EQUIL kw;

  3) The generated keywords have built in static constants for keyword
     and item names, and item default values. That way it should be
     possible for the compiler to catch trivial errors like trying to
     access the keyword "PoRO"; also the the access to default values
     means that properties can be initialized without actually
     insantiating a DeckKeyword.

  4) Two new classes Generator/KeywordLoader and
     Generator/KeywordGenerator have been created, with the help of
     these classes the keyword generation code is significantly
     simplified.
2015-06-08 11:29:18 +02:00
Edvin Brudevoll
81d22c237d Added new method getNumPhases to EclipseState 2015-06-08 09:40:19 +02:00
Joakim Hove
3e77c88f31 ParserKeyword constructor with one argument works. 2015-06-05 14:26:36 +02:00
Joakim Hove
9ea6e03e37 Changed item names to avoid conflict with keyword name. 2015-06-05 14:26:36 +02:00
Joakim Hove
9413e5216e Changed name of data item to from Keyword to 'data' 2015-06-05 14:26:35 +02:00
Joakim Hove
8756435766 Added JsonObject::to_string() - removed content. 2015-06-05 14:26:35 +02:00
Joakim Hove
bb4d676d45 Added method ParserRecord::hasItem() 2015-06-05 14:26:34 +02:00
Joakim Hove
155ad22a05 Made constructors explicitly public 2015-06-05 14:26:34 +02:00
Fredrik Gundersen
c3758d623b Added test for WPIMULT 2015-06-02 13:30:53 +02:00
Fredrik Gundersen
60db596671 Added new keyword 2015-06-02 13:26:51 +02:00
Fredrik Gundersen
805cb410cd Update to support WPIMULT 2015-06-02 13:26:37 +02:00
Kai Bao
0bba4ef925 changing the first column of PLYSHLOG table to be dimensionless.
The unit will be handled in opm-polymer based on the keyword SHRATE.
2015-06-02 13:06:41 +02:00
Fredrik Gundersen
60ab4ecb77 Merge remote-tracking branch 'upstream/master' into OPM-97 2015-06-02 10:22:39 +02:00
Fredrik Gundersen
1305e87911 OPM-97 2015-06-02 09:30:08 +02:00
Kai Bao
4bbd66599c Adding keywords SHRATE. 2015-06-01 15:28:46 +02:00
Joakim Hove
5d2160438f Changed order in < comparison 2015-06-01 14:53:16 +02:00
chflo
3acd325c39 OPM-205: Reduced severity of output GRID file not supported from throw to warning 2015-05-29 12:07:34 +02:00
chflo
4854547606 OPM-205: Added tests for handling of RPTSCHED RESTART and RPTSCHED NOTHING 2015-05-29 12:07:33 +02:00
chflo
9eb13cfe06 OPM-205: Added handling of RPTSCHED RESTART and RPTSCHED NOTHING 2015-05-29 12:07:33 +02:00
chflo
c7d2c62d3d OPM-205: Added testing of new features in IOConfig 2015-05-29 12:07:32 +02:00
chflo
8a12c3eda9 OPM-205: Added support for RPTSCHED RESTART, and handling of RPTRST BASIC = 0 2015-05-29 12:07:32 +02:00
Joakim Hove
216e80a845 Fixed wrong include path 2015-05-29 09:55:50 +02:00