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

1615 Commits

Author SHA1 Message Date
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
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
André R. Brodtkorb
546e3ef213 Updated EclipseState to use std::map for VFP*Tables 2015-07-03 10:10:12 +02:00
André R. Brodtkorb
eb783df5a9 Changed int to size_t 2015-07-03 09:50:42 +02:00
babrodtk
c87b21f328 Added VFPInjTable 2015-07-03 08:53:22 +02:00
André R. Brodtkorb
08d5a92ae1 Added tests that check 'fail path' for VFPProdTable 2015-06-29 16:01:32 +02:00
André R. Brodtkorb
49bd072c61 Updated VFPProdTable to use compile-time constants and removed superfluous asserts 2015-06-29 14:53:20 +02:00
André R. Brodtkorb
5eb810f54f Fixed warnings 2015-06-25 14:14:57 +02:00
André R. Brodtkorb
0c89cc92ff Added handling of units 2015-06-25 11:55:02 +02:00
André R. Brodtkorb
6a8595f7a9 Whitespace 2015-06-25 09:11:04 +02:00
André R. Brodtkorb
1a34a2f913 Fixed erronous include 2015-06-25 09:08:54 +02:00
André R. Brodtkorb
1d9f519111 Updated the way individual tables are parsed 2015-06-24 16:05:03 +02:00
André R. Brodtkorb
7fe4b95b0d Added initial version of VFPPROD tables support 2015-06-24 15:46:47 +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
e3ee5b0fec Removed default value for ALQ 2015-06-23 11:07:39 +02:00
André R. Brodtkorb
a57601661e Bugfixes VFPPROD and test 2015-06-23 09:40:20 +02:00
Joakim Hove
fccf5cd603 Merge pull request #502 from atgeirr/fix-updatefile 
Improve updateFile and suppress warnings.
 2015-06-22 11:47:23 +02:00
Joakim Hove
692b31c764 Merge pull request #500 from qilicun/plydhflf 
Add keyword PLYDHFLF.
 2015-06-22 11:46:44 +02:00
chflo
c9bf166b08 Fixed IOConfig compiler warning; wrong return type for method overrideRestartWriteInterval 2015-06-22 11:18:45 +02:00
Atgeirr Flø Rasmussen
6b59f78293 Improve updateFile and suppress warnings. 2015-06-22 10:17:19 +02:00
Liu Ming
e1fa3a98c8 Add keyword PLYDHFLF. 2015-06-20 16:57:42 +08:00
Joakim Hove
b83b4b614e Claenup ParserState constructors. 2015-06-18 08:06:41 +02: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
Joakim Hove
c38b892876 Moved initialization of FaultCollection. 2015-06-18 08:06:39 +02:00
Joakim Hove
f8bc617894 Changed Deck::getKeywordList: 
The method will return an empty vector - instead of throwing, if you ask
for a missing keyword.
 2015-06-18 08:06:38 +02:00
Joakim Hove
97a9f25260 Added template access to Deck::getKeywordList() 2015-06-18 08:06:37 +02:00
Atgeirr Flø Rasmussen
e11bd93646 Silence shadowing warning. 2015-06-16 14:41:45 +02:00
chflo
34211a34f1 OPM-212: Added nonconst getmethod of IOConfig to EclipseState 2015-06-15 11:50:04 +02:00
chflo
e477aaf3dc OPM-212: Added test of new method in IOCOnfig 2015-06-15 11:49:33 +02:00
chflo
7aea4129b3 OPM-212: Added method for overriding write of restart file interval to IOConfig 2015-06-15 11:49:32 +02:00