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

splitting Blackoil related to FlowProblemBlackoil

Browse Source 
so FlowProblem can be used for compositional or other setting
This commit is contained in:
Kai Bao
2024-09-11 14:25:34 +02:00
parent ec15bad996
commit 85513754bc
17 changed files with 1666 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/TestTypeTag.hpp
View File

@@ -31,7 +31,7 @@
#include <opm/models/utils/start.hh>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/flow/FlowProblemProperties.hpp>
#include <opm/simulators/flow/FlowProblemBlackoilProperties.hpp>
#include <opm/simulators/linalg/ISTLSolver.hpp>
#include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp>
@@ -42,7 +42,7 @@ namespace TTag {
struct TestTypeTag
{
using InheritsFrom = std::tuple<FlowBaseProblem,
using InheritsFrom = std::tuple<FlowBaseProblemBlackoil,
BlackOilModel>;
};
@@ -51,7 +51,7 @@ struct TestTypeTag
// Set the problem class
template<class TypeTag>
struct Problem<TypeTag, TTag::TestTypeTag> {
using type = FlowProblem<TypeTag>;
using type = FlowProblemBlackoil<TypeTag>;
};
// Enable experimental features for ebos: ebos is the research simulator of the OPM

2
tests/test_RestartSerialization.cpp
View File

@@ -38,7 +38,7 @@
#include <opm/simulators/flow/FemCpGridCompat.hpp>
#include <opm/simulators/flow/FlowGenericVanguard.hpp>
#include <opm/simulators/flow/FlowProblem.hpp>
#include <opm/simulators/flow/FlowProblemBlackoil.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp>

7
tests/test_equil.cpp
View File

@@ -37,7 +37,8 @@
#include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/flow/FlowGenericVanguard.hpp>
#include <opm/simulators/flow/FlowProblem.hpp>
#include <opm/simulators/flow/FlowProblemBlackoil.hpp>
#include <opm/simulators/flow/FlowProblemBlackoilProperties.hpp>
#include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
#include <opm/simulators/linalg/parallelbicgstabbackend.hh>
#include <opm/simulators/wells/BlackoilWellModel.hpp>
@@ -72,11 +73,11 @@ namespace TTag {
struct TestEquilTypeTag {
using InheritsFrom = std::tuple<FlowBaseProblem,
using InheritsFrom = std::tuple<FlowBaseProblemBlackoil,
BlackOilModel>;
};
struct TestEquilVapwatTypeTag {
using InheritsFrom = std::tuple<FlowBaseProblem,
using InheritsFrom = std::tuple<FlowBaseProblemBlackoil,
BlackOilModel>;
};
}

4
tests/test_glift1.cpp
View File

@@ -34,7 +34,7 @@
#include <opm/input/eclipse/Schedule/Well/Well.hpp>
#include <opm/simulators/utils/DeferredLogger.hpp>
#include <opm/simulators/flow/BlackoilModel.hpp>
#include <opm/simulators/flow/FlowProblem.hpp>
#include <opm/simulators/flow/FlowProblemBlackoil.hpp>
#include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp>
#include <opm/simulators/wells/StandardWell.hpp>
@@ -123,7 +123,7 @@ BOOST_GLOBAL_FIXTURE(GliftFixture);
BOOST_AUTO_TEST_CASE(G1)
{
//using TypeTag = Opm::Properties::TTag::FlowProblem;
//using TypeTag = Opm::Properties::TTag::FlowProblemBlackoil;
using TypeTag = Opm::Properties::TTag::TestGliftTypeTag;
//using EclProblem = Opm::EclProblem<TypeTag>;
//using EclWellModel = typename EclProblem::EclWellModel;

2
tests/test_wellmodel.cpp
View File

@@ -47,7 +47,7 @@
#include <opm/grid/GridHelpers.hpp>
#include <opm/simulators/flow/FlowMain.hpp>
#include <opm/simulators/flow/BlackoilModel.hpp>
#include <opm/simulators/flow/FlowProblem.hpp>
#include <opm/simulators/flow/FlowProblemBlackoil.hpp>
#include <opm/models/utils/start.hh>