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
commit fcc4970337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebos/ebos_plain.cc
View File

@ -28,6 +28,7 @@
#include "config.h" #include "config.h"
#include "eclproblem.hh" #include "eclproblem.hh"
#include "eclwellmanager.hh"
#include <opm/models/utils/start.hh> #include <opm/models/utils/start.hh>
@ -39,6 +40,11 @@ struct EbosPlainTypeTag {
}; };
} }
template<class TypeTag>
struct EclWellModel<TypeTag, TTag::EbosPlainTypeTag> {
using type = EclWellManager<TypeTag>;
};
} // namespace Opm::Properties } // namespace Opm::Properties
int main(int argc, char **argv) int main(int argc, char **argv)

7
ebos/eclproblem.hh
View File

@ -53,7 +53,6 @@
#include "eclcpgridvanguard.hh" #include "eclcpgridvanguard.hh"
#endif #endif
#include "eclwellmanager.hh"
#include "eclequilinitializer.hh" #include "eclequilinitializer.hh"
#include "eclwriter.hh" #include "eclwriter.hh"
#include "ecloutputblackoilmodule.hh" #include "ecloutputblackoilmodule.hh"
@ -297,12 +296,6 @@ struct EclAquiferModel<TypeTag, TTag::EclBaseProblem> {
using type = EclBaseAquiferModel<TypeTag>; using type = EclBaseAquiferModel<TypeTag>;
}; };
// use the built-in proof of concept well model by default
template<class TypeTag>
struct EclWellModel<TypeTag, TTag::EclBaseProblem> {
using type = EclWellManager<TypeTag>;
};
// Enable aquifers by default in experimental mode // Enable aquifers by default in experimental mode
template<class TypeTag> template<class TypeTag>
struct EclEnableAquifers<TypeTag, TTag::EclBaseProblem> { struct EclEnableAquifers<TypeTag, TTag::EclBaseProblem> {

1
opm/simulators/wells/WellInterface_impl.hpp
View File

@ -21,6 +21,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp> #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/wells/GroupState.hpp>
#include <opm/simulators/wells/TargetCalculator.hpp> #include <opm/simulators/wells/TargetCalculator.hpp>
namespace Opm namespace Opm

9
tests/test_ecl_output.cc
View File

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

8
tests/test_equil.cc
View File

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