Commit 396f99e1 authored by Gabi Seitz's avatar Gabi Seitz Committed by Dennis Gläser

[1pncmin] move test CaO component and fluidsystem to test folder

implementation is not general and is only used to reproduce a
reference from literature.
parent a6283646
......@@ -6,7 +6,6 @@ air.hh
benzene.hh
brine.hh
CaO.hh
CaOtest.hh
CaO2H2.hh
ch4.hh
co2.hh
......
......@@ -35,7 +35,7 @@
#include <dumux/material/components/n2.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/components/CaO2H2.hh>
#include <dumux/material/components/CaOtest.hh>
#include <dumux/material/components/CaO.hh>
#include <dumux/material/binarycoefficients/h2o_n2.hh>
#include <dumux/material/components/tabulatedcomponent.hh>
......@@ -71,7 +71,7 @@ public:
using H2O_N2 = Dumux::BinaryCoeff::H2O_N2;
using N2 = Dumux::N2<Scalar>;
using CaO = Dumux::CaOTest<Scalar>;
using CaO = Dumux::CaO<Scalar>;
using CaO2H2 = Dumux::CaO2H2<Scalar>;
// the type of parameter cache objects. this fluid system does not
......
......@@ -12,6 +12,8 @@ dune_add_test(NAME test_1pncminni_box
#install sources
install(FILES
modifiedcao.hh
modifiedsteamn2cao2h2.hh
thermochemproblem.hh
thermochemspatialparams.hh
thermochemreaction.hh
......
......@@ -18,12 +18,12 @@
*****************************************************************************/
/*!
* \file
* \ingroup Components
* \brief Corrected material properties of pure Calcium-Oxide \f$CaO\f$ withouf considering a porosity
* \ingroup OnePNCMinTests
* \brief Corrected material properties of pure Calcium-Oxide \f$CaO\f$ without considering a porosity
* change in the reaction of Calciumoxyde and Calciumhydroxyde.
*/
#ifndef DUMUX_CAO_TEST_HH
#define DUMUX_CAO_TEST_HH
#ifndef DUMUX_MODIFIED_CAO_HH
#define DUMUX_MODIFIED_CAO_HH
#include <dumux/material/components/CaO.hh>
......@@ -31,15 +31,15 @@
namespace Dumux
{
/*!
* \ingroup Components
* \brief A class for the CaOtest properties
* \ingroup OnePNCMinTests
* \brief A class for the ModifiedCaO properties
*
* This class uses a different CaO density. It is to be used for calculating the chemical
* reaction of CaO to Ca(OH)2 without considering the porosity change according to See Shao et
* al. (2013).
*/
template <class Scalar>
class CaOTest : public CaO<Scalar>
class ModifiedCaO : public CaO<Scalar>
{
public:
......
......@@ -29,11 +29,11 @@
#include <dumux/discretization/cellcentered/tpfa/properties.hh>
#include <dumux/discretization/cellcentered/mpfa/properties.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/steamn2cao2h2.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
#include "thermochemspatialparams.hh"
#include "thermochemreaction.hh"
#include "modifiedsteamn2cao2h2.hh"
namespace Dumux
......@@ -55,7 +55,7 @@ SET_TYPE_PROP(ThermoChemProblem, Problem, ThermoChemProblem<TypeTag>);
SET_PROP(ThermoChemProblem, FluidSystem)
{ /*private:*/
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::SteamN2CaO2H2<Scalar>;
using type = FluidSystems::ModifiedSteamN2CaO2H2<Scalar>;
};
// // Enable velocity output
......
Markdown is supported
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