OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #645 from joakim-hove/use-slash-termination

Browse Source 
Use slash termination to determine size of keywords SKPRPOLY SKPRWAT
This commit is contained in:
Joakim Hove 2019-02-20 17:53:33 +01:00 committed by GitHub
commit e00a5d5fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opm/parser/eclipse/share/keywords/900_OPM/P/PLYMWINJ
View File

@ -1,4 +1,4 @@
{"name" : "PLYMWINJ" , "sections" : ["PROPS"], "size" : "UNKNOWN",
{"name" : "PLYMWINJ" , "sections" : ["PROPS"],
"records" : [
[{"name" : "TABLE_NUMBER" , "value_type" : "INT"}],
[{"name" : "THROUGHPUT", "value_type" : "DOUBLE", "dimension" : "Length", "size_type" : "ALL"}],

2
src/opm/parser/eclipse/share/keywords/900_OPM/S/SKPRPOLY
View File

@ -1,4 +1,4 @@
{"name" : "SKPRPOLY" , "sections" : ["PROPS"], "size" : "UNKNOWN",
{"name" : "SKPRPOLY" , "sections" : ["PROPS"],
"records" : [
[{"name" : "TABLE_NUMBER" , "value_type" : "INT"},
{"name" : "POLYMERCONCENTRATION" , "value_type" : "DOUBLE", "dimension" : "PolymerDensity"}],

2
src/opm/parser/eclipse/share/keywords/900_OPM/S/SKPRWAT
View File

@ -1,4 +1,4 @@
{"name" : "SKPRWAT" , "sections" : ["PROPS"], "size" : "UNKNOWN",
{"name" : "SKPRWAT" , "sections" : ["PROPS"],
"records" : [
[{"name" : "TABLE_NUMBER" , "value_type" : "INT"}],
[{"name" : "THROUGHPUT", "value_type" : "DOUBLE", "dimension" : "Length", "size_type" : "ALL"}],

14
tests/parser/TableManagerTests.cpp
View File

@ -1200,6 +1200,7 @@ BOOST_AUTO_TEST_CASE( TestPLYMWINJ ) {
" 20. 19. 18. 16. /\n"
" 20. 16. 14. 12. /\n"
" 20. 12. 8. 4. /\n"
"/\n"
"PLYMWINJ \n"
" 3 / -- table number \n"
" 0.0 100.0 / -- throughput values \n"
@ -1207,7 +1208,8 @@ BOOST_AUTO_TEST_CASE( TestPLYMWINJ ) {
" -- the rest will be the polymer molecular weight \n"
" -- each row corresponds to one sample points in the throughput direction \n"
" 20. 19. 18. /\n"
" 20. 16. 14. /\n";
" 20. 16. 14. /\n"
"/\n";
Opm::Parser parser;
const Opm::Deck deck = parser.parseString(inputstring);
@ -1278,6 +1280,7 @@ BOOST_AUTO_TEST_CASE( TestSKPRWAT ) {
" 20. 19. 18. 16. /\n"
" 20. 16. 14. 12. /\n"
" 20. 12. 8. 4. /\n"
"/\n"
"SKPRWAT \n"
" 2 / -- table number \n"
" 0.0 100.0 / -- throughput values \n"
@ -1285,7 +1288,10 @@ BOOST_AUTO_TEST_CASE( TestSKPRWAT ) {
" -- the rest will be the skin pressure \n"
" -- each row corresponds to one sample points in the throughput direction \n"
" 20. 19. 18. /\n"
" 20. 16. 14. /\n";
" 20. 16. 14. /\n"
"/\n";
Opm::Parser parser;
const Opm::Deck deck = parser.parseString(inputstring);
@ -1358,6 +1364,7 @@ BOOST_AUTO_TEST_CASE( TestSKPRPOLY ) {
" 20. 19. 18. 16. /\n"
" 20. 16. 14. 12. /\n"
" 20. 12. 8. 4. /\n"
"/\n"
"SKPRPOLY \n"
" 2 3.0 / -- table number & reference concentration \n"
" 0.0 100.0 / -- throughput values \n"
@ -1365,7 +1372,8 @@ BOOST_AUTO_TEST_CASE( TestSKPRPOLY ) {
" -- the rest will be the skin pressure \n"
" -- each row corresponds to one sample points in the throughput direction \n"
" 20. 19. 18. /\n"
" 20. 16. 14. /\n";
" 20. 16. 14. /\n"
"/\n";
Opm::Parser parser;
const Opm::Deck deck = parser.parseString(inputstring);