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

Merge pull request #3318 from akva2/eclwellmodel_no_default

Browse Source 
changed: do not set the ebos well model as default type
This commit is contained in:
Joakim Hove
2021-06-04 09:58:46 +02:00
committed by GitHub
parent 1285d02873 d65a9a5f70
commit fcc4970337
5 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test_ecl_output.cc
View File

@@ -26,6 +26,7 @@
#include <ebos/equil/equilibrationhelpers.hh>
#include <ebos/eclproblem.hh>
#include <ebos/eclwellmanager.hh>
#include <opm/models/utils/start.hh>
#include <opm/grid/UnstructuredGrid.h>
@@ -67,19 +68,27 @@
namespace Opm::Properties {
namespace TTag {
struct TestEclOutputTypeTag {
using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>;
};
}
template<class TypeTag>
struct EnableGravity<TypeTag, TTag::TestEclOutputTypeTag> {
static constexpr bool value = false;
};
template<class TypeTag>
struct EnableAsyncEclOutput<TypeTag, TTag::TestEclOutputTypeTag> {
static constexpr bool value = false;
};
template<class TypeTag>
struct EclWellModel<TypeTag, TTag::TestEclOutputTypeTag> {
using type = EclWellManager<TypeTag>;
};
} // namespace Opm::Properties
namespace {

8
tests/test_equil.cc
View File

@@ -26,6 +26,7 @@
#include <ebos/equil/equilibrationhelpers.hh>
#include <ebos/eclproblem.hh>
#include <ebos/eclwellmanager.hh>
#include <opm/models/utils/start.hh>
#include <opm/grid/UnstructuredGrid.h>
@@ -64,10 +65,17 @@
namespace Opm::Properties {
namespace TTag {
struct TestEquilTypeTag {
using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>;
};
}
template<class TypeTag>
struct EclWellModel<TypeTag, TTag::TestEquilTypeTag> {
using type = EclWellManager<TypeTag>;
};
} // namespace Opm::Properties
template <class TypeTag>