Skip to content
GitLab
Commit 75adaaf1 authored by Theresa Schollenberger's avatar Theresa Schollenberger Committed by Timo Koch
Browse files

[mm][properties] add properties header for naplinfiltration

parent 60c9c6dd
Hide whitespace changes
Inline Side-by-side
lecture/mm/naplinfiltration/3p/naplinfiltration3p.cc
View file @ 75adaaf1
......@@ -22,7 +22,7 @@
* \brief application, using the 3p box model
*/
#include "config.h"
#include "problem.hh"
#include "properties.hh"
#include <ctime>
#include <iostream>
......
lecture/mm/naplinfiltration/3p/problem.hh
View file @ 75adaaf1
......@@ -24,71 +24,14 @@
#ifndef DUMUX_NAPLINFILTRATIONPROBLEM_3P_HH
#define DUMUX_NAPLINFILTRATIONPROBLEM_3P_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/3p/model.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidsystems/3pimmiscible.hh>
#include <dumux/material/components/tabulatedcomponent.hh>
#include <dumux/material/components/air.hh>
#include "mymesitylene.hh"
#include <dumux/material/components/h2o.hh>
#include <lecture/mm/naplinfiltration/spatialparams.hh>
namespace Dumux
{
/*!
* \brief Isothermal NAPL infiltration problem: LNAPL contaminates
* the unsaturated and the saturated groundwater zone.
*/
template <class TypeTag>
class InfiltrationThreePProblem;
namespace Properties
{
// Create new type tags
namespace TTag {
struct InfiltrationThreePTypeTag { using InheritsFrom = std::tuple<ThreeP>; };
struct InfiltrationThreePBoxTypeTag { using InheritsFrom = std::tuple<InfiltrationThreePTypeTag, BoxModel>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::InfiltrationThreePTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::InfiltrationThreePTypeTag> { using type = InfiltrationThreePProblem<TypeTag>; };
// Set the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::InfiltrationThreePTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Water = Components::TabulatedComponent<Components::H2O<Scalar>>;
using WettingFluid = FluidSystems::OnePLiquid<Scalar, Water>;
using NonwettingFluid = FluidSystems::OnePLiquid<Scalar, Components::MyMesitylene<Scalar>>;
using Gas = FluidSystems::OnePGas<Scalar, Components::Air<Scalar>>;
public:
using type = FluidSystems::ThreePImmiscible<Scalar, WettingFluid, NonwettingFluid, Gas>;
};
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::InfiltrationThreePTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = InfiltrationSpatialParams<FVGridGeometry, Scalar>;
};
}// end namespace Properties
/*!
* \brief Isothermal NAPL infiltration problem: LNAPL contaminates
* the unsaturated and the saturated groundwater zone.
......
lecture/mm/naplinfiltration/3p/properties.hh 0 → 100644
View file @ 75adaaf1
// -*- 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 2 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
* \brief Isothermal NAPL infiltration problem: L- or DNAPL contaminates
* the unsaturated and the saturated groundwater zone.
*/
#ifndef DUMUX_NAPLINFILTRATIONPROPERTIES_3P_HH
#define DUMUX_NAPLINFILTRATIONPROPERTIES_3P_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3p/model.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidsystems/3pimmiscible.hh>
#include <dumux/material/components/tabulatedcomponent.hh>
#include <dumux/material/components/air.hh>
#include "mymesitylene.hh"
#include <dumux/material/components/h2o.hh>
#include <lecture/mm/naplinfiltration/spatialparams.hh>
#include "problem.hh"
namespace Dumux::Properties
{
// Create new type tags
namespace TTag {
struct InfiltrationThreePTypeTag { using InheritsFrom = std::tuple<ThreeP>; };
struct InfiltrationThreePBoxTypeTag { using InheritsFrom = std::tuple<InfiltrationThreePTypeTag, BoxModel>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::InfiltrationThreePTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::InfiltrationThreePTypeTag> { using type = InfiltrationThreePProblem<TypeTag>; };
// Set the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::InfiltrationThreePTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Water = Components::TabulatedComponent<Components::H2O<Scalar>>;
using WettingFluid = FluidSystems::OnePLiquid<Scalar, Water>;
using NonwettingFluid = FluidSystems::OnePLiquid<Scalar, Components::MyMesitylene<Scalar>>;
using Gas = FluidSystems::OnePGas<Scalar, Components::Air<Scalar>>;
public:
using type = FluidSystems::ThreePImmiscible<Scalar, WettingFluid, NonwettingFluid, Gas>;
};
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::InfiltrationThreePTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = InfiltrationSpatialParams<FVGridGeometry, Scalar>;
};
} // end namespace Dumux::Properties
#endif
lecture/mm/naplinfiltration/3p3c/naplinfiltration3p3c.cc
View file @ 75adaaf1
......@@ -47,7 +47,7 @@
#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/grid/gridmanager.hh>
#include "problem.hh"
#include "properties.hh"
/*!
* \brief Provides an interface for customizing error messages associated with
......
lecture/mm/naplinfiltration/3p3c/problem.hh
View file @ 75adaaf1
......@@ -24,58 +24,12 @@
#ifndef DUMUX_NAPLINFILTRATIONPROBLEM_3P_3C_HH
#define DUMUX_NAPLINFILTRATIONPROBLEM_3P_3C_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dumux/discretization/box.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/3p3c/model.hh>
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
#include <lecture/mm/naplinfiltration/3p3c/myh2oairmesitylene.hh>
#include <lecture/mm/naplinfiltration/spatialparams.hh>
namespace Dumux
{
/*!
* \brief Isothermal NAPL infiltration problem: LNAPL contaminates
* the unsaturated and the saturated groundwater zone.
*/
template <class TypeTag>
class InfiltrationThreePThreeCProblem;
namespace Properties {
// Create new type tags
namespace TTag {
struct InfiltrationThreePThreeCTypeTag { using InheritsFrom = std::tuple<ThreePThreeC>; };
struct InfiltrationThreePThreeCBoxTypeTag { using InheritsFrom = std::tuple<InfiltrationThreePThreeCTypeTag, BoxModel>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::InfiltrationThreePThreeCTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::InfiltrationThreePThreeCTypeTag> { using type = InfiltrationThreePThreeCProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::InfiltrationThreePThreeCTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = InfiltrationSpatialParams<FVGridGeometry, Scalar>;
};
// Set the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::InfiltrationThreePThreeCTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = FluidSystems::MyH2OAirMesitylene<Scalar>;
};
}
/*!
* \brief Isothermal NAPL infiltration problem: LNAPL contaminates
......
lecture/mm/naplinfiltration/3p3c/properties.hh 0 → 100644
View file @ 75adaaf1
// -*- 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 2 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
* \brief Isothermal NAPL infiltration problem: LNAPL contaminates
* the unsaturated and the saturated groundwater zone.
*/
#ifndef DUMUX_NAPLINFILTRATIONPROPERTIES_3P_3C_HH
#define DUMUX_NAPLINFILTRATIONPROPERTIES_3P_3C_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3p3c/model.hh>
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
#include <lecture/mm/naplinfiltration/3p3c/myh2oairmesitylene.hh>
#include <lecture/mm/naplinfiltration/spatialparams.hh>
#include "problem.hh"
namespace Dumux::Properties
{
// Create new type tags
namespace TTag {
struct InfiltrationThreePThreeCTypeTag { using InheritsFrom = std::tuple<ThreePThreeC>; };
struct InfiltrationThreePThreeCBoxTypeTag { using InheritsFrom = std::tuple<InfiltrationThreePThreeCTypeTag, BoxModel>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::InfiltrationThreePThreeCTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::InfiltrationThreePThreeCTypeTag> { using type = InfiltrationThreePThreeCProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::InfiltrationThreePThreeCTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = InfiltrationSpatialParams<FVGridGeometry, Scalar>;
};
// Set the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::InfiltrationThreePThreeCTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = FluidSystems::MyH2OAirMesitylene<Scalar>;
};
} // end namespace Dumux::Properties
#endif
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