Commit 7eed708b authored by Timo Koch's avatar Timo Koch
Browse files

[test][fix] Deduce MPAdapter type on construction

parent 57ff08a7
......@@ -225,7 +225,6 @@ int main()
enum { N2Idx = FluidSystem::N2Idx };
using MaterialLaw = Dumux::FluidMatrix::BrooksCoreyDefault<Scalar>;
using MPAdapter = Dumux::FluidMatrix::MPAdapter<MaterialLaw, numPhases>;
Scalar T = 273.15 + 25;
......@@ -242,7 +241,7 @@ int main()
// set the parameters for the capillary pressure law
MaterialLaw pcKrSw(typename MaterialLaw::BasicParams{/*pe*/0.0, /*lambda*/2.0});
MPAdapter material(pcKrSw);
auto material = Dumux::FluidMatrix::MPAdapter(pcKrSw);
CompositionalFluidState fsRef;
FluidState1p2c fsRefSeq;
......@@ -360,7 +359,7 @@ int main()
std::cout << "testing two-phase against implicit routines, including capillary pressure\n";
MaterialLaw pcKrS2(typename MaterialLaw::BasicParams{/*pe*/1e3, /*lambda*/2.0});
MPAdapter material2(pcKrS2);
auto material2 = Dumux::FluidMatrix::MPAdapter(pcKrS2);
// set gas saturation
fsRef.setSaturation(gasPhaseIdx, 0.5);
......
......@@ -182,7 +182,7 @@ int main()
// set the parameters for the capillary pressure law
typename PcKrSw::BasicParams bParams(/*pe*/0.0, /*lambda*/2.0);
auto pcKrSw = PcKrSw(bParams);
auto material = Dumux::FluidMatrix::MPAdapter<PcKrSw>(pcKrSw);
auto material = Dumux::FluidMatrix::MPAdapter(pcKrSw);
ImmiscibleFluidState fsRef;
......@@ -243,7 +243,7 @@ int main()
typename PcKrSw::BasicParams bParams2(/*pe*/1e3, /*lambda*/2.0);
auto pcKrSw2 = PcKrSw(bParams2);
auto material2 = Dumux::FluidMatrix::MPAdapter<PcKrSw>(pcKrSw2);
auto material2 = Dumux::FluidMatrix::MPAdapter(pcKrSw2);
// set liquid saturation
fsRef.setSaturation(liquidPhaseIdx, 0.5);
......
......@@ -184,7 +184,7 @@ int main()
// set the parameters for the capillary pressure law
typename PcKrSw::BasicParams bParams(/*pe*/0.0, /*lambda*/2.0);
auto pcKrSw = PcKrSw(bParams);
auto material = Dumux::FluidMatrix::MPAdapter<PcKrSw>(pcKrSw);
auto material = Dumux::FluidMatrix::MPAdapter(pcKrSw);
CompositionalFluidState fsRef;
......@@ -262,7 +262,7 @@ int main()
typename PcKrSw::BasicParams bParams2(/*pe*/1e3, /*lambda*/2.0);
auto pcKrSw2 = PcKrSw(bParams2);
auto material2 = Dumux::FluidMatrix::MPAdapter<PcKrSw>(pcKrSw2);
auto material2 = Dumux::FluidMatrix::MPAdapter(pcKrSw2);
// set gas saturation
fsRef.setSaturation(gasPhaseIdx, 0.5);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment