Commit Graph

301 Commits

Author SHA1 Message Date
Tor Harald Sandve
9badf045a9 Add support for PMISC 2015-12-01 12:19:43 +01:00
Tor Harald Sandve
e97c6461e1 Add support for MISC 2015-12-01 12:19:43 +01:00
Tor Harald Sandve
5c35b8edeb Add support for SGCWMIS 2015-12-01 12:19:43 +01:00
Tor Harald Sandve
d151bfc83a Add support for SORWMIS 2015-12-01 12:19:42 +01:00
Kai Bao
6c8736f1ce updating ParseMULTSEGWELL intergration test. 2015-11-12 12:28:08 +01:00
Atgeirr Flø Rasmussen
ac478e04e5 Silence warnings from boost. 2015-11-09 16:43:31 +01:00
Kai Bao
ecb0186a08 using const std::string& for well_name and fix CMakeLists.txt
The problem for CMakeLists.txt is from the re-basing process.
2015-11-09 14:09:31 +01:00
Kai Bao
c59aff430f correcting the typo in Presure 2015-11-09 12:14:09 +01:00
Kai Bao
8704c3eac6 adding a mutlisegment wells intergration test. 2015-11-09 12:14:08 +01:00
Joakim Hove
66423aacd0 Added integration test for modifiers in Schedule. 2015-11-09 12:05:28 +01:00
Kristian Flikka
c1e1e4bdd1 Deleted unused file MULTREGT.cpp 2015-10-16 13:50:03 +02:00
Kristian Flikka
a2c21f5d88 Added missing curly brace (found using sonar with cppcheck and vera++) 2015-10-16 13:01:39 +02:00
Joakim Hove
51e3aa82cc Update include path 2015-10-06 11:30:43 +02:00
Joakim Hove
ea86b51b8d TableContainer for PLYMAX and PLYROCK. 2015-10-04 20:03:53 +02:00
Joakim Hove
40fa456603 TableContainer for PLYADS,PLYDHFL and PLYVISC. 2015-10-04 20:03:51 +02:00
Joakim Hove
ee6b5c9675 Added basic support for PLYADSS keyword. 2015-10-01 13:32:12 +02:00
chflo
1e83914a61 OPM-218-fix: Added integration testing against SPE1CASE2 2015-09-25 10:29:27 +02:00
Joakim Hove
703427caba Added OpmLoadDeck and load tests for opm-data. 2015-09-22 15:09:50 +02:00
Joakim Hove
6623b87ee6 Added Polymer integration test. 2015-09-17 22:28:30 +02:00
Joakim Hove
2681d1cc8f Refactor SimpleTable:
The SimpleTable class is initialized with a DeckItem instance containing
all the date for the table, instead of a DeckRecord (or DeckKeyword). As
a consequence the getFlatXxxx() methods have been removed.
2015-09-14 16:35:05 +02:00
Joakim Hove
5e6044061b Using DeckRecord in table init() methods. 2015-09-07 15:54:11 +02:00
Andreas Lauser
018547eac4 add unit test for SLGOF
thanks to [at]totto82
2015-08-25 11:32:50 +02:00
chflo
a09ff8b80e OPM-217: Added integration test for IOConfig handling of restart file write 2015-08-13 11:43:30 +02:00
Joakim Hove
d26428dd52 Reimplmented ParseMode based on string keys.
Completely reimplemented the ParseMode class. Now the main datastructure
is a map<string,action> where the possible error situations are the
keys. This approach allows for a much more flexible
setting/filtering/querying of the ParseMode settings.
2015-08-10 14:27:53 +02:00
Atgeirr Flø Rasmussen
3845e1c239 Suppress warnings from boost.
Done by using the disable_warnings.h and reenable_warnings.h headers.
In some cases also a little reordering of includes, to put all boost
includes in the warning-suppressed part.
2015-08-10 13:06:50 +02:00
Joakim Hove
268237f19b Added IOConfig integrationtest. 2015-08-06 15:12:56 +02:00
Joakim Hove
e368a05e00 Merge fixup 2015-08-06 15:12:53 +02:00
Joakim Hove
2582064c5d Added ParseMode::unsupportedScheduleGeoModifiers
- Added const ParseMode& argument to EclipseState() and Schedule()
   constructors.
 - Schedule constructor iterates through SCHEDULESection instance
   instead of Deck instance.
2015-08-06 15:12:48 +02:00
Joakim Hove
19eac286a0 Added ParseMode::missingDIMSkeyword 2015-08-05 22:02:11 +02:00
Joakim Hove
5e64d0f147 Added parser error for 'random text'.
Previously random text in the input deck which was not formatted as a
valid keyword header was simply ignored; i.e. this

   DIMENS
     10 10 10 /

   Mohaha random gibbersih - not according to any Spec.

   GRID

Would suprisingly parse just fine. This will now be handled according
to the ParseMode::randomText setting. Observe that as a side effect of
this it turned out that many of the test datasets had additional
terminating slashes which were now detected as 'ranomdText'.
2015-08-05 22:02:10 +02:00
Joakim Hove
733af54777 Added struct ParseMode to control parse behaviour.
- Introduce a very simple class ParseMode which will become a simple
   value object which can be used to control the behavior when errors
   and inconsistencies are encountered in the parse and EclipseState
   construction phases.

 - Added ParseMode instance as second argument to all parseXXX()
   methods.
2015-08-05 22:02:09 +02:00
Joakim Hove
44ba386bcc Add events from Schedule::iterateScheduleSection() 2015-07-24 12:40:50 +02:00
Joakim Hove
e8e76e3422 Merge pull request #505 from GitPaean/correcting_copyright_information
correcting copyright information.
2015-06-23 14:02:54 +02:00
Kai Bao
e654ab23b8 correcting copyright information. 2015-06-23 13:13:07 +02:00
André R. Brodtkorb
a57601661e Bugfixes VFPPROD and test 2015-06-23 09:40:20 +02:00
Liu Ming
e1fa3a98c8 Add keyword PLYDHFLF. 2015-06-20 16:57:42 +08: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
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
5221f273b5 Store the NNC in SI units 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
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
Joakim Hove
81ceb24fda Added utility method Schedule::getOpenWells( ) 2015-05-29 09:05:16 +02:00
Arne Morten Kvarving
2acd2db5d0 changed: rename Parser to opmparser for consistency 2015-05-26 13:53:54 +02:00
Arne Morten Kvarving
9e96127705 change how tests are added in the build system
- use a opm-macro to reduce code duplication
- add a 'test-suite' target which builds tests. for use if BUILD_TESTING
  is 0.
- add a 'check' target which builds tests, then executes them
2015-05-26 13:07:44 +02:00
chflo
8741d4497d OPM 199: Changes due to changes in Schedule constructor 2015-05-26 09:43:59 +02:00
Kai Bao
786908f723 Adding integration test for PLYSHLOG. 2015-04-27 11:38:12 +02:00
Fredrik Gundersen
b522daf9b1 Updated test to include testing of nested PATHS replacment 2015-03-31 13:28:32 +02:00
Joakim Hove
be93f81360 Removed Statoil internal test. 2015-03-18 13:58:31 +01:00
Joakim Hove
9fb229ccd7 Replaced references to logger with OpmLog::addMessage() 2015-03-04 22:14:31 +01:00
Joakim Hove
f3419e8e61 Removed methods from CounterLog:
- Methods to get the number of Warning, Errors and Notes.
  - Methods to get the file/line/description content of a message.
2015-03-04 22:12:53 +01:00