OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
34eee09fc19bf356f364b2c97b602fd8f228ae55
opm-common/opm/parser/eclipse/IntegrationTests/ParseDATAWithDefault.cpp

109 lines
3.4 KiB
C++
Raw Normal View History

The ParserKeyword->parse() method will throw if the raw input argument is not finished. Requires several changes to assure that the rawkeyword instances are marked as finished before reacing the ParserKeyword->parse method.
2014-04-10 21:08:16 +02:00
/*
Copyright (C) 2014 Statoil ASE
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#define BOOST_TEST_MODULE ParserIntegrationTests
#include <math.h>
#include <boost/test/unit_test.hpp>
#include <boost/test/test_tools.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckDoubleItem.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
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-07-24 15:38:22 +02:00
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
The ParserKeyword->parse() method will throw if the raw input argument is not finished. Requires several changes to assure that the rawkeyword instances are marked as finished before reacing the ParserKeyword->parse method.
2014-04-10 21:08:16 +02:00
#include <opm/parser/eclipse/Parser/ParserKeyword.hpp>
#include <opm/parser/eclipse/Parser/ParserRecord.hpp>
#include <opm/parser/eclipse/Parser/ParserIntItem.hpp>
#include <opm/parser/eclipse/Parser/ParserDoubleItem.hpp>
#include <opm/parser/eclipse/Parser/ParserStringItem.hpp>
#include <opm/parser/eclipse/Parser/ParserEnums.hpp>
using namespace Opm;
const char *dataMissingRecord = "\n\
ENDSCALE\n\
1* 1* 2 /\n\
\n\
ENKRVD\n\
100 1 2 3 4 5 6 7 200 11 22 33 44 55 66 77 /\n\
";
BOOST_AUTO_TEST_CASE( ParseMissingRECORD_THrows) {
ParserPtr parser(new Parser());
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-07-24 15:38:22 +02:00
BOOST_CHECK_THROW( parser->parseString( dataMissingRecord , ParseMode()) , std::invalid_argument);
The ParserKeyword->parse() method will throw if the raw input argument is not finished. Requires several changes to assure that the rawkeyword instances are marked as finished before reacing the ParserKeyword->parse method.
2014-04-10 21:08:16 +02:00
}
Added boolan flag scalar = true to DeckItem. The purpose of this flag is to keep track of whether a keyword is supposed to have only one element, i.e. scalar, or several. The defaultApplied method only makes sense in the case of scalar items, this method will now throw if it is called on a non-scalar item.
2014-04-10 22:29:18 +02:00
const char *data = "\n\
ENDSCALE\n\
Default: defaultApplied -> setInDeck() The data values in a deck item can be in three different states, given by the DeckValue enum in DeckItem.hpp. The three values are: SET_IN_DECK : The value has been set explictly in the deck. DEFAULT : The value was not present in the input deck, but a default value has been supplied in the configuration and that value has been set. NOT_SET : No value has been set for this item; it was not explicitly set in the deck and also not included in the configuration. If you ask for DeckItem->value which is in state NOT_SET you will get an exception. The method setInDeck() can be used to check if a value has been set explicitly in the deck; the method defaultApplied() will check if a default value has been applied. Observe that the system for handling defaults is not really well suited for multi valued data items, as it is only a scalar state variable. In the case of multi valued data items both defaultApplied() and setInDeck() might return true.
2014-08-25 11:20:54 +02:00
1* 1* 3 /\n\
Added boolan flag scalar = true to DeckItem. The purpose of this flag is to keep track of whether a keyword is supposed to have only one element, i.e. scalar, or several. The defaultApplied method only makes sense in the case of scalar items, this method will now throw if it is called on a non-scalar item.
2014-04-10 22:29:18 +02:00
\n\
ENKRVD\n\
Verified behaviour of defaults (i.e. *) for multivalued items.
2014-04-10 22:41:00 +02:00
100 * 2 * 2* 6 7 200 11 22 33 3*55 10 /\n\
Added boolan flag scalar = true to DeckItem. The purpose of this flag is to keep track of whether a keyword is supposed to have only one element, i.e. scalar, or several. The defaultApplied method only makes sense in the case of scalar items, this method will now throw if it is called on a non-scalar item.
2014-04-10 22:29:18 +02:00
100 * 2 3 4 5 6 7 200 11 22 33 44 55 66 77 /\n\
Default: defaultApplied -> setInDeck() The data values in a deck item can be in three different states, given by the DeckValue enum in DeckItem.hpp. The three values are: SET_IN_DECK : The value has been set explictly in the deck. DEFAULT : The value was not present in the input deck, but a default value has been supplied in the configuration and that value has been set. NOT_SET : No value has been set for this item; it was not explicitly set in the deck and also not included in the configuration. If you ask for DeckItem->value which is in state NOT_SET you will get an exception. The method setInDeck() can be used to check if a value has been set explicitly in the deck; the method defaultApplied() will check if a default value has been applied. Observe that the system for handling defaults is not really well suited for multi valued data items, as it is only a scalar state variable. In the case of multi valued data items both defaultApplied() and setInDeck() might return true.
2014-08-25 11:20:54 +02:00
100 * 2 3 4 5 6 7 200 11 22 33 44 55 66 * /\n\
Added boolan flag scalar = true to DeckItem. The purpose of this flag is to keep track of whether a keyword is supposed to have only one element, i.e. scalar, or several. The defaultApplied method only makes sense in the case of scalar items, this method will now throw if it is called on a non-scalar item.
2014-04-10 22:29:18 +02:00
";
BOOST_AUTO_TEST_CASE( parse_DATAWithDefult_OK ) {
ParserPtr parser(new Parser());
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-07-24 15:38:22 +02:00
DeckConstPtr deck = parser->parseString( data , ParseMode());
Added boolan flag scalar = true to DeckItem. The purpose of this flag is to keep track of whether a keyword is supposed to have only one element, i.e. scalar, or several. The defaultApplied method only makes sense in the case of scalar items, this method will now throw if it is called on a non-scalar item.
2014-04-10 22:29:18 +02:00
DeckKeywordConstPtr keyword = deck->getKeyword( "ENKRVD" );
DeckRecordConstPtr rec0 = keyword->getRecord(0);
DeckRecordConstPtr rec1 = keyword->getRecord(1);
Default: defaultApplied -> setInDeck() The data values in a deck item can be in three different states, given by the DeckValue enum in DeckItem.hpp. The three values are: SET_IN_DECK : The value has been set explictly in the deck. DEFAULT : The value was not present in the input deck, but a default value has been supplied in the configuration and that value has been set. NOT_SET : No value has been set for this item; it was not explicitly set in the deck and also not included in the configuration. If you ask for DeckItem->value which is in state NOT_SET you will get an exception. The method setInDeck() can be used to check if a value has been set explicitly in the deck; the method defaultApplied() will check if a default value has been applied. Observe that the system for handling defaults is not really well suited for multi valued data items, as it is only a scalar state variable. In the case of multi valued data items both defaultApplied() and setInDeck() might return true.
2014-08-25 11:20:54 +02:00
DeckRecordConstPtr rec2 = keyword->getRecord(2);
remove all trailing white space this is just the result of ``` find -iname "*.[ch]pp" | xargs sed -i "s/ *$//" find opm/parser/share/keywords -type f | xargs sed -i "s/ *$//" ``` so if it causes conflicts with other patches, the others should get priority. The rationale behind this patch is that some people tell their editor to remove white space which leads to larger than necessary patches...
2014-12-08 16:34:28 +01:00
Added boolan flag scalar = true to DeckItem. The purpose of this flag is to keep track of whether a keyword is supposed to have only one element, i.e. scalar, or several. The defaultApplied method only makes sense in the case of scalar items, this method will now throw if it is called on a non-scalar item.
2014-04-10 22:29:18 +02:00
DeckItemConstPtr item0 = rec0->getItem(0);
DeckItemConstPtr item1 = rec1->getItem(0);
Default: defaultApplied -> setInDeck() The data values in a deck item can be in three different states, given by the DeckValue enum in DeckItem.hpp. The three values are: SET_IN_DECK : The value has been set explictly in the deck. DEFAULT : The value was not present in the input deck, but a default value has been supplied in the configuration and that value has been set. NOT_SET : No value has been set for this item; it was not explicitly set in the deck and also not included in the configuration. If you ask for DeckItem->value which is in state NOT_SET you will get an exception. The method setInDeck() can be used to check if a value has been set explicitly in the deck; the method defaultApplied() will check if a default value has been applied. Observe that the system for handling defaults is not really well suited for multi valued data items, as it is only a scalar state variable. In the case of multi valued data items both defaultApplied() and setInDeck() might return true.
2014-08-25 11:20:54 +02:00
DeckItemConstPtr item2 = rec2->getItem(0);
remove all trailing white space this is just the result of ``` find -iname "*.[ch]pp" | xargs sed -i "s/ *$//" find opm/parser/share/keywords -type f | xargs sed -i "s/ *$//" ``` so if it causes conflicts with other patches, the others should get priority. The rationale behind this patch is that some people tell their editor to remove white space which leads to larger than necessary patches...
2014-12-08 16:34:28 +01:00
Default: defaultApplied -> setInDeck() The data values in a deck item can be in three different states, given by the DeckValue enum in DeckItem.hpp. The three values are: SET_IN_DECK : The value has been set explictly in the deck. DEFAULT : The value was not present in the input deck, but a default value has been supplied in the configuration and that value has been set. NOT_SET : No value has been set for this item; it was not explicitly set in the deck and also not included in the configuration. If you ask for DeckItem->value which is in state NOT_SET you will get an exception. The method setInDeck() can be used to check if a value has been set explicitly in the deck; the method defaultApplied() will check if a default value has been applied. Observe that the system for handling defaults is not really well suited for multi valued data items, as it is only a scalar state variable. In the case of multi valued data items both defaultApplied() and setInDeck() might return true.
2014-08-25 11:20:54 +02:00
BOOST_CHECK_EQUAL( 3U , keyword->size());
remove the "value status" concept from deck items I know it was only added recently, but all of the "setInDeck()" calls can now be substituted by a combination of item->size() and item->defaultApplied(index)...
2014-09-12 13:10:09 +02:00
BOOST_CHECK( !item0->defaultApplied(0) );
BOOST_CHECK( item0->defaultApplied(1) );
Verified behaviour of defaults (i.e. *) for multivalued items.
2014-04-10 22:41:00 +02:00
BOOST_CHECK_EQUAL( 100 , item0->getRawDouble(0));
BOOST_CHECK_EQUAL( -1 , item0->getRawDouble(1));
BOOST_CHECK_EQUAL( 2 , item0->getRawDouble(2));
BOOST_CHECK_EQUAL( -1 , item0->getRawDouble(3));
BOOST_CHECK_EQUAL( -1 , item0->getRawDouble(4));
BOOST_CHECK_EQUAL( -1 , item0->getRawDouble(5));
BOOST_CHECK_EQUAL( 6 , item0->getRawDouble(6));
BOOST_CHECK_EQUAL( 55 , item0->getRawDouble(12));
BOOST_CHECK_EQUAL( 55 , item0->getRawDouble(13));
BOOST_CHECK_EQUAL( 55 , item0->getRawDouble(14));
BOOST_CHECK_EQUAL( 10 , item0->getRawDouble(15));
remove all trailing white space this is just the result of ``` find -iname "*.[ch]pp" | xargs sed -i "s/ *$//" find opm/parser/share/keywords -type f | xargs sed -i "s/ *$//" ``` so if it causes conflicts with other patches, the others should get priority. The rationale behind this patch is that some people tell their editor to remove white space which leads to larger than necessary patches...
2014-12-08 16:34:28 +01:00
Verified behaviour of defaults (i.e. *) for multivalued items.
2014-04-10 22:41:00 +02:00
BOOST_CHECK_EQUAL( 100 , item1->getRawDouble(0));
BOOST_CHECK_EQUAL( -1 , item1->getRawDouble(1));
Default: defaultApplied -> setInDeck() The data values in a deck item can be in three different states, given by the DeckValue enum in DeckItem.hpp. The three values are: SET_IN_DECK : The value has been set explictly in the deck. DEFAULT : The value was not present in the input deck, but a default value has been supplied in the configuration and that value has been set. NOT_SET : No value has been set for this item; it was not explicitly set in the deck and also not included in the configuration. If you ask for DeckItem->value which is in state NOT_SET you will get an exception. The method setInDeck() can be used to check if a value has been set explicitly in the deck; the method defaultApplied() will check if a default value has been applied. Observe that the system for handling defaults is not really well suited for multi valued data items, as it is only a scalar state variable. In the case of multi valued data items both defaultApplied() and setInDeck() might return true.
2014-08-25 11:20:54 +02:00
remove the "value status" concept from deck items I know it was only added recently, but all of the "setInDeck()" calls can now be substituted by a combination of item->size() and item->defaultApplied(index)...
2014-09-12 13:10:09 +02:00
BOOST_CHECK( !item2->defaultApplied(0) );
BOOST_CHECK( item2->defaultApplied(1) );
Added boolan flag scalar = true to DeckItem. The purpose of this flag is to keep track of whether a keyword is supposed to have only one element, i.e. scalar, or several. The defaultApplied method only makes sense in the case of scalar items, this method will now throw if it is called on a non-scalar item.
2014-04-10 22:29:18 +02:00
}
Reference in New Issue Copy Permalink