OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DenseAD: make less fuzz about it

Browse Source 
this patch converts to code to use the convenience functions instead
of the math toolboxes whereever possible. the main advantage is that
Opm::foo(x) will work regardless of the type of `x`, but it also
reduces visual clutter.

also, constant Evaluations are now directly created by assigning
Scalars, which removes further visual noise.

while I hope it improves the readability of the code,
functionality-wise this patch should not change anything.
This commit is contained in:
Andreas Lauser
2017-06-12 16:36:14 +02:00
parent acfa7c43e5
commit 0f6540bdad
69 changed files with 738 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_fluidmatrixinteractions.cpp
View File

@@ -156,14 +156,14 @@ void testTwoPhaseApi()
const FluidState fs;
const typename MaterialLaw::Params params;
Scalar v;
Scalar v OPM_UNUSED;
v = MaterialLaw::template pcnw<FluidState, Scalar>(params, fs);
v = MaterialLaw::template Sw<FluidState, Scalar>(params, fs);
v = MaterialLaw::template Sn<FluidState, Scalar>(params, fs);
v = MaterialLaw::template krw<FluidState, Scalar>(params, fs);
v = MaterialLaw::template krn<FluidState, Scalar>(params, fs);
typename FluidState::Scalar vEval;
typename FluidState::Scalar vEval OPM_UNUSED;
vEval = MaterialLaw::pcnw(params, fs);
vEval = MaterialLaw::Sw(params, fs);
vEval = MaterialLaw::Sn(params, fs);
@@ -198,7 +198,7 @@ void testTwoPhaseSatApi()
const typename MaterialLaw::Params params;
Scalar Sw = 0;
Scalar v;
Scalar v OPM_UNUSED;
v = MaterialLaw::twoPhaseSatPcnw(params, Sw);
v = MaterialLaw::twoPhaseSatSw(params, Sw);
v = MaterialLaw::twoPhaseSatSn(params, Sw);
@@ -206,7 +206,7 @@ void testTwoPhaseSatApi()
v = MaterialLaw::twoPhaseSatKrn(params, Sw);
typename FluidState::Scalar SwEval = 0;
typename FluidState::Scalar vEval;
typename FluidState::Scalar vEval OPM_UNUSED;
vEval = MaterialLaw::twoPhaseSatPcnw(params, SwEval);
vEval = MaterialLaw::twoPhaseSatSw(params, SwEval);
vEval = MaterialLaw::twoPhaseSatSn(params, SwEval);
@@ -234,7 +234,7 @@ void testThreePhaseApi()
const FluidState fs;
const typename MaterialLaw::Params params;
Scalar v;
Scalar v OPM_UNUSED;
v = MaterialLaw::template pcnw<FluidState, Scalar>(params, fs);
v = MaterialLaw::template Sw<FluidState, Scalar>(params, fs);
v = MaterialLaw::template Sn<FluidState, Scalar>(params, fs);
@@ -243,7 +243,7 @@ void testThreePhaseApi()
v = MaterialLaw::template krn<FluidState, Scalar>(params, fs);
v = MaterialLaw::template krg<FluidState, Scalar>(params, fs);
typename FluidState::Scalar vEval;
typename FluidState::Scalar vEval OPM_UNUSED;
vEval = MaterialLaw::pcnw(params, fs);
vEval = MaterialLaw::Sw(params, fs);
vEval = MaterialLaw::Sn(params, fs);