diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh index 718f2647b8ea6704e55d5bdc785f71944a43817d..27c30c3bd8f2bdb120e74eb40d35592dd8aad375 100644 --- a/dumux/boxmodels/2p/2pmodel.hh +++ b/dumux/boxmodels/2p/2pmodel.hh @@ -107,6 +107,7 @@ public: * \param globalIdx The global index of the vertex * \param pvIdx The index of the primary variable */ + DUNE_DEPRECATED Scalar primaryVarWeight(int globalIdx, int pvIdx) const { if (pressureIdx == pvIdx) diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh index 2cc5194cb10b6e084e850bf63a6fc6315b076a71..84c47e8fa591f2efeb5c238ed16d2a863c52c19b 100644 --- a/dumux/boxmodels/2p2c/2p2cmodel.hh +++ b/dumux/boxmodels/2p2c/2p2cmodel.hh @@ -247,6 +247,7 @@ public: * \param globalIdx The global vertex index * \param pvIdx The primary variable index */ + DUNE_DEPRECATED Scalar primaryVarWeight(const int globalIdx, const int pvIdx) const { if (Indices::pressureIdx == pvIdx) diff --git a/dumux/boxmodels/3p3c/3p3cmodel.hh b/dumux/boxmodels/3p3c/3p3cmodel.hh index 2e4ea7764f1ce0c0dfdcc67114240cd7f78a2bd9..7064f4c6f273272bbdc7678f9f73406664960b34 100644 --- a/dumux/boxmodels/3p3c/3p3cmodel.hh +++ b/dumux/boxmodels/3p3c/3p3cmodel.hh @@ -215,6 +215,7 @@ public: * \param globalVertexIdx The global vertex index * \param pvIdx The primary variable index */ + DUNE_DEPRECATED Scalar primaryVarWeight(int globalVertexIdx, int pvIdx) const { if (Indices::pressureIdx == pvIdx) diff --git a/dumux/boxmodels/common/boxmodel.hh b/dumux/boxmodels/common/boxmodel.hh index b0cef59e2681aa116b3ffc296c1276ca2e28aab0..5443e8c4cce24c21574ad4e6f5b7c18cc188e981 100644 --- a/dumux/boxmodels/common/boxmodel.hh +++ b/dumux/boxmodels/common/boxmodel.hh @@ -359,6 +359,7 @@ public: * \param vertIdx The global index of the control volume * \param pvIdx The index of the primary variable */ + DUNE_DEPRECATED Scalar primaryVarWeight(const int vertIdx, const int pvIdx) const { return 1.0/std::max(std::abs(this->prevSol()[vertIdx][pvIdx]), 1.0); @@ -385,8 +386,6 @@ public: { Scalar result = 0.0; for (int j = 0; j < numEq; ++j) { - //Scalar weight = asImp_().primaryVarWeight(vertexIdx, j); - //Scalar eqErr = std::abs(priVars1[j] - priVars2[j])*weight; Scalar eqErr = std::abs(priVars1[j] - priVars2[j]); eqErr /= std::max<Scalar>(1.0, std::abs(priVars1[j] + priVars2[j])/2); diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh index 114af0f6429896fdbf4d7a3c0ec210fdfd7030c4..e2acd601abad5a5d3e511f2e39fcffd99103d08d 100644 --- a/dumux/boxmodels/richards/richardsmodel.hh +++ b/dumux/boxmodels/richards/richardsmodel.hh @@ -123,6 +123,7 @@ public: /*! * \copydoc Dumux::BoxModel::primaryVarWeight */ + DUNE_DEPRECATED Scalar primaryVarWeight(const int vertIdx, const int pvIdx) const { if (Indices::pwIdx == pvIdx)