diff --git a/CHANGELOG b/CHANGELOG index b3c5bbe4cac3c8d23fad9fced7a3e003966b46a5..e08c5d1a64eb66104c06a8ed02423a4930fec662 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -107,6 +107,13 @@ Differences Between DuMuX 2.2 and DuMuX 2.3 - numFAP and numSCV in Box(CC)FVElementGeometry have been renamed to numFap and numScv, respectively. +* Deprecated MEMBER FUNCTIONS, to be removed after 2.3: + - boundaryMatrixHeatFlux, markVertexRed and relativeErrorVertex + from ImplicitSpatialParams, ImplicitAssembler and ImplicitModel, + respectively. In favor of using + thermalConductivitySolid (see above), markDofRed and relativeErrorDof, + respectively. + * DELETED classes/files, property names, constants/enums, member functions, which have been deprecated in DuMuX 2.2: Everything listed as deprecated below has been removed. diff --git a/dumux/implicit/common/implicitassembler.hh b/dumux/implicit/common/implicitassembler.hh index aff7cae12633bb5d0bf0d4817cc00af1fd362980..cd0550d2782a31abe14de717292fc448da4bb117 100644 --- a/dumux/implicit/common/implicitassembler.hh +++ b/dumux/implicit/common/implicitassembler.hh @@ -308,22 +308,6 @@ public: elementColor_[globalIdx] = Red; } - /*! - * \brief Force to reassemble a given vertex next time the - * assemble() method is called. - * - * \param globalVertIdx The global index of the vertex which ought - * to be red. - */ - DUNE_DEPRECATED_MSG("Use markDofRed instead.") - void markVertexRed(const int globalVertIdx) - { - if (!enablePartialReassemble_()) - return; - - vertexColor_[globalVertIdx] = Red; - } - /*! * \brief Determine the colors of vertices and elements for partial * reassembly given a relative tolerance. diff --git a/dumux/implicit/common/implicitmodel.hh b/dumux/implicit/common/implicitmodel.hh index 673575a7f893ebc4dcd5e3b85f4f05dfb0d263b2..f51c42736cb77c5eb8b7eee7819a6bf90269e887 100644 --- a/dumux/implicit/common/implicitmodel.hh +++ b/dumux/implicit/common/implicitmodel.hh @@ -400,23 +400,6 @@ public: return result; } - /*! - * \brief Returns the relative error between two vectors of - * primary variables. - * - * \param vertexIdx The global index of the control volume's - * associated vertex - * \param priVars1 The first vector of primary variables - * \param priVars2 The second vector of primary variables - */ - DUNE_DEPRECATED_MSG("Use relativeErrorDof instead.") - Scalar relativeErrorVertex(const int vertexIdx, - const PrimaryVariables &priVars1, - const PrimaryVariables &priVars2) - { - return relativeErrorDof(vertexIdx, priVars1, priVars2); - } - /*! * \brief Try to progress the model to the next timestep. * diff --git a/dumux/material/spatialparams/implicitspatialparams.hh b/dumux/material/spatialparams/implicitspatialparams.hh index 9cbbbe4509e90b365f3c90213425cb18f60ffcaf..aaba6664f4ab5554d724c2d1dc309056102e914e 100644 --- a/dumux/material/spatialparams/implicitspatialparams.hh +++ b/dumux/material/spatialparams/implicitspatialparams.hh @@ -99,35 +99,6 @@ public: "a materialLawParamsAtPos() method."); } - /*! - * \brief Calculate the heat flux \f$[W/m^2]\f$ through the - * rock matrix based on the temperature gradient \f$[K / m]\f$ - * at the integration point of a (boundary or SCV) face - * - * This is only required for non-isothermal models that use outflow - * boundary conditions. - * - * \param heatFlux The resulting heat flux vector - * \param fluxVars The flux variables - * \param elemVolVars The volume variables - * \param face The boundary or sub-control-volume face - * \param element The current finite element - * \param fvGeometry The finite volume geometry of the current element - * \tparam FaceType The type of the face (boundary face / SCV face) - */ - template <class FaceType> DUNE_DEPRECATED_MSG("Method not used anymore!") - void boundaryMatrixHeatFlux(Vector &heatFlux, - const FluxVariables &fluxVars, - const ElementVolumeVariables &elemVolVars, - const FaceType &face, - const Element &element, - const FVElementGeometry &fvGeometry) const - { - DUNE_THROW(Dune::InvalidStateException, - "The spatial parameters do not provide " - "a matrixHeatFlux() method."); - } - private: Implementation &asImp_() { return *static_cast<Implementation*>(this); }