From 922dd2242b59cd224001161e4b0fb04d8cd60b9c Mon Sep 17 00:00:00 2001
From: Tufan Ghosh <tufan.ghosh@iws.uni-stuttgart.de>
Date: Thu, 27 Apr 2023 11:36:46 +0200
Subject: [PATCH] [freeflow][navierstokes][momentum] Remove deprecated headers
---
.../navierstokes/momentum/CMakeLists.txt | 2 -
.../momentum/diamond/CMakeLists.txt | 6 ---
.../navierstokes/momentum/diamond/indices.hh | 26 ---------
.../momentum/diamond/localresidual.hh | 26 ---------
.../navierstokes/momentum/diamond/model.hh | 53 -------------------
.../momentum/diamond/volumevariables.hh | 27 ----------
.../momentum/pq1bubble/CMakeLists.txt | 6 ---
.../momentum/pq1bubble/indices.hh | 27 ----------
.../momentum/pq1bubble/localresidual.hh | 26 ---------
.../navierstokes/momentum/pq1bubble/model.hh | 53 -------------------
.../momentum/pq1bubble/volumevariables.hh | 31 -----------
11 files changed, 283 deletions(-)
delete mode 100644 dumux/freeflow/navierstokes/momentum/diamond/CMakeLists.txt
delete mode 100644 dumux/freeflow/navierstokes/momentum/diamond/indices.hh
delete mode 100644 dumux/freeflow/navierstokes/momentum/diamond/localresidual.hh
delete mode 100644 dumux/freeflow/navierstokes/momentum/diamond/model.hh
delete mode 100644 dumux/freeflow/navierstokes/momentum/diamond/volumevariables.hh
delete mode 100644 dumux/freeflow/navierstokes/momentum/pq1bubble/CMakeLists.txt
delete mode 100644 dumux/freeflow/navierstokes/momentum/pq1bubble/indices.hh
delete mode 100644 dumux/freeflow/navierstokes/momentum/pq1bubble/localresidual.hh
delete mode 100644 dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh
delete mode 100644 dumux/freeflow/navierstokes/momentum/pq1bubble/volumevariables.hh
diff --git a/dumux/freeflow/navierstokes/momentum/CMakeLists.txt b/dumux/freeflow/navierstokes/momentum/CMakeLists.txt
index f738353326..6b1c27a787 100644
--- a/dumux/freeflow/navierstokes/momentum/CMakeLists.txt
+++ b/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}
diff --git a/dumux/freeflow/navierstokes/momentum/diamond/CMakeLists.txt b/dumux/freeflow/navierstokes/momentum/diamond/CMakeLists.txt
deleted file mode 100644
index 1cb11d599a..0000000000
--- a/dumux/freeflow/navierstokes/momentum/diamond/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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)
diff --git a/dumux/freeflow/navierstokes/momentum/diamond/indices.hh b/dumux/freeflow/navierstokes/momentum/diamond/indices.hh
deleted file mode 100644
index e2c57c36ad..0000000000
--- a/dumux/freeflow/navierstokes/momentum/diamond/indices.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- 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
diff --git a/dumux/freeflow/navierstokes/momentum/diamond/localresidual.hh b/dumux/freeflow/navierstokes/momentum/diamond/localresidual.hh
deleted file mode 100644
index cb99104abe..0000000000
--- a/dumux/freeflow/navierstokes/momentum/diamond/localresidual.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- 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
diff --git a/dumux/freeflow/navierstokes/momentum/diamond/model.hh b/dumux/freeflow/navierstokes/momentum/diamond/model.hh
deleted file mode 100644
index a53a918598..0000000000
--- a/dumux/freeflow/navierstokes/momentum/diamond/model.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- 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
diff --git a/dumux/freeflow/navierstokes/momentum/diamond/volumevariables.hh b/dumux/freeflow/navierstokes/momentum/diamond/volumevariables.hh
deleted file mode 100644
index 6e2b986f5b..0000000000
--- a/dumux/freeflow/navierstokes/momentum/diamond/volumevariables.hh
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- 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
diff --git a/dumux/freeflow/navierstokes/momentum/pq1bubble/CMakeLists.txt b/dumux/freeflow/navierstokes/momentum/pq1bubble/CMakeLists.txt
deleted file mode 100644
index f78d8b8e9e..0000000000
--- a/dumux/freeflow/navierstokes/momentum/pq1bubble/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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)
diff --git a/dumux/freeflow/navierstokes/momentum/pq1bubble/indices.hh b/dumux/freeflow/navierstokes/momentum/pq1bubble/indices.hh
deleted file mode 100644
index 305419e50d..0000000000
--- a/dumux/freeflow/navierstokes/momentum/pq1bubble/indices.hh
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- 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
diff --git a/dumux/freeflow/navierstokes/momentum/pq1bubble/localresidual.hh b/dumux/freeflow/navierstokes/momentum/pq1bubble/localresidual.hh
deleted file mode 100644
index 0933f81a61..0000000000
--- a/dumux/freeflow/navierstokes/momentum/pq1bubble/localresidual.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- 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
diff --git a/dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh b/dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh
deleted file mode 100644
index c5472cc699..0000000000
--- a/dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- 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
diff --git a/dumux/freeflow/navierstokes/momentum/pq1bubble/volumevariables.hh b/dumux/freeflow/navierstokes/momentum/pq1bubble/volumevariables.hh
deleted file mode 100644
index 4b5a24afef..0000000000
--- a/dumux/freeflow/navierstokes/momentum/pq1bubble/volumevariables.hh
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- 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
--
GitLab