From 4d1a2827914452ce66d4e477d72972f1561f2435 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Wed, 29 Nov 2017 20:28:07 +0100 Subject: [PATCH] [misc] Fix some occurences of the old GET_PARAM macro yielding compiler erros --- dumux/assembly/boxlocalassembler.hh | 2 +- dumux/common/parameters.hh | 3 +++ dumux/material/spatialparams/implicit1p.hh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh index 8340995259..f5dbd394b1 100644 --- a/dumux/assembly/boxlocalassembler.hh +++ b/dumux/assembly/boxlocalassembler.hh @@ -674,7 +674,7 @@ private: // // ////////////////////////////////////////////////////////////////////////////////////////////////// - static const int numericDifferenceMethod = GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, NumericDifferenceMethod); + static const int numericDifferenceMethod = getParamFromGroup(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Implicit.NumericDifferenceMethod"); // calculation of the derivatives for (auto&& scv : scvs(fvGeometry)) diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh index 5f952529e7..88e7cf5cdc 100644 --- a/dumux/common/parameters.hh +++ b/dumux/common/parameters.hh @@ -361,6 +361,9 @@ private: params["TimeLoop.MaxTimeStepSize"] = "1e300"; params["TimeLoop.MaxTimeStepDivisions"] = "10"; + // parameters in the spatial params group + params["SpatialParams.ForchCoeff"] = "0.55"; + // parameters in the vtk group params["Vtk.AddVelocity"] = "false"; params["Vtk.AddProcessRank"] = "true"; diff --git a/dumux/material/spatialparams/implicit1p.hh b/dumux/material/spatialparams/implicit1p.hh index 493f07aaff..5d41b887b6 100644 --- a/dumux/material/spatialparams/implicit1p.hh +++ b/dumux/material/spatialparams/implicit1p.hh @@ -294,7 +294,7 @@ public: */ Scalar forchCoeff(const SubControlVolume &scv) const { - static Scalar forchCoeff = GET_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, ForchCoeff); + static Scalar forchCoeff = getParamFromGroup(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "SpatialParams.ForchCoeff"); return forchCoeff; } -- GitLab