e884b0664c
Tune the makefile according to new principles, which adds a few bells
and whistles and for clarity.
Synopsis:
* The dependency on opm-common is completely gone. This is reflected in
travis and appveyor as well. No non-kitware cmake modules are used.
* Directories are flattened, quite a bit - source code is located in the
lib/ directory if it belongs to opm-parser, and external/ if third
party.
* The sibling build feature is implemented through cmake's
export(PACKAGE) rather than implicitly looking through source files.
* Targets explicitly set required public and private include
directories, compile options and definitions, which cmake will handle
and propagate
* opm-parser-config.cmake for downstream users is now provided.
* Dependencies are set up using targets. In the future, when cmake 3.x+
can be used, these should be either targets from newer Find modules,
or interface libraries.
* Fewer system specific assumptions are coded in, instead we assume
cmake or users set up system specific details.
* All module wide configuration and looking up libraries is handled in
the root makefile - all sub directories only set up libraries and
compile options for the module in question.
* Targets are defined and links handled transitively because cmake now
is told about them. ${module_LIBRARIES} variables are gone.
This is largely guided by the principles outlined in
https://rix0r.nl/blog/2015/08/13/cmake-guide/
Most source files are just moved - if they have some content change then
it's nothing more than include fixes or similar in order to make them
compile.
99 lines
3.5 KiB
C++
99 lines
3.5 KiB
C++
/*
|
|
Copyright 2014 Statoil ASA.
|
|
|
|
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/>.
|
|
*/
|
|
|
|
#include <stdexcept>
|
|
#include <iostream>
|
|
|
|
#define BOOST_TEST_MODULE EclipseGridTests
|
|
|
|
#include <boost/filesystem.hpp>
|
|
#include <boost/test/unit_test.hpp>
|
|
#include <boost/date_time/posix_time/posix_time.hpp>
|
|
|
|
#include <opm/parser/eclipse/Parser/Parser.hpp>
|
|
|
|
#include <opm/parser/eclipse/Deck/Deck.hpp>
|
|
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
|
|
#include <opm/parser/eclipse/Deck/Section.hpp>
|
|
|
|
#include <opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp>
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(Empty) {
|
|
typedef Opm::GridProperties<int>::SupportedKeywordInfo SupportedKeywordInfo;
|
|
std::vector<SupportedKeywordInfo> supportedKeywords = {
|
|
SupportedKeywordInfo("SATNUM" , 0, "1"),
|
|
SupportedKeywordInfo("FIPNUM" , 2, "1")
|
|
};
|
|
|
|
const Opm::EclipseGrid grid(10, 7, 9);
|
|
Opm::GridProperties<int> gridProperties(grid, std::move(supportedKeywords));
|
|
|
|
BOOST_CHECK( gridProperties.supportsKeyword("SATNUM") );
|
|
BOOST_CHECK( gridProperties.supportsKeyword("FIPNUM") );
|
|
BOOST_CHECK( !gridProperties.supportsKeyword("FLUXNUM") );
|
|
BOOST_CHECK( !gridProperties.hasKeyword("SATNUM"));
|
|
BOOST_CHECK( !gridProperties.hasKeyword("FLUXNUM"));
|
|
|
|
BOOST_CHECK_THROW( gridProperties.getDeckKeyword("SATNUM") , std::invalid_argument);
|
|
BOOST_CHECK_THROW( gridProperties.getDeckKeyword("NONONO") , std::invalid_argument);
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(addKeyword) {
|
|
typedef Opm::GridProperties<int>::SupportedKeywordInfo SupportedKeywordInfo;
|
|
std::vector<SupportedKeywordInfo> supportedKeywords = {
|
|
SupportedKeywordInfo("SATNUM" , 0, "1")
|
|
};
|
|
Opm::EclipseGrid grid(10,7,9);
|
|
Opm::GridProperties<int> gridProperties(grid, std::move( supportedKeywords ));
|
|
|
|
BOOST_CHECK_THROW( gridProperties.addKeyword("NOT-SUPPORTED"), std::invalid_argument);
|
|
|
|
BOOST_CHECK( gridProperties.addKeyword("SATNUM"));
|
|
BOOST_CHECK( !gridProperties.addKeyword("SATNUM"));
|
|
BOOST_CHECK( gridProperties.hasKeyword("SATNUM"));
|
|
}
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(hasKeyword_assertKeyword) {
|
|
typedef Opm::GridProperties<int>::SupportedKeywordInfo SupportedKeywordInfo;
|
|
std::vector<SupportedKeywordInfo> supportedKeywords = {
|
|
SupportedKeywordInfo("SATNUM" , 0, "1"),
|
|
SupportedKeywordInfo("FIPNUM" , 0, "1")
|
|
};
|
|
const Opm::EclipseGrid grid(10, 7, 9);
|
|
const Opm::GridProperties<int> gridProperties( grid, std::move( supportedKeywords ) );
|
|
|
|
// calling getKeyword() should not change the semantics of hasKeyword()!
|
|
BOOST_CHECK(!gridProperties.hasKeyword("SATNUM"));
|
|
BOOST_CHECK(!gridProperties.hasKeyword("FIPNUM"));
|
|
|
|
gridProperties.assertKeyword("FIPNUM");
|
|
gridProperties.getKeyword("SATNUM");
|
|
BOOST_CHECK(gridProperties.hasKeyword("SATNUM"));
|
|
BOOST_CHECK(gridProperties.hasKeyword("FIPNUM"));
|
|
|
|
BOOST_CHECK_THROW( gridProperties.getKeyword( "NOT-SUPPORTED" ), std::invalid_argument );
|
|
}
|
|
|
|
|
|
|