Commit Graph

1864 Commits

Author SHA1 Message Date
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
Joakim Hove
6c844ab884 Merge pull request #494 from joakim-hove/public
Made constructors public:
2015-06-10 09:52:16 +02:00
Joakim Hove
f37c0f69b8 Made constructors public: 2015-06-10 09:50:17 +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
24b8ca5f69 Removing old stale text file 2015-05-29 12:00:00 +02:00
Joakim Hove
1d04d98fc8 Deleted old stale txt file 2015-05-29 11:59:12 +02:00
Joakim Hove
7ee8657fa6 Merge pull request #483 from joakim-hove/keyword-documentation
Added keyword documentation
2015-05-29 11:56:19 +02:00
Joakim Hove
d311b82983 Added keyword documentation 2015-05-29 11:54:46 +02:00
Joakim Hove
216e80a845 Fixed wrong include path 2015-05-29 09:55:50 +02:00
Joakim Hove
a3451a4f7f Merge pull request #466 from joakim-hove/remove-ert-cpp
Removed ERT Cxx wrappers
2015-05-29 09:22:16 +02:00
Joakim Hove
91826a3ffa Merge pull request #468 from iLoop2/OPM-203
Added suport for converting of Metric grid values
2015-05-29 09:22:05 +02:00
Joakim Hove
1bbda0f073 Merge pull request #481 from joakim-hove/open-wells
Added utility method Schedule::getOpenWells( )
2015-05-29 09:05:51 +02:00
Joakim Hove
81ceb24fda Added utility method Schedule::getOpenWells( ) 2015-05-29 09:05:16 +02:00
Joakim Hove
601c8cedcf Added placeholder ParserKeywords.hpp 2015-05-28 00:03:49 +02:00
Atgeirr Flø Rasmussen
2cc4c8ae8e Remove unused deck argument from IOConfig constructor.
Also made constructor explicit since it now only takes a single argument,
to avoid unintended implicit conversion.
2015-05-27 11:51:19 +02:00
Joakim Hove
ead856c3f6 Testing updates:
Have removed the inlineItemTest - this test did not add anything new
compared to the much more comprehensive inlinekeywordTest.
2015-05-27 09:38:59 +02:00
Joakim Hove
60eaacb6fe Removed ERT Cxx wrappers 2015-05-27 07:12:41 +02:00
Joakim Hove
0a2a1e0d68 Added documentation of the code generation. 2015-05-26 18:15:08 +02:00
Arne Morten Kvarving
5d572f846f fix linking of applications after targets was renamed 2015-05-26 14:25:21 +02:00