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

fixed: drop some shadowing typedefs

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-10-27 12:22:25 +01:00
parent 1064c62e10
commit 4edb27bd37
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test_equil.cc
View File

@@ -195,10 +195,9 @@ BOOST_AUTO_TEST_CASE(PhasePressure)
using TypeTag = Opm::Properties::TTag::TestEquilTypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<double> x = {0.0,100.0}; std::vector<double> x = {0.0,100.0};
std::vector<double> y = {0.0,0.0}; std::vector<double> y = {0.0,0.0};
TabulatedFunction trivialSaltVdTable = TabulatedFunction(2, x, y); Opm::Tabulated1DFunction<double> trivialSaltVdTable{2,x,y};
auto simulator = initSimulator<TypeTag>("equil_base.DATA"); auto simulator = initSimulator<TypeTag>("equil_base.DATA");
initDefaultFluidSystem<TypeTag>(); initDefaultFluidSystem<TypeTag>();
@@ -254,10 +253,9 @@ BOOST_AUTO_TEST_CASE(CellSubset)
const Opm::EquilRecord record[] = { mkEquilRecord( 0, 1e5, 2.5, -0.075e5, 0, 0 ), const Opm::EquilRecord record[] = { mkEquilRecord( 0, 1e5, 2.5, -0.075e5, 0, 0 ),
mkEquilRecord( 5, 1.35e5, 7.5, -0.225e5, 5, 0 ) }; mkEquilRecord( 5, 1.35e5, 7.5, -0.225e5, 5, 0 ) };
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<double> x = {0.0,100.0}; std::vector<double> x = {0.0,100.0};
std::vector<double> y = {0.0,0.0}; std::vector<double> y = {0.0,0.0};
TabulatedFunction trivialSaltVdTable = TabulatedFunction(2, x, y); Opm::Tabulated1DFunction<double> trivialSaltVdTable{2, x, y};
const Opm::EQUIL::EquilReg region[] = const Opm::EQUIL::EquilReg region[] =
{ {
@@ -358,10 +356,9 @@ BOOST_AUTO_TEST_CASE(RegMapping)
auto simulator = initSimulator<TypeTag>("equil_base.DATA"); auto simulator = initSimulator<TypeTag>("equil_base.DATA");
initDefaultFluidSystem<TypeTag>(); initDefaultFluidSystem<TypeTag>();
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<double> x = {0.0,100.0}; std::vector<double> x = {0.0,100.0};
std::vector<double> y = {0.0,0.0}; std::vector<double> y = {0.0,0.0};
TabulatedFunction trivialSaltVdTable = TabulatedFunction(2, x, y); Opm::Tabulated1DFunction<double> trivialSaltVdTable{2, x, y};
const Opm::EQUIL::EquilReg region[] = const Opm::EQUIL::EquilReg region[] =
{ {