OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-26 03:00:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #151 from andlaus/move_valgrind_crs

Browse Source 
adapt to the move of the valgrind client requests into the Opm namespace
This commit is contained in:
Atgeirr Flø Rasmussen 2017-02-10 10:22:19 +01:00 committed by GitHub
commit 6e8b38952c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/problems/cuvetteproblem.hh
View File

@ -200,7 +200,7 @@ public:
{ {
ParentType::finishInit(); ParentType::finishInit();
if (Valgrind::IsRunning()) if (Opm::Valgrind::IsRunning())
FluidSystem::init(/*minT=*/283.15, /*maxT=*/500.0, /*nT=*/20, FluidSystem::init(/*minT=*/283.15, /*maxT=*/500.0, /*nT=*/20,
/*minp=*/0.8e5, /*maxp=*/2e5, /*np=*/10); /*minp=*/0.8e5, /*maxp=*/2e5, /*np=*/10);
else else

8
examples/problems/infiltrationproblem.hh
View File

@ -362,7 +362,7 @@ public:
molarRate[conti0EqIdx + NAPLIdx] = -0.001; molarRate[conti0EqIdx + NAPLIdx] = -0.001;
values.setMolarRate(molarRate); values.setMolarRate(molarRate);
Valgrind::CheckDefined(values); Opm::Valgrind::CheckDefined(values);
} }
else else
values.setNoFlow(); values.setNoFlow();
@ -390,7 +390,7 @@ public:
const auto& matParams = materialLawParams(context, spaceIdx, timeIdx); const auto& matParams = materialLawParams(context, spaceIdx, timeIdx);
values.assignMassConservative(fs, matParams, /*inEquilibrium=*/true); values.assignMassConservative(fs, matParams, /*inEquilibrium=*/true);
Valgrind::CheckDefined(values); Opm::Valgrind::CheckDefined(values);
} }
/*! /*!
@ -448,8 +448,8 @@ private:
Sw = 1 - Sgr; Sw = 1 - Sgr;
Scalar Sg = 1 - Sw; Scalar Sg = 1 - Sw;
Valgrind::CheckDefined(Sw); Opm::Valgrind::CheckDefined(Sw);
Valgrind::CheckDefined(Sg); Opm::Valgrind::CheckDefined(Sg);
fs.setSaturation(waterPhaseIdx, Sw); fs.setSaturation(waterPhaseIdx, Sw);
fs.setSaturation(gasPhaseIdx, Sg); fs.setSaturation(gasPhaseIdx, Sg);