Commit 7037daa5 authored by Maziar Veyskarami's avatar Maziar Veyskarami Committed by Timo Koch
Browse files

[lec-mm][heavyoil] move properties to properties header file

parent 0ada245d
......@@ -23,79 +23,13 @@
#ifndef DUMUX_SAGDPROBLEM_HH
#define DUMUX_SAGDPROBLEM_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include "spatialparams.hh"
namespace Dumux {
/*!
* \file
* \brief Non-isothermal SAGD problem
*/
template <class TypeTag>
class SagdProblem;
namespace Properties {
// Create new type tags
namespace TTag {
struct SagdTypeTag { using InheritsFrom = std::tuple<ThreePWaterOilNI>; };
struct ThreePWaterOilSagdBoxTypeTag { using InheritsFrom = std::tuple<BoxModel, SagdTypeTag>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::SagdTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::SagdTypeTag> { using type = Dumux::SagdProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::SagdTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = SagdSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::SagdTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = FluidSystems::H2OHeavyOil<Scalar>;
};
template<class TypeTag>
struct OnlyGasPhaseCanDisappear<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
template<class TypeTag>
struct UseMoles<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
// Set the fluid system
template<class TypeTag>
struct SolidSystem<TypeTag, TTag::SagdTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using InertComponent = Components::Constant<1, Scalar>;
using type = SolidSystems::InertSolidPhase<Scalar, InertComponent>;
};
} // end namespace Properties
/*!
* \brief Non-isothermal problem where ...
*
......@@ -355,6 +289,7 @@ private:
mutable Scalar massProducedWater_;
std::ofstream massBalance;
};
} //end namespace
#endif
// -*- 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 vesion. *
* *
* 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 Non-isothermal SAGD properties file
*/
#ifndef DUMUX_SAGDPROPERTIES_HH
#define DUMUX_SAGDPROPERTIES_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include "spatialparams.hh"
#include "problem.hh"
namespace Dumux::Properties {
// Create new type tags
namespace TTag {
struct SagdTypeTag { using InheritsFrom = std::tuple<ThreePWaterOilNI>; };
struct ThreePWaterOilSagdBoxTypeTag { using InheritsFrom = std::tuple<BoxModel, SagdTypeTag>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::SagdTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::SagdTypeTag> { using type = Dumux::SagdProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::SagdTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = SagdSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::SagdTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = FluidSystems::H2OHeavyOil<Scalar>;
};
template<class TypeTag>
struct OnlyGasPhaseCanDisappear<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
template<class TypeTag>
struct UseMoles<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
// Set the fluid system
template<class TypeTag>
struct SolidSystem<TypeTag, TTag::SagdTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using InertComponent = Components::Constant<1, Scalar>;
using type = SolidSystems::InertSolidPhase<Scalar, InertComponent>;
};
} // end namespace Dumux::Properties
#endif
......@@ -46,7 +46,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
......
......@@ -23,79 +23,13 @@
#ifndef DUMUX_SAGDCYCLICPROBLEM_HH
#define DUMUX_SAGDCYCLICPROBLEM_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include "spatialparams.hh"
namespace Dumux {
/*!
* \file
* \brief Non-isothermal SAGD problem
*/
template <class TypeTag>
class SagdCyclicProblem;
namespace Properties {
// Create new type tags
namespace TTag {
struct SagdTypeTag { using InheritsFrom = std::tuple<ThreePWaterOilNI>; };
struct ThreePWaterOilSagdCyclicBoxTypeTag { using InheritsFrom = std::tuple<BoxModel, SagdTypeTag>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::SagdTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::SagdTypeTag> { using type = Dumux::SagdCyclicProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::SagdTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = SagdSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::SagdTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = FluidSystems::H2OHeavyOil<Scalar>;
};
template<class TypeTag>
struct OnlyGasPhaseCanDisappear<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
template<class TypeTag>
struct UseMoles<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
// Set the fluid system
template<class TypeTag>
struct SolidSystem<TypeTag, TTag::SagdTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using InertComponent = Components::Constant<1, Scalar>;
using type = SolidSystems::InertSolidPhase<Scalar, InertComponent>;
};
} // end namespace Properties
/*!
* \brief Non-isothermal problem where ...
*
......@@ -371,6 +305,7 @@ private:
std::ofstream massBalance;
};
} //end namespace
#endif
// -*- 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 vesion. *
* *
* 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 Non-isothermal SAGD properties file
*/
#ifndef DUMUX_SAGDCYCLICPROPERTIES_HH
#define DUMUX_SAGDCYCLICPROPERTIES_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include "spatialparams.hh"
#include "problem.hh"
namespace Dumux::Properties {
// Create new type tags
namespace TTag {
struct SagdTypeTag { using InheritsFrom = std::tuple<ThreePWaterOilNI>; };
struct ThreePWaterOilSagdCyclicBoxTypeTag { using InheritsFrom = std::tuple<BoxModel, SagdTypeTag>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::SagdTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::SagdTypeTag> { using type = Dumux::SagdCyclicProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::SagdTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = SagdSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::SagdTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = FluidSystems::H2OHeavyOil<Scalar>;
};
template<class TypeTag>
struct OnlyGasPhaseCanDisappear<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
template<class TypeTag>
struct UseMoles<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
// Set the fluid system
template<class TypeTag>
struct SolidSystem<TypeTag, TTag::SagdTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using InertComponent = Components::Constant<1, Scalar>;
using type = SolidSystems::InertSolidPhase<Scalar, InertComponent>;
};
} // end namespace Dumux::Properties
#endif
......@@ -46,7 +46,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
......
......@@ -23,78 +23,13 @@
#ifndef DUMUX_SAGDCYCLICHYSTPROBLEM_HH
#define DUMUX_SAGDCYCLICHYSTPROBLEM_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include "spatialparams.hh"
namespace Dumux {
/*!
* \brief Non-isothermal SAGD problem
*/
template <class TypeTag>
class SagdCyclicHystProblem;
namespace Properties {
// Create new type tags
namespace TTag {
struct SagdTypeTag { using InheritsFrom = std::tuple<ThreePWaterOilNI>; };
struct ThreePWaterOilSagdCyclicHystBoxTypeTag { using InheritsFrom = std::tuple<BoxModel, SagdTypeTag>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::SagdTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::SagdTypeTag> { using type = Dumux::SagdCyclicHystProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::SagdTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = SagdSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::SagdTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = FluidSystems::H2OHeavyOil<Scalar>;
};
template<class TypeTag>
struct OnlyGasPhaseCanDisappear<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
template<class TypeTag>
struct UseMoles<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
// Set the fluid system
template<class TypeTag>
struct SolidSystem<TypeTag, TTag::SagdTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using InertComponent = Components::Constant<1, Scalar>;
using type = SolidSystems::InertSolidPhase<Scalar, InertComponent>;
};
} // end namespace Properties
/*!
* \brief Non-isothermal 3pwateroil problem
*
......@@ -367,6 +302,7 @@ private:
std::ofstream massBalance;
};
} //end namespace
#endif
// -*- 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 vesion. *
* *
* 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 Non-isothermal SAGD properties file
*/
#ifndef DUMUX_SAGDCYCLICHYSTPROPERTIES_HH
#define DUMUX_SAGDCYCLICHYSTPROPERTIES_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include <dumux/material/solidsystems/1csolid.hh>
#include <dumux/material/components/constant.hh>
#include "spatialparams.hh"
#include "problem.hh"
namespace Dumux::Properties {
// Create new type tags
namespace TTag {
struct SagdTypeTag { using InheritsFrom = std::tuple<ThreePWaterOilNI>; };
struct ThreePWaterOilSagdCyclicHystBoxTypeTag { using InheritsFrom = std::tuple<BoxModel, SagdTypeTag>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::SagdTypeTag> { using type = Dune::YaspGrid<2>; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::SagdTypeTag> { using type = Dumux::SagdCyclicHystProblem<TypeTag>; };
// Set the spatial parameters
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::SagdTypeTag>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using type = SagdSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::SagdTypeTag>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = FluidSystems::H2OHeavyOil<Scalar>;
};
template<class TypeTag>
struct OnlyGasPhaseCanDisappear<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
template<class TypeTag>
struct UseMoles<TypeTag, TTag::SagdTypeTag> { static constexpr bool value = true; };
// Set the fluid system
template<class TypeTag>
struct SolidSystem<TypeTag, TTag::SagdTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using InertComponent = Components::Constant<1, Scalar>;
using type = SolidSystems::InertSolidPhase<Scalar, InertComponent>;
};
} // end namespace Dumux::Properties
#endif
......@@ -46,7 +46,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
......
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