OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reinstate tests that were commented out due to EclWellManager issues.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2021-10-13 11:10:48 +02:00
parent 432f4d8247
commit 347ad2da6b
1 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
tests/test_ecl_output.cc
View File

@@ -41,6 +41,7 @@
#include <ebos/eclwriter.hh> #include <ebos/eclwriter.hh>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp> #include <opm/simulators/wells/BlackoilWellModel.hpp>
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh> #include <dune/fem/misc/mpimanager.hh>
@@ -70,10 +71,15 @@ namespace Opm::Properties {
namespace TTag { namespace TTag {
struct TestEclOutputTypeTag { struct TestEclOutputTypeTag {
using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>; using InheritsFrom = std::tuple<FlowModelParameters, EclBaseProblem, BlackOilModel>;
}; };
} }
template<class TypeTag>
struct EnableTerminalOutput<TypeTag, TTag::EclBaseProblem> {
static constexpr bool value = true;
};
template<class TypeTag> template<class TypeTag>
struct EnableGravity<TypeTag, TTag::TestEclOutputTypeTag> { struct EnableGravity<TypeTag, TTag::TestEclOutputTypeTag> {
static constexpr bool value = false; static constexpr bool value = false;
@@ -92,24 +98,24 @@ struct EclWellModel<TypeTag, TTag::TestEclOutputTypeTag> {
} // namespace Opm::Properties } // namespace Opm::Properties
namespace { namespace {
//std::unique_ptr<Opm::EclIO::ESmry> readsum(const std::string& base) std::unique_ptr<Opm::EclIO::ESmry> readsum(const std::string& base)
//{ {
// return std::make_unique<Opm::EclIO::ESmry>(base); return std::make_unique<Opm::EclIO::ESmry>(base);
//} }
//
//double ecl_sum_get_field_var(const Opm::EclIO::ESmry* smry, double ecl_sum_get_field_var(const Opm::EclIO::ESmry* smry,
// const int timeIdx, const int timeIdx,
// const std::string& var) const std::string& var)
//{ {
// return smry->get(var)[timeIdx]; return smry->get(var)[timeIdx];
//} }
//
//double ecl_sum_get_general_var(const Opm::EclIO::ESmry* smry, double ecl_sum_get_general_var(const Opm::EclIO::ESmry* smry,
// const int timeIdx, const int timeIdx,
// const std::string& var) const std::string& var)
//{ {
// return smry->get(var)[timeIdx]; return smry->get(var)[timeIdx];
//} }
template <class TypeTag> template <class TypeTag>
std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>> std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>>
@@ -132,14 +138,20 @@ initSimulator(const char *filename)
struct EclOutputFixture { struct EclOutputFixture {
EclOutputFixture () { EclOutputFixture () {
int argc = boost::unit_test::framework::master_test_suite().argc; int argc = boost::unit_test::framework::master_test_suite().argc;
char** argv = boost::unit_test::framework::master_test_suite().argv; char** argv = boost::unit_test::framework::master_test_suite().argv;
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv); Dune::Fem::MPIManager::initialize(argc, argv);
#else #else
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
Opm::EclGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>());
using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag; using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
Opm::BlackoilModelParametersEbos<TypeTag>::registerParameters();
Opm::Parameters::registerParam<TypeTag, bool>("EnableTerminalOutput",
"EnableTerminalOutput",
Opm::getPropValue<TypeTag, Opm::Properties::EnableTerminalOutput>(),
"Dummy added for the well model to compile.");
Opm::registerAllParameters_<TypeTag>(); Opm::registerAllParameters_<TypeTag>();
} }
}; };
@@ -150,15 +162,6 @@ BOOST_GLOBAL_FIXTURE(EclOutputFixture);
BOOST_AUTO_TEST_CASE(Summary) BOOST_AUTO_TEST_CASE(Summary)
{ {
/*
This test is commented out following commit: "Collect WellTestState on
IORank". As part of that commit the CollectTOIORank::collect() method will
access the method WellModel::wellTestState(). That method throws a not
implemented exception in the EclWellManager - and this test instantiates
and uses a EclWellManager deep down.
----------------------------------------------------------------------------
using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag; using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA"; const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY"; const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
@@ -231,7 +234,6 @@ BOOST_AUTO_TEST_CASE(Summary)
// roip = sum_ (b * s * pv) // rs == 0; // roip = sum_ (b * s * pv) // rs == 0;
const double roip2 = ( (0.5 * 0.1 * 100 + 0.6 * 0.2 * 100) * (1 - 0.2) ); const double roip2 = ( (0.5 * 0.1 * 100 + 0.6 * 0.2 * 100) * (1 - 0.2) );
BOOST_CHECK_CLOSE(roip2, ecl_sum_get_general_var( resp, 1, "ROIP:2" ), 1e-1 ); BOOST_CHECK_CLOSE(roip2, ecl_sum_get_general_var( resp, 1, "ROIP:2" ), 1e-1 );
*/
} }
BOOST_AUTO_TEST_CASE(readWriteWells) BOOST_AUTO_TEST_CASE(readWriteWells)