Atle Haugan 1dd448b178 Merge branch 'master' into specialkeywords ...

Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.hpp

2014-01-30 15:05:01 +01:00

..

ACTION

Added action: THROW_EXCEPTION

2013-10-08 16:54:41 +02:00

DENSITY

Added test example for parsing DENSITY keyword.

2013-12-18 12:32:02 +01:00

END

Added missing files

2014-01-24 12:05:03 +01:00

EQUIL

Moved testdata into integration test folder. Added build folder to gitignore

2013-08-21 09:35:38 +02:00

include path

Moved testdata into integration test folder. Added build folder to gitignore

2013-08-21 09:35:38 +02:00

PORO

Updated ParsePORO test to also parse PERMX and check dimensions.

2013-12-18 08:57:34 +01:00

RSVD

Added two files with test data

2013-10-04 13:38:40 +02:00

SCHEDULE

Added injectorControlMode to Well class.

2014-01-29 13:33:28 +01:00

TITLE

New version based on feedback from code review

2014-01-29 19:39:33 +01:00

TVDP

Added integration test for parsing of TVDP* keywords.

2013-12-01 09:28:45 +01:00

VFPPROD

Support for parsing keywords with unknown size.

2013-12-05 08:26:29 +01:00

WCONHIST

Moved testdata into integration test folder. Added build folder to gitignore

2013-08-21 09:35:38 +02:00

bpr.data

Added Deck class (empty), and some integration tests. WIP

2013-05-27 14:27:22 +02:00

mini.data

Moved testdata into integration test folder. Added build folder to gitignore

2013-08-21 09:35:38 +02:00

small.data

Merged upstream/master

2013-08-23 09:30:23 +02:00

someobscureelements.data

Added (dummy) items for RADFIN4 keyword in testdata

2013-08-23 09:33:01 +02:00

truncated_records.data

Added check if rawRecord is empty, then default is used. Added some json data

2013-08-23 14:20:32 +02:00

wwct.data

Added/implemented XStringItem for Parser and Deck, with tests. Added integration test for WWCT keyword. Moved DeckItem tests into type-specific files. Removed unused file.

2013-06-20 13:56:11 +02:00