Commit Graph

1652 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
21dda31ce6 Silence unused argument warnings. 2015-08-10 13:06:32 +02:00
Atgeirr Flø Rasmussen
519cdc6766 Fix bug in printf() output: formats and types. 2015-08-10 13:04:43 +02:00
Atgeirr Flø Rasmussen
3764c41405 Fix minor bug in helper function. 2015-08-10 12:50:49 +02:00
Joakim Hove
99cdc94345 Made exception message more useful. 2015-08-07 17:03:41 +02:00
Joakim Hove
18ead807f7 Changed VFPPRod string -> enum conversion routines.
Main change is in VFPPRod::getALQTYpe() where we use the
DeckItem::defaultApplied() method instead of comparing with the special
default value ' '. The other functions are changed just to be consistent.
2015-08-07 16:33:02 +02:00
Joakim Hove
c4e53b5621 Merge pull request #545 from joakim-hove/THPRES-parsemode
Added ParseMode switch for missing data in THPRES.
2015-08-07 16:31:48 +02:00
Joakim Hove
e964701023 Added ParseMode switch for missing data in THPRES. 2015-08-07 16:30:38 +02:00
Joakim Hove
c1e47e7053 Merge pull request #544 from babrodtk/vfp_printout_fix
Updated printout to be less verbose for not-so-nice data
2015-08-07 16:13:14 +02:00
Joakim Hove
bd5accc711 Merge pull request #543 from joakim-hove/COMPORD
Added ParseMode setting to handle COMPORD
2015-08-07 15:15:44 +02:00
Joakim Hove
1b752d59cf Added ParseMode setting to handle COMPORD 2015-08-07 15:13:52 +02:00
Joakim Hove
a344876a31 Merge pull request #537 from totto82/PVDS
Add support for PVDS
2015-08-07 13:34:39 +02:00
Joakim Hove
bdaa7090cf Merge pull request #542 from joakim-hove/Schedule-geo-message
Changed error message.
2015-08-07 12:01:15 +02:00
Joakim Hove
a79754bc1a Changed error message. 2015-08-07 12:00:26 +02:00
Joakim Hove
9c80bc2a53 Merge pull request #540 from joakim-hove/master
Fixed bug with nested includes
2015-08-07 10:59:44 +02:00
Joakim Hove
35d22ca526 Fixed bug with nested includes 2015-08-07 10:58:34 +02:00
Atgeirr Flø Rasmussen
3cc48145a1 Update case-insensitive-filesystem tests to use new ParserMode. 2015-08-07 10:43:31 +02:00
Tor Harald Sandve
a4a9de7d5e Add pvdsTables.hpp to cmakelist 2015-08-07 10:24:21 +02:00
Joakim Hove
5c55af2f86 Trim spaces before detecting randomSlash. 2015-08-07 10:22:00 +02:00
Tor Harald Sandve
46d787c7ce Add support for PVDS
-the PVDS implementation is essentially a copy of the PVDG
implementation as the PVDS table analogous the PVDG table
2015-08-07 10:09:48 +02:00
Joakim Hove
b253d828c7 Bug in IOConfig: using wrong timemap. 2015-08-06 17:06:15 +02:00
Joakim Hove
10a211cf8b Fixed bug in DynamicState when updating default. 2015-08-06 16:58:43 +02:00
Joakim Hove
f389fe2eca Fixed bug with IOConfig initialization. 2015-08-06 15:12:57 +02:00
Joakim Hove
268237f19b Added IOConfig integrationtest. 2015-08-06 15:12:56 +02:00
Joakim Hove
3ffbe75680 !! Fixed test due to bug in ScheduleParsing
During the work with ParseMode the the construction of the Schedule
object has been changed; previously the complete deck was iterated in
the method iterateSchedulesection() - whereas the correct is to only
iterate over the keywords in the Schedule section. This has led to a
minor fixup in the testdata for this commit.

There are probably more bugs in the IOConfig object - because there
RPTRST / RPTSCHED / keywords in the SOLUTION section have been taken
into account twice, both as part of the SOLUTION and then again
incorrectly as part of the SCHEDULE section.
2015-08-06 15:12:54 +02:00
Joakim Hove
e368a05e00 Merge fixup 2015-08-06 15:12:53 +02:00
Joakim Hove
91bd434963 Added ParseMode::randomSlash setting. 2015-08-06 15:12:51 +02:00
Joakim Hove
36a3708290 Added missing ParseMode() instance 2015-08-06 15:12:49 +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
ab40d500c6 Initialize unit system for Section objects. 2015-08-05 22:02:11 +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
33fbbde28c Merge pull request #534 from totto82/WSOLVENT
Adding support for changing WSOLVENT during simulations
2015-08-05 21:12:43 +02:00
Joakim Hove
2391b28518 Merge pull request #533 from joakim-hove/OPM-218
Opm 218
2015-08-05 15:11:13 +02:00
Tor Harald Sandve
e6c4586605 Add test for WSOLVENT 2015-08-05 13:41:25 +02:00
Tor Harald Sandve
ef4a9c43e0 Remove unused function 2015-08-05 11:38:33 +02:00
Tor Harald Sandve
fc9b3f99e7 Add check that WSOLVENT keyword is applied to Gas injector 2015-08-05 11:38:33 +02:00
Tor Harald Sandve
d926dd0eb7 Simplify by removing WellSolventProperties structure 2015-08-05 11:38:33 +02:00
Tor Harald Sandve
dab5172912 Adding support for changing WSOLVENT during simulations 2015-08-05 11:38:33 +02:00
Tor Harald Sandve
4ae5049639 Add <algorithm> to make it compile for gcc 4-6 2015-08-05 08:48:03 +02:00
Joakim Hove
b2cf484ded Added comment. 2015-08-04 17:21:59 +02:00
Joakim Hove
923d715bb9 Bug in handleSolutionsection():
- The handleSolutionsection() method would initialize the timemap, but
   not the storage vector.

 - Renamed initRestartOutputConfig -> assertTimeMap and calling it
   unconditionally.
2015-08-04 17:15:46 +02:00
Joakim Hove
2df100dbc9 Added debug method IOCOnfig::dumpRestartConfig() 2015-08-04 15:20:30 +02:00
Joakim Hove
7152274be7 Added const& operator[] to TimeMap. 2015-08-04 14:40:54 +02:00
Joakim Hove
8ae2f01f5f Merge remote-tracking branch 'chflo/OPM-218' into OPM-218 2015-08-04 13:57:48 +02:00
Tor Harald Sandve
1f442393c3 Remove special from sections 2015-08-03 11:44:47 +02:00
Tor Harald Sandve
7413a66c1b Add keywords for solvent model 2015-08-03 07:34:51 +02:00
chflo
7855af03a2 OPM-218: Fixed restart interval write for RPTRST 2015-08-02 22:03:09 +02:00
chflo
1156fb6a90 OPM-218: Fixed restart interval write for basic=4/5 2015-08-02 22:01:50 +02:00