Commit Graph

1355 Commits

Author SHA1 Message Date
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
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
Joakim Hove
6362bd2eb1 Fixed typo. 2015-07-28 09:27:05 +02:00
Joakim Hove
847fc3ba6f Added EclipseGrid::cellThickNess() method 2015-07-27 17:57:34 +02:00
chflo
36279ae421 OPM-218: Fixed corresponding tests 2015-07-27 10:48:18 +02:00
chflo
1251484b32 OPM-218: Fixed flow vs eclipse restart interval write differences for rptrst basic 4 and 5 2015-07-27 10:47:38 +02:00
Joakim Hove
a741db7b7c Merge pull request #506 from joakim-hove/schedule-events
Schedule events
2015-07-24 14:21:20 +02:00
Joakim Hove
64ceffbbec Merge pull request #526 from joakim-hove/TOPS-z-tolerance
When fully specified TOPS agrees within 1e-6 with TOPS(k=1) and DZ: Enforce bitwise equality
2015-07-24 14:20:30 +02:00
Joakim Hove
e6343e1b0b Fixed bug in WELOPEN for all defaulted. 2015-07-24 12:40:50 +02:00
Joakim Hove
44ba386bcc Add events from Schedule::iterateScheduleSection() 2015-07-24 12:40:50 +02:00
Joakim Hove
f62c891f1a Added basic Event system for Schedule events 2015-07-24 12:40:49 +02:00
Joakim Hove
ddde52ad4c DynamicState::update() will return bool. 2015-07-24 12:40:48 +02:00
Joakim Hove
bc3b9837e0 Renamed DynamicState::add() -> Dynamicstate::update() 2015-07-24 12:40:47 +02:00
Andreas Lauser
e32f8b5742 make the 'd' exponent specifier the slow path
i.e. first try to convert it normally and only if this fails, replace
'd' by 'e' and try again.

this is because the slowdown when always taking the second path was
about 7 to 9% for the Norne deck on my machine. (I think this is quite
surprising.)

thanks to [at]joakim-hove for the hint.
2015-07-24 11:36:36 +02:00
Joakim Hove
d7406273c5 Enforce bitwise equality in ZCORN with full TOPS. 2015-07-24 09:32:54 +02:00
Andreas Lauser
1d388b3b78 implement support for fortran-style 'd' exponent indicators
also, extend the corresponding unit test.
2015-07-23 16:18:07 +02:00
Andreas Lauser
eca9a3016d fix the data of grid property unit test
critical saturations must always be defined. again thanks to [at]bska
for the hint.
2015-07-21 13:07:34 +02:00
Andreas Lauser
40bef918a5 SatfuncPropertyInitializer: determine the critical saturations correctly
At least I hope it's correct: the condition for breaking the loops
where inverted in some places.

thanks to [at]bska for discovering this.
2015-07-21 13:07:28 +02:00
Atgeirr Flø Rasmussen
3cdc01fbe3 Do not mix signed and unsigned. 2015-07-15 11:15:49 +02:00
Atgeirr Flø Rasmussen
4b11bf74d8 Fix order of initialisation. 2015-07-15 11:15:28 +02:00
Atgeirr Flø Rasmussen
26a6bffe06 Avoid using extremely long initialiser list.
The long list caused extreme compile-times for clang in optimised mode.
2015-07-13 12:50:03 +02:00
Atgeirr Flø Rasmussen
3713d65052 Add missing method implementation for hasNNC(). 2015-07-13 11:03:31 +02:00
Joakim Hove
924bac28e3 Merge pull request #511 from andlaus/vertical_scaling_properties
add grid properties required for the simple "vertical" endpoint scaling
2015-07-10 09:41:52 +02:00
Andreas Lauser
d234d37616 grid properties: Add support for three point vertical relperm scaling
because it seems like the code in opm-core uses this at some point.
2015-07-09 12:16:08 +02:00
Andreas Lauser
f5c13deb0a add grid properties required for the simple "vertical" endpoint scaling
i.e., the PC[GW] and KR[OGW] properties plus their imbibition and
directional variants. the properties required for three-point vertical
scaling (i.e., KRWR, et al.) are still to be done.
2015-07-09 12:16:03 +02:00
Andreas Lauser
16c7fdce6d grid properties: check stricter has*Property() behavior in the unit test
thanks to [at]joakim-hove for the suggestion.
2015-07-09 12:16:01 +02:00
Andreas Lauser
0278a9c235 EclipseState: make has*GridProperty() more strict
i.e., it now throws if it is queried for an unsupported grid
properties. The main intention is to make code like

```c++
if (eclipseState->hasDoubleGridProperty("IHAVEATYPO"))
{
        auto prop = eclipseState->getDoubleGridProperty("IHAVEATYPO"));
}
```

no longer run without raising and exception.
2015-07-09 12:15:59 +02:00
Andreas Lauser
456e9379f6 grid properties: fix typo
the keyword is called 'MULTZX', not 'MULTXZ'!
2015-07-09 12:15:57 +02:00
Bård Skaflestad
9e10c97b2d Install VFP Table Headers
This commit marks the VFP*Table.hpp header files as installable.
That is needed for consumers of an installed opm-parser module.
2015-07-08 23:15:36 +02:00
André R. Brodtkorb
016c7f9af3 Fixed bug in test which checked for the wrong type of exception 2015-07-08 20:30:26 +02:00
babrodtk
e27b04692b Removed getNonEmptyItem function 2015-07-08 17:51:54 +02:00
babrodtk
109f47a001 More safety checks when reading VFPProdTables 2015-07-08 17:46:10 +02:00
babrodtk
6ffdec7e0b Minor bugfix for VFP tables 2015-07-07 15:53:28 +02:00