Skip to content
GitLab
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-lecture
Commits
a7d84e20
Commit
a7d84e20
authored
May 27, 2020
by
Maziar Veyskarami
Committed by
Timo Koch
Jun 25, 2020
Browse files
[lec-mm][buckleyleverett] move properties to properties header file
parent
8b712be2
Changes
4
Hide whitespace changes
Inline
Side-by-side
lecture/mm/buckleyleverett/CMakeLists.txt
View file @
a7d84e20
...
...
@@ -12,6 +12,7 @@ dune_add_test(NAME buckleyleverettexercise
install
(
FILES
buckleyleverettanalyticsolution.hh
buckleyleverettproblem.hh
buckleyleverettproperties.hh
buckleyleverettspatialparams.hh
cubegridcreatorbuckleyleverett.hh
pseudoh2o.hh
...
...
lecture/mm/buckleyleverett/buckleyleverettexercise.cc
View file @
a7d84e20
...
...
@@ -22,7 +22,7 @@
* \brief DOC ME!
*/
#include
"config.h"
#include
"buckleyleverettpro
blem
.hh"
#include
"buckleyleverettpro
perties
.hh"
#include
<dumux/common/start.hh>
#include
<dumux/common/properties.hh>
...
...
lecture/mm/buckleyleverett/buckleyleverettproblem.hh
View file @
a7d84e20
...
...
@@ -20,64 +20,20 @@
#define DUMUX_LECTURE_MM_BUCKLEYLEVERETT_BUCKLEYLEVERETTPROBLEM_HH
#include
<dune/common/exceptions.hh>
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
#include
<dumux/material/fluidsystems/2pimmiscible.hh>
#include
<dumux/common/parameters.hh>
#include
<dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh>
#include
<dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh>
#include
<dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh>
#include
<dumux/porousmediumflow/2p/sequential/impes/problem.hh>
#include
"buckleyleverettanalyticsolution.hh"
#include
<lecture/common/viplaboutput.hh>
//pseudo-oil and h2o have to be used to make viscosity and density input parameters
#include
"pseudooil.hh"
#include
"pseudoh2o.hh"
#include
"buckleyleverettspatialparams.hh"
#include
"buckleyleverettanalyticsolution.hh"
#include
<lecture/common/viplaboutput.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
class
BuckleyLeverettProblem
;
//////////
// Specify the properties
//////////
namespace
Properties
{
// Create new type tags
namespace
TTag
{
struct
BuckleyLeverettProblemTypeTag
{
using
InheritsFrom
=
std
::
tuple
<
BuckleyLeverettSpatialParamsTypeTag
,
IMPESTwoP
,
FVTransportTwoP
,
FVPressureTwoP
>
;
};
}
// end namespace TTag
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
type
=
BuckleyLeverettProblem
<
TypeTag
>
;
};
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
WettingPhase
=
FluidSystems
::
OnePLiquid
<
Scalar
,
PseudoOil
<
Scalar
>
>
;
using
NonwettingPhase
=
FluidSystems
::
OnePLiquid
<
Scalar
,
PseudoH2O
<
Scalar
>
>
;
using
type
=
FluidSystems
::
TwoPImmiscible
<
Scalar
,
WettingPhase
,
NonwettingPhase
>
;
};
template
<
class
TypeTag
>
struct
EvalCflFluxFunction
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
type
=
EvalCflFluxCoats
<
TypeTag
>
;
};
template
<
class
TypeTag
>
struct
Formulation
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
static
constexpr
int
value
=
SequentialTwoPCommonIndices
::
pwsw
;
};
}
// end namespace Properties
template
<
typename
TypeTag
>
class
BuckleyLeverettProblem
:
public
IMPESProblem2P
<
TypeTag
>
{
...
...
lecture/mm/buckleyleverett/buckleyleverettproperties.hh
0 → 100644
View file @
a7d84e20
// -*- 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/>. *
*****************************************************************************/
#ifndef DUMUX_LECTURE_MM_BUCKLEYLEVERETT_BUCKLEYLEVERETTPROPERTIES_HH
#define DUMUX_LECTURE_MM_BUCKLEYLEVERETT_BUCKLEYLEVERETTPROPERTIES_HH
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
#include
<dumux/material/fluidsystems/2pimmiscible.hh>
#include
<dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh>
#include
<dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh>
#include
<dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh>
//pseudo-oil and h2o have to be used to make viscosity and density input parameters
#include
"pseudooil.hh"
#include
"pseudoh2o.hh"
#include
"buckleyleverettspatialparams.hh"
//the problem file
#include
"buckleyleverettproblem.hh"
//////////
// Specify the properties
//////////
namespace
Dumux
::
Properties
{
// Create new type tags
namespace
TTag
{
struct
BuckleyLeverettProblemTypeTag
{
using
InheritsFrom
=
std
::
tuple
<
BuckleyLeverettSpatialParamsTypeTag
,
IMPESTwoP
,
FVTransportTwoP
,
FVPressureTwoP
>
;
};
}
// end namespace TTag
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
type
=
BuckleyLeverettProblem
<
TypeTag
>
;
};
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
WettingPhase
=
FluidSystems
::
OnePLiquid
<
Scalar
,
PseudoOil
<
Scalar
>
>
;
using
NonwettingPhase
=
FluidSystems
::
OnePLiquid
<
Scalar
,
PseudoH2O
<
Scalar
>
>
;
using
type
=
FluidSystems
::
TwoPImmiscible
<
Scalar
,
WettingPhase
,
NonwettingPhase
>
;
};
template
<
class
TypeTag
>
struct
EvalCflFluxFunction
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
using
type
=
EvalCflFluxCoats
<
TypeTag
>
;
};
template
<
class
TypeTag
>
struct
Formulation
<
TypeTag
,
TTag
::
BuckleyLeverettProblemTypeTag
>
{
static
constexpr
int
value
=
SequentialTwoPCommonIndices
::
pwsw
;
};
}
// end namespace Dumux::Properties
#endif // DUMUX_LECTURE_MM_BUCKLEYLEVERETT_BUCKLEYLEVERETTPROPERTIES_HH
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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