Commit f334cab9 authored by Timo Koch's avatar Timo Koch
Browse files

[solidsystem] Keep InertSolidPhase but use new header everywhere

parent d9807927
......@@ -29,7 +29,7 @@
#include <dumux/common/properties/model.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/material/solidstates/inertsolidstate.hh>
#include <dumux/material/solidsystems/inertsolidphase.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/flux/hookeslaw.hh>
#include "stressvariablescache.hh"
......
......@@ -127,6 +127,15 @@ public:
{ return heatCapacity(solidState.temperature(), compIdx); }
};
/*!
* \ingroup SolidSystems
* \brief A solid phase consisting of a single inert solid component.
* \note a solid is considered inert if it can't dissolve in a liquid and
* and can't increase its mass by precipitation from a fluid phase.
*/
template <class Scalar, class ComponentT>
using InertSolidPhase = OneCSolid<Scalar, ComponentT, /*isInert=*/true>;
} // end namespace SolidSystems
} // end namespace Dumux
......
......@@ -24,24 +24,7 @@
#ifndef DUMUX_SOLIDSYSTEMS_INERT_SOLID_PHASE_HH
#define DUMUX_SOLIDSYSTEMS_INERT_SOLID_PHASE_HH
#include <string>
#include <dune/common/exceptions.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#warning "This header is deprecated and will be removed after release 3.2. Use solidsystem.hh and SolidSystems::OneCSolid."
namespace Dumux {
namespace SolidSystems {
/*!
* \ingroup SolidSystems
* \brief A solid phase consisting of a single inert solid component.
* \note a solid is considered inert if it can't dissolve in a liquid and
* and can't increase its mass by precipitation from a fluid phase.
*/
template <class Scalar, class ComponentT>
using InertSolidPhase = OneCSolid<Scalar, ComponentT, /*isInert=*/true>;
} // end namespace SolidSystems
} // end namespace Dumux
#include <dumux/material/solidsystems/1csolid.hh>
#endif
......@@ -29,7 +29,7 @@
#include <type_traits>
#include <dune/common/std/type_traits.hh>
#include <dumux/material/solidsystems/inertsolidphase.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
namespace Dumux {
......
......@@ -40,7 +40,7 @@
#include <dumux/flux/fourierslaw.hh>
#include <dumux/material/solidstates/inertsolidstate.hh>
#include <dumux/material/solidsystems/inertsolidphase.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
namespace Dumux {
......
......@@ -30,7 +30,7 @@
#include <dumux/material/fluidsystems/h2oairxylene.hh>
#include <dumux/material/solidstates/inertsolidstate.hh>
#include <dumux/material/solidsystems/inertsolidphase.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/discretization/cctpfa.hh>
......
......@@ -33,7 +33,7 @@
#include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include <dumux/material/solidsystems/inertsolidphase.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include "spatialparams.hh"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment