OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,778 Commits 18 Branches 75 Tags
18ead807f7039005512aeddfa9a2185f2f025d4b
Commit Graph

652 Commits

Author SHA1 Message Date
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
a79754bc1a Changed error message. 2015-08-07 12:00:26 +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
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
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
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
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
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
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
Joakim Hove
d7406273c5 Enforce bitwise equality in ZCORN with full TOPS. 2015-07-24 09:32:54 +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
babrodtk
91eae36f00 Updated printout to be less verbose for not-so-nice data 2015-07-09 17:13:40 +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