From 0afef5dcabfcdb8f7d5df524eae2e14cb810a67b Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Mon, 13 Apr 2020 19:36:20 +0200 Subject: [PATCH] [solids] Remove deprecated inertsolidphase --- dumux/material/solidsystems/CMakeLists.txt | 1 - .../material/solidsystems/inertsolidphase.hh | 30 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 dumux/material/solidsystems/inertsolidphase.hh diff --git a/dumux/material/solidsystems/CMakeLists.txt b/dumux/material/solidsystems/CMakeLists.txt index 734df98602..7ac9b1f358 100644 --- a/dumux/material/solidsystems/CMakeLists.txt +++ b/dumux/material/solidsystems/CMakeLists.txt @@ -1,5 +1,4 @@ install(FILES 1csolid.hh compositionalsolidphase.hh -inertsolidphase.hh DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/solidsystems) diff --git a/dumux/material/solidsystems/inertsolidphase.hh b/dumux/material/solidsystems/inertsolidphase.hh deleted file mode 100644 index 5020d86148..0000000000 --- a/dumux/material/solidsystems/inertsolidphase.hh +++ /dev/null @@ -1,30 +0,0 @@ -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -// vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * See the file COPYING for full copying permissions. * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - *****************************************************************************/ -/*! - * \file - * \ingroup SolidSystems - * \brief A solid phase consisting of a single inert solid component. - */ -#ifndef DUMUX_SOLIDSYSTEMS_INERT_SOLID_PHASE_HH -#define DUMUX_SOLIDSYSTEMS_INERT_SOLID_PHASE_HH - -#warning "This header is deprecated and will be removed after release 3.2. Use solidsystem.hh and SolidSystems::OneCSolid." -#include <dumux/material/solidsystems/1csolid.hh> - -#endif -- GitLab