diff --git a/exercises/exercise-basic/2p2cmain.cc b/exercises/exercise-basic/2p2cmain.cc
index bce5f7891b3c83af92685c7cc218022b94501358..b6e97d389514584021c0717c511b11860a67b07e 100644
--- a/exercises/exercise-basic/2p2cmain.cc
+++ b/exercises/exercise-basic/2p2cmain.cc
@@ -32,7 +32,6 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
#include <dumux/linear/amgbackend.hh>
diff --git a/exercises/exercise-biomineralization/fluidsystems/biomin.hh b/exercises/exercise-biomineralization/fluidsystems/biomin.hh
index c5b395d3a564197e99a33d5a4b9f0c6f3fadce6f..0509032c26d7c34b74ac5a17c98de5e658f90aab 100644
--- a/exercises/exercise-biomineralization/fluidsystems/biomin.hh
+++ b/exercises/exercise-biomineralization/fluidsystems/biomin.hh
@@ -330,21 +330,14 @@ public:
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
+ // assume brine with viscosity effect of Ca for the liquid phase.
if (phaseIdx == liquidPhaseIdx)
- {
- // assume brine with viscosity effect of Ca for the liquid phase.
- Scalar result = Brine::liquidViscosity(temperature, pressure);
+ return Brine::liquidViscosity(temperature, pressure);;
- Valgrind::CheckDefined(result);
- return result;
- }
+ // assume pure CO2 for the gas phase.
else if (phaseIdx == gasPhaseIdx)
- {
- // assume pure CO2 for the gas phase.
- Scalar result = CO2::gasViscosity(temperature, pressure);
- Valgrind::CheckDefined(result);
- return result;
- }
+ return CO2::gasViscosity(temperature, pressure);
+
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -452,33 +445,23 @@ public:
if (phaseIdx == liquidPhaseIdx)
{
assert(compIIdx == H2OIdx);
- Scalar result = 0.0;
- if(compJIdx == CO2Idx)
- result = Brine_CO2::liquidDiffCoeff(temperature, pressure);
-
+ if (compJIdx == CO2Idx)
+ return Brine_CO2::liquidDiffCoeff(temperature, pressure);
else if (compJIdx < numComponents) //Calcium and urea
- result = 1.587e-9; //[m²/s] educated guess, value for NaCl from J. Phys. D: Appl. Phys. 40 (2007) 2769-2776
+ return 1.587e-9; //[m²/s] educated guess, value for NaCl from J. Phys. D: Appl. Phys. 40 (2007) 2769-2776
else
DUNE_THROW(Dune::NotImplemented, "Binary difussion coefficient : Incorrect compIdx");
-
- Valgrind::CheckDefined(result);
- return result;
}
else
{
assert(phaseIdx == gasPhaseIdx);
assert(compIIdx == CO2Idx);
- Scalar result = 0.0;
- if(compJIdx == H2OIdx)
- result = Brine_CO2::gasDiffCoeff(temperature, pressure);
-
+ if (compJIdx == H2OIdx)
+ return Brine_CO2::gasDiffCoeff(temperature, pressure);
else if (compJIdx <numComponents) //Calcium and urea will stay in brine, no gaseous calcium or urea!
- result = 0.0;
+ return 0.0;
else
DUNE_THROW(Dune::NotImplemented, "Binary difussion coefficient : Incorrect compIdx");
-
- Valgrind::CheckDefined(result);
- return result;
}
};
@@ -527,11 +510,6 @@ private:
Scalar xwH2O,
Scalar XlSal)
{
- Valgrind::CheckDefined(T);
- Valgrind::CheckDefined(pl);
- Valgrind::CheckDefined(XlSal);
- Valgrind::CheckDefined(xwCO2);
-
if(T < 273.15)
{
DUNE_THROW(NumericalProblem,
@@ -545,10 +523,10 @@ private:
"defined below 250MPa (is" << pl << ")");
}
- Scalar rho_brine = Brine::liquidDensity(T, pl);
- Scalar rho_pure = H2O::liquidDensity(T, pl);
- Scalar rho_lCO2 = liquidDensityWaterCO2_(T, pl, xwH2O, xwCO2);
- Scalar contribCO2 = rho_lCO2 - rho_pure;
+ const Scalar rho_brine = Brine::liquidDensity(T, pl);
+ const Scalar rho_pure = H2O::liquidDensity(T, pl);
+ const Scalar rho_lCO2 = liquidDensityWaterCO2_(T, pl, xwH2O, xwCO2);
+ const Scalar contribCO2 = rho_lCO2 - rho_pure;
return rho_brine + contribCO2;
}
diff --git a/exercises/exercise-biomineralization/main.cc b/exercises/exercise-biomineralization/main.cc
index cd8011e188efd29e217defd6985d1c3c1afa4b00..95dc1a08fca4f7942799dd74140d9b7c458585f4 100644
--- a/exercises/exercise-biomineralization/main.cc
+++ b/exercises/exercise-biomineralization/main.cc
@@ -34,7 +34,6 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/defaultusagemessage.hh>
diff --git a/exercises/exercise-fluidsystem/main.cc b/exercises/exercise-fluidsystem/main.cc
index 42796831522c9f3a2976a95dfa532d913e6d36b1..5266f7eff32a6ff06b0b8c018219e148c43ed85b 100644
--- a/exercises/exercise-fluidsystem/main.cc
+++ b/exercises/exercise-fluidsystem/main.cc
@@ -37,7 +37,6 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/defaultusagemessage.hh>
@@ -108,7 +107,7 @@ int main(int argc, char** argv) try
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x);
-
+
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/exercises/exercise-properties/main.cc b/exercises/exercise-properties/main.cc
index fd52d8d8f85c911b00f25000ce86348586de08f9..4194de1a28177624c2f98a43ef1d5de4ad4304ac 100644
--- a/exercises/exercise-properties/main.cc
+++ b/exercises/exercise-properties/main.cc
@@ -34,7 +34,6 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/defaultusagemessage.hh>
diff --git a/exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh b/exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh
index c5b395d3a564197e99a33d5a4b9f0c6f3fadce6f..0509032c26d7c34b74ac5a17c98de5e658f90aab 100644
--- a/exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh
+++ b/exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh
@@ -330,21 +330,14 @@ public:
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
+ // assume brine with viscosity effect of Ca for the liquid phase.
if (phaseIdx == liquidPhaseIdx)
- {
- // assume brine with viscosity effect of Ca for the liquid phase.
- Scalar result = Brine::liquidViscosity(temperature, pressure);
+ return Brine::liquidViscosity(temperature, pressure);;
- Valgrind::CheckDefined(result);
- return result;
- }
+ // assume pure CO2 for the gas phase.
else if (phaseIdx == gasPhaseIdx)
- {
- // assume pure CO2 for the gas phase.
- Scalar result = CO2::gasViscosity(temperature, pressure);
- Valgrind::CheckDefined(result);
- return result;
- }
+ return CO2::gasViscosity(temperature, pressure);
+
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -452,33 +445,23 @@ public:
if (phaseIdx == liquidPhaseIdx)
{
assert(compIIdx == H2OIdx);
- Scalar result = 0.0;
- if(compJIdx == CO2Idx)
- result = Brine_CO2::liquidDiffCoeff(temperature, pressure);
-
+ if (compJIdx == CO2Idx)
+ return Brine_CO2::liquidDiffCoeff(temperature, pressure);
else if (compJIdx < numComponents) //Calcium and urea
- result = 1.587e-9; //[m²/s] educated guess, value for NaCl from J. Phys. D: Appl. Phys. 40 (2007) 2769-2776
+ return 1.587e-9; //[m²/s] educated guess, value for NaCl from J. Phys. D: Appl. Phys. 40 (2007) 2769-2776
else
DUNE_THROW(Dune::NotImplemented, "Binary difussion coefficient : Incorrect compIdx");
-
- Valgrind::CheckDefined(result);
- return result;
}
else
{
assert(phaseIdx == gasPhaseIdx);
assert(compIIdx == CO2Idx);
- Scalar result = 0.0;
- if(compJIdx == H2OIdx)
- result = Brine_CO2::gasDiffCoeff(temperature, pressure);
-
+ if (compJIdx == H2OIdx)
+ return Brine_CO2::gasDiffCoeff(temperature, pressure);
else if (compJIdx <numComponents) //Calcium and urea will stay in brine, no gaseous calcium or urea!
- result = 0.0;
+ return 0.0;
else
DUNE_THROW(Dune::NotImplemented, "Binary difussion coefficient : Incorrect compIdx");
-
- Valgrind::CheckDefined(result);
- return result;
}
};
@@ -527,11 +510,6 @@ private:
Scalar xwH2O,
Scalar XlSal)
{
- Valgrind::CheckDefined(T);
- Valgrind::CheckDefined(pl);
- Valgrind::CheckDefined(XlSal);
- Valgrind::CheckDefined(xwCO2);
-
if(T < 273.15)
{
DUNE_THROW(NumericalProblem,
@@ -545,10 +523,10 @@ private:
"defined below 250MPa (is" << pl << ")");
}
- Scalar rho_brine = Brine::liquidDensity(T, pl);
- Scalar rho_pure = H2O::liquidDensity(T, pl);
- Scalar rho_lCO2 = liquidDensityWaterCO2_(T, pl, xwH2O, xwCO2);
- Scalar contribCO2 = rho_lCO2 - rho_pure;
+ const Scalar rho_brine = Brine::liquidDensity(T, pl);
+ const Scalar rho_pure = H2O::liquidDensity(T, pl);
+ const Scalar rho_lCO2 = liquidDensityWaterCO2_(T, pl, xwH2O, xwCO2);
+ const Scalar contribCO2 = rho_lCO2 - rho_pure;
return rho_brine + contribCO2;
}
diff --git a/exercises/solution/exercise-biomineralization/main.cc b/exercises/solution/exercise-biomineralization/main.cc
index cd8011e188efd29e217defd6985d1c3c1afa4b00..95dc1a08fca4f7942799dd74140d9b7c458585f4 100644
--- a/exercises/solution/exercise-biomineralization/main.cc
+++ b/exercises/solution/exercise-biomineralization/main.cc
@@ -34,7 +34,6 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/defaultusagemessage.hh>
diff --git a/exercises/solution/exercise-fluidsystem/main.cc b/exercises/solution/exercise-fluidsystem/main.cc
index 05d89f8abb61808f59abca86c547eb08078adfe5..9a9bafe6ef2159833aa1ff3a3d14a876c51ca58d 100644
--- a/exercises/solution/exercise-fluidsystem/main.cc
+++ b/exercises/solution/exercise-fluidsystem/main.cc
@@ -37,7 +37,6 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/defaultusagemessage.hh>
@@ -131,7 +130,7 @@ int main(int argc, char** argv) try
// the linear solver
using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
-
+
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
NewtonSolver nonLinearSolver(assembler, linearSolver);
diff --git a/exercises/solution/exercise-properties/main.cc b/exercises/solution/exercise-properties/main.cc
index 203add5c994bb55659a2490bc5bec86903ce4f6e..f20d3f063fad4d186acd591e2057f465be339a4e 100644
--- a/exercises/solution/exercise-properties/main.cc
+++ b/exercises/solution/exercise-properties/main.cc
@@ -34,7 +34,6 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/defaultusagemessage.hh>