[freeflow][navierstokes][momentum] Remove deprecated headers

dumux/freeflow/navierstokes/momentum/CMakeLists.txt

@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 add_subdirectory(cvfe)
-add_subdirectory(diamond)
-add_subdirectory(pq1bubble)
 
 file(GLOB DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_HEADERS *.hh *.inc)
 install(FILES ${DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_HEADERS}

dumux/freeflow/navierstokes/momentum/diamond/CMakeLists.txt

-# SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-file(GLOB DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_DIAMOND_HEADERS *.hh *.inc)
-install(FILES ${DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_DIAMOND_HEADERS}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/navierstokes/momentum/diamond)

dumux/freeflow/navierstokes/momentum/diamond/indices.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- * \copydoc Dumux::NavierStokesIndices
- */
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_INDICES_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_INDICES_HH
-
-#warning "This header is deprecated and will be removed after 3.7"
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/indices.hh>
-
-namespace Dumux {
-
-template <int dimension>
-using NavierStokesMomentumDiamondIndices [[deprecated("Use NavierStokesMomentumCVFEIndices")]] = NavierStokesMomentumCVFEIndices<dimension>;
-
-} // end namespace Dumux
-
-#endif

dumux/freeflow/navierstokes/momentum/diamond/localresidual.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- * \copydoc Dumux::NavierStokesResidualImpl
- */
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_LOCAL_RESIDUAL_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_LOCAL_RESIDUAL_HH
-
-#warning "This header is deprecated and will be removed after 3.7"
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/localresidual.hh>
-
-namespace Dumux {
-
-template<class TypeTag>
-using NavierStokesMomentumDiamondResidual [[deprecated("Use NavierStokesMomentumCVFELocalResidual")]] = NavierStokesMomentumCVFELocalResidual<TypeTag>;
-
-} // end namespace Dumux
-
-#endif

dumux/freeflow/navierstokes/momentum/diamond/model.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- *
- * \brief A single-phase, isothermal Navier-Stokes model
- *
- * This model implements a single-phase, isothermal Navier-Stokes model, solving the <B> momentum balance equation </B>
- * \f[
- \frac{\partial (\varrho \textbf{v})}{\partial t} + \nabla \cdot (\varrho \textbf{v} \textbf{v}^{\text{T}}) = \nabla \cdot (\mu (\nabla \textbf{v} + \nabla \textbf{v}^{\text{T}}))
-   - \nabla p + \varrho \textbf{g} - \textbf{f}
- * \f]
- * By setting the runtime parameter <code>Problem.EnableInertiaTerms</code> to <code>false</code> the Stokes
- * equation can be solved. In this case the term
- * \f[
- *    \nabla \cdot (\varrho \textbf{v} \textbf{v}^{\text{T}})
- * \f]
- * is neglected.
- *
- * The <B> mass balance equation </B>
- * \f[
-       \frac{\partial \varrho}{\partial t} + \nabla \cdot (\varrho \textbf{v}) - q = 0
- * \f]
- *
- * closes the system.
- */
-
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_MODEL_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_MODEL_HH
-
-#warning "This file is deprecated and will be removed after 3.7. Use NavierStokesMomentumCVFE type tag."
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/model.hh>
-
-///////////////////////////////////////////////////////////////////////////
-// properties for the single-phase Navier-Stokes model
-///////////////////////////////////////////////////////////////////////////
-namespace Dumux::Properties {
-
-// Create new type tags
-namespace TTag {
-//! The type tag for the single-phase, isothermal Navier-Stokes model
-struct NavierStokesMomentumDiamond { using InheritsFrom = std::tuple<NavierStokesMomentumCVFE>; };
-} // end namespace TTag
-
-} // end namespace Dumux::Properties
-
-#endif

dumux/freeflow/navierstokes/momentum/diamond/volumevariables.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- *
- * \copydoc Dumux::NavierStokesVolumeVariables
- */
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_VOLUME_VARIABLES_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_DIAMOND_VOLUME_VARIABLES_HH
-
-#warning "This header is deprecated and will be removed after 3.7"
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/volumevariables.hh>
-
-namespace Dumux {
-
-template<class TypeTag>
-using NavierStokesMomentumDiamondVolumeVariables [[deprecated("Use NavierStokesMomentumCVFEVolumeVariables")]] = NavierStokesMomentumCVFEVolumeVariables<TypeTag>;
-
-} // end namespace Dumux
-
-#endif

dumux/freeflow/navierstokes/momentum/pq1bubble/CMakeLists.txt

-# SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-file(GLOB DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_HEADERS *.hh *.inc)
-install(FILES ${DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_HEADERS}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/navierstokes/momentum/pq1bubble)

dumux/freeflow/navierstokes/momentum/pq1bubble/indices.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- * \copydoc Dumux::NavierStokesIndices
- */
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_INDICES_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_INDICES_HH
-
-
-#warning "This header is deprecated and will be removed after 3.7"
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/indices.hh>
-
-namespace Dumux {
-
-template <int dimension>
-using NavierStokesMomentumPQ1BubbleIndices [[deprecated("Use NavierStokesMomentumCVFEIndices")]] = NavierStokesMomentumCVFEIndices<dimension>;
-
-} // end namespace Dumux
-
-#endif

dumux/freeflow/navierstokes/momentum/pq1bubble/localresidual.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- * \copydoc Dumux::NavierStokesResidualImpl
- */
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_LOCAL_RESIDUAL_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_LOCAL_RESIDUAL_HH
-
-#warning "This header is deprecated and will be removed after 3.7"
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/localresidual.hh>
-
-namespace Dumux {
-
-template<class TypeTag>
-using NavierStokesMomentumPQ1BubbleLocalResidual [[deprecated("Use NavierStokesMomentumCVFELocalResidual")]] = NavierStokesMomentumCVFELocalResidual<TypeTag>;
-
-} // end namespace Dumux
-
-#endif

dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- *
- * \brief A single-phase, isothermal Navier-Stokes model
- *
- * This model implements a single-phase, isothermal Navier-Stokes model, solving the <B> momentum balance equation </B>
- * \f[
- \frac{\partial (\varrho \textbf{v})}{\partial t} + \nabla \cdot (\varrho \textbf{v} \textbf{v}^{\text{T}}) = \nabla \cdot (\mu (\nabla \textbf{v} + \nabla \textbf{v}^{\text{T}}))
-   - \nabla p + \varrho \textbf{g} - \textbf{f}
- * \f]
- * By setting the runtime parameter <code>Problem.EnableInertiaTerms</code> to <code>false</code> the Stokes
- * equation can be solved. In this case the term
- * \f[
- *    \nabla \cdot (\varrho \textbf{v} \textbf{v}^{\text{T}})
- * \f]
- * is neglected.
- *
- * The <B> mass balance equation </B>
- * \f[
-       \frac{\partial \varrho}{\partial t} + \nabla \cdot (\varrho \textbf{v}) - q = 0
- * \f]
- *
- * closes the system.
- */
-
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_MODEL_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_MODEL_HH
-
-#warning "This file is deprecated and will be removed after 3.7. Use NavierStokesMomentumCVFE type tag."
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/model.hh>
-
-///////////////////////////////////////////////////////////////////////////
-// properties for the single-phase Navier-Stokes model
-///////////////////////////////////////////////////////////////////////////
-namespace Dumux::Properties {
-
-// Create new type tags
-namespace TTag {
-//! The type tag for the single-phase, isothermal Navier-Stokes model
-struct NavierStokesMomentumPQ1Bubble { using InheritsFrom = std::tuple<NavierStokesMomentumCVFE>; };
-} // end namespace TTag
-
-} // end namespace Dumux::Properties
-
-#endif
\ No newline at end of file

dumux/freeflow/navierstokes/momentum/pq1bubble/volumevariables.hh

-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup NavierStokesModel
- *
- * \copydoc Dumux::NavierStokesVolumeVariables
- */
-#ifndef DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_VOLUME_VARIABLES_HH
-#define DUMUX_NAVIERSTOKES_MOMENTUM_PQ1BUBBLE_VOLUME_VARIABLES_HH
-
-#warning "This header is deprecated and will be removed after 3.7"
-
-#include <dumux/freeflow/navierstokes/momentum/cvfe/volumevariables.hh>
-
-namespace Dumux {
-
-/*!
- * \ingroup NavierStokesModel
- * \brief Volume variables for the single-phase Navier-Stokes model.
- */
-template <class Traits>
-using NavierStokesMomentumPQ1BubbleVolumeVariables [[deprecated("Use NavierStokesMomentumCVFEVolumeVariables")]] = NavierStokesMomentumCVFEVolumeVariables<Traits>;
-
-} // end namespace Dumux
-
-#endif