Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux-course
Commits
425ddbc0
Commit
425ddbc0
authored
Apr 03, 2020
by
Maziar Veyskarami
Committed by
Ned Coltman
Apr 06, 2020
Browse files
[ex-fluidsystem][propertiesheader] move properties to property header for 2p2c case
parent
8be418bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
exercises/exercise-fluidsystem/2p2cproblem.hh
View file @
425ddbc0
...
...
@@ -24,65 +24,11 @@
#ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
#define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
// The grid manager
#include <dune/grid/yaspgrid.hh>
// The numerical model
#include <dumux/porousmediumflow/2p2c/model.hh>
// The box discretization
#include <dumux/discretization/box.hh>
// The base porous media box problem
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
// Spatially dependent parameters
#include "spatialparams.hh"
// The fluid system that is created in this exercise
#include "fluidsystems/h2omycompressiblecomponent.hh"
namespace
Dumux
{
// Forward declaration of the problem class
template
<
class
TypeTag
>
class
ExerciseFluidsystemProblemTwoPTwoC
;
namespace
Properties
{
// Create a new type tag for the problem
// Create new type tags
namespace
TTag
{
struct
ExerciseFluidsystemTwoPTwoC
{
using
InheritsFrom
=
std
::
tuple
<
TwoPTwoC
,
BoxModel
>
;
};
}
// end namespace TTag
// Set the "Problem" property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
using
type
=
ExerciseFluidsystemProblemTwoPTwoC
<
TypeTag
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
private:
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
public:
using
type
=
ExerciseFluidsystemSpatialParams
<
FVGridGeometry
,
Scalar
>
;
};
// Set grid and the grid creator to be used
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// The fluid system property
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
private:
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
public:
using
type
=
FluidSystems
::
H2OMyCompressibleComponent
<
Scalar
>
;
};
}
namespace
Dumux
{
/*!
* \ingroup TwoPBoxModel
...
...
exercises/exercise-fluidsystem/2p2cproperties.hh
0 → 100644
View file @
425ddbc0
// -*- 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 The properties file for two phase-two component exercise-fluidsystem.
*/
#ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROPERTIES_HH
#define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROPERTIES_HH
// The grid manager
#include <dune/grid/yaspgrid.hh>
// The numerical model
#include <dumux/porousmediumflow/2p2c/model.hh>
// The box discretization
#include <dumux/discretization/box.hh>
// Spatially dependent parameters
#include "spatialparams.hh"
// The fluid system that is created in this exercise
#include "fluidsystems/h2omycompressiblecomponent.hh"
// The problem file, where setup-specific boundary and initial conditions are defined.
#include"2p2cproblem.hh"
namespace
Dumux
::
Properties
{
// Create a new type tag for the problem
// Create new type tags
namespace
TTag
{
struct
ExerciseFluidsystemTwoPTwoC
{
using
InheritsFrom
=
std
::
tuple
<
TwoPTwoC
,
BoxModel
>
;
};
}
// end namespace TTag
// Set the "Problem" property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
using
type
=
ExerciseFluidsystemProblemTwoPTwoC
<
TypeTag
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
private:
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
public:
using
type
=
ExerciseFluidsystemSpatialParams
<
FVGridGeometry
,
Scalar
>
;
};
// Set grid and the grid creator to be used
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// The fluid system property
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
ExerciseFluidsystemTwoPTwoC
>
{
private:
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
public:
using
type
=
FluidSystems
::
H2OMyCompressibleComponent
<
Scalar
>
;
};
}
// end namespace Dumux::Properties
#endif
exercises/exercise-fluidsystem/main.cc
View file @
425ddbc0
...
...
@@ -33,7 +33,7 @@
#include <dune/istl/io.hh>
#include "2pproperties.hh"
#include "2p2cpro
blem
.hh"
#include "2p2cpro
perties
.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment