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

changed: remove TTAG macro calls

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-08-21 13:59:53 +02:00
parent 8148a81ed0
commit 82a35e53b7
30 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_ecl_output.cc
View File

@@ -125,7 +125,7 @@ initSimulator(const char *filename)
void test_summary()
{
typedef typename TTAG(TestEclOutputTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
@@ -270,7 +270,7 @@ int main(int argc, char** argv)
Dune::MPIHelper::instance(argc, argv);
#endif
typedef TTAG(TestEclOutputTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
Opm::registerAllParameters_<TypeTag>();
test_summary();
test_readWriteWells();

26
tests/test_equil.cc
View File

@@ -179,7 +179,7 @@ void test_PhasePressure()
{
const auto record = mkEquilRecord( 0, 1e5, 5, 0, 0, 0 );
using TypeTag = TTAG(TestEquilTypeTag);
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
@@ -228,7 +228,7 @@ void test_CellSubset()
{
using PVal = std::vector<double>;
using PPress = std::vector<PVal>;
using TypeTag = TTAG(TestEquilTypeTag);
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
auto simulator = initSimulator<TypeTag>("equil_base.DATA");
@@ -339,7 +339,7 @@ void test_RegMapping()
using PVal = std::vector<double>;
using PPress = std::vector<PVal>;
using TypeTag = TTAG(TestEquilTypeTag);
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
auto simulator = initSimulator<TypeTag>("equil_base.DATA");
@@ -439,7 +439,7 @@ void test_RegMapping()
void test_DeckAllDead()
{
typedef TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
auto simulator = initSimulator<TypeTag>("equil_deadfluids.DATA");
const auto& eclipseState = simulator->vanguard().eclState();
@@ -465,7 +465,7 @@ void test_DeckAllDead()
void test_CapillaryInversion()
{
// Test setup.
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager;
@@ -515,7 +515,7 @@ void test_CapillaryInversion()
void test_DeckWithCapillary()
{
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
auto& eclipseState = simulator->vanguard().eclState();
@@ -553,7 +553,7 @@ void test_DeckWithCapillary()
void test_DeckWithCapillaryOverlap()
{
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
auto simulator = initSimulator<TypeTag>("equil_capillary_overlap.DATA");
const auto& eclipseState = simulator->vanguard().eclState();
@@ -611,7 +611,7 @@ void test_DeckWithCapillaryOverlap()
void test_DeckWithLiveOil()
{
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
auto simulator = initSimulator<TypeTag>("equil_liveoil.DATA");
const auto& eclipseState = simulator->vanguard().eclState();
@@ -687,7 +687,7 @@ void test_DeckWithLiveOil()
void test_DeckWithLiveGas()
{
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
auto simulator = initSimulator<TypeTag>("equil_livegas.DATA");
const auto& eclipseState = simulator->vanguard().eclState();
@@ -765,7 +765,7 @@ void test_DeckWithLiveGas()
void test_DeckWithRSVDAndRVVD()
{
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
auto simulator = initSimulator<TypeTag>("equil_rsvd_and_rvvd.DATA");
const auto& eclipseState = simulator->vanguard().eclState();
@@ -863,7 +863,7 @@ void test_DeckWithRSVDAndRVVD()
void test_DeckWithPBVDAndPDVD()
{
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
auto simulator = initSimulator<TypeTag>("equil_pbvd_and_pdvd.DATA");
const auto& eclipseState = simulator->vanguard().eclState();
@@ -954,7 +954,7 @@ void test_DeckWithPBVDAndPDVD()
void test_DeckWithSwatinit()
{
#if 0
typedef typename TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
auto simulator = initSimulator<TypeTag>("equil_capillary_swatinit.DATA");
const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid());
@@ -1106,7 +1106,7 @@ try {
Dune::MPIHelper::instance(argc, argv);
#endif
typedef TTAG(TestEquilTypeTag) TypeTag;
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
Opm::registerAllParameters_<TypeTag>();
test_PhasePressure();

8
tests/test_wellmodel.cpp
View File

@@ -57,7 +57,7 @@
using StandardWell = Opm::StandardWell<TTAG(EclFlowProblem)>;
using StandardWell = Opm::StandardWell<Opm::Properties::TTag::EclFlowProblem>;
struct SetupTest {
@@ -100,7 +100,7 @@ struct GlobalFixture {
Dune::MPIHelper::instance(argcDummy, argvDummy);
#endif
Opm::FlowMainEbos<TTAG(EclFlowProblem)>::setupParameters_(argcDummy, argvDummy);
Opm::FlowMainEbos<Opm::Properties::TTag::EclFlowProblem>::setupParameters_(argcDummy, argvDummy);
}
};
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) {
const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep);
BOOST_CHECK_EQUAL( wells_ecl.size(), 2);
const Opm::Well& well = wells_ecl[1];
const Opm::BlackoilModelParametersEbos<TTAG(EclFlowProblem) > param;
const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
// For the conversion between the surface volume rate and resrevoir voidage rate
typedef Opm::BlackOilFluidSystem<double> FluidSystem;
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) {
{
const int nw = wells_ecl.size();
const Opm::BlackoilModelParametersEbos<TTAG(EclFlowProblem)> param;
const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
for (int w = 0; w < nw; ++w) {
// For the conversion between the surface volume rate and resrevoir voidage rate