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
9e11f5f8
Commit
9e11f5f8
authored
Apr 06, 2020
by
Maziar Veyskarami
Committed by
Ned Coltman
Apr 06, 2020
Browse files
[ex-coupling-solution][turbulence][propertiesheader] move properties to property header
parent
deee05d9
Changes
5
Hide whitespace changes
Inline
Side-by-side
exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
View file @
9e11f5f8
...
...
@@ -23,6 +23,8 @@
#ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
// TODO: dumux-course-task 3.A
// Include headers for turbulence problem (rans) here.
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
...
...
exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
View file @
9e11f5f8
...
...
@@ -23,67 +23,15 @@
#ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
#if EXNUMBER >= 1
#include <dumux/freeflow/compositional/zeroeqncmodel.hh>
#include <dumux/freeflow/rans/problem.hh>
#else
#include <dumux/freeflow/compositional/navierstokesncmodel.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
#endif
namespace
Dumux
{
template
<
class
TypeTag
>
class
FreeFlowSubProblem
;
namespace
Properties
{
// Create new type tags
namespace
TTag
{
#if EXNUMBER >= 1
struct
StokesZeroEq
{
using
InheritsFrom
=
std
::
tuple
<
ZeroEqNCNI
,
StaggeredFreeFlowModel
>
;
};
#else
struct
StokesZeroEq
{
using
InheritsFrom
=
std
::
tuple
<
NavierStokesNCNI
,
StaggeredFreeFlowModel
>
;
};
#endif
}
// end namespace TTag
#include <dumux/common/properties.hh>
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
type
=
Dune
::
YaspGrid
<
2
,
Dune
::
TensorProductCoordinates
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
,
2
>
>
;
};
// The fluid system
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
H2OAir
=
FluidSystems
::
H2OAir
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>>
;
static
constexpr
auto
phaseIdx
=
H2OAir
::
gasPhaseIdx
;
// simulate the air phase
using
type
=
FluidSystems
::
OnePAdapter
<
H2OAir
,
phaseIdx
>
;
};
template
<
class
TypeTag
>
struct
ReplaceCompEqIdx
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
int
value
=
3
;
};
// Use formulation based on mass fractions
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
type
=
Dumux
::
FreeFlowSubProblem
<
TypeTag
>
;
};
template
<
class
TypeTag
>
struct
EnableGridGeometryCache
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
template
<
class
TypeTag
>
struct
EnableGridFluxVariablesCache
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
template
<
class
TypeTag
>
struct
EnableGridVolumeVariablesCache
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
}
namespace
Dumux
{
/*!
* \brief The free-flow sub problem
...
...
@@ -418,6 +366,7 @@ private:
DiffusionCoefficientAveragingType
diffCoeffAvgType_
;
};
}
//end namespace
#endif // DUMUX_STOKES1P2C_SUBPROBLEM_HH
}
//end namespace Dumux
#endif // DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
View file @
9e11f5f8
...
...
@@ -49,28 +49,7 @@
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include "porousmediumsubproblem.hh"
#include "freeflowsubproblem.hh"
namespace
Dumux
{
namespace
Properties
{
template
<
class
TypeTag
>
struct
CouplingManager
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
Traits
=
StaggeredMultiDomainTraits
<
TypeTag
,
TypeTag
,
Properties
::
TTag
::
DarcyTwoPTwoCNI
>
;
using
type
=
Dumux
::
StokesDarcyCouplingManager
<
Traits
>
;
};
template
<
class
TypeTag
>
struct
CouplingManager
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
Traits
=
StaggeredMultiDomainTraits
<
Properties
::
TTag
::
StokesZeroEq
,
Properties
::
TTag
::
StokesZeroEq
,
TypeTag
>
;
using
type
=
Dumux
::
StokesDarcyCouplingManager
<
Traits
>
;
};
}
// end namespace Properties
}
// end namespace Dumux
#include "properties.hh"
int
main
(
int
argc
,
char
**
argv
)
try
{
...
...
exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
View file @
9e11f5f8
...
...
@@ -24,59 +24,10 @@
#ifndef DUMUX_DARCY2P2C_SUBPROBLEM_HH
#define DUMUX_DARCY2P2C_SUBPROBLEM_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p2c/model.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include "../2pspatialparams.hh"
namespace
Dumux
{
template
<
class
TypeTag
>
class
PorousMediumSubProblem
;
namespace
Properties
{
// Create new type tags
namespace
TTag
{
struct
DarcyTwoPTwoCNI
{
using
InheritsFrom
=
std
::
tuple
<
TwoPTwoCNI
,
CCTpfaModel
>
;
};
}
// end namespace TTag
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
Dumux
::
PorousMediumSubProblem
<
TypeTag
>
;
};
// the fluid system
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
FluidSystems
::
H2OAir
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>>
;
};
//! Set the default formulation to pw-Sn: This can be over written in the problem.
template
<
class
TypeTag
>
struct
Formulation
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
static
constexpr
auto
value
=
TwoPFormulation
::
p1s0
;
};
// The gas component balance (air) is replaced by the total mass balance
template
<
class
TypeTag
>
struct
ReplaceCompEqIdx
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
static
constexpr
int
value
=
3
;
};
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
Dune
::
YaspGrid
<
2
,
Dune
::
TensorProductCoordinates
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
,
2
>
>
;
};
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
static
constexpr
bool
value
=
true
;
};
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
TwoPSpatialParams
<
GetPropType
<
TypeTag
,
GridGeometry
>
,
GetPropType
<
TypeTag
,
Scalar
>>
;
};
}
// end namespace Properties
namespace
Dumux
{
/*!
* \brief The porous medium sub problem
...
...
@@ -335,6 +286,6 @@ private:
std
::
shared_ptr
<
CouplingManager
>
couplingManager_
;
DiffusionCoefficientAveragingType
diffCoeffAvgType_
;
};
}
//end namespace
}
//end namespace
Dumux
#endif //DUMUX_DARCY2P2C_SUBPROBLEM_HH
exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
0 → 100644
View file @
9e11f5f8
// -*- 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 coupled exercise properties file or the turbulent case.
*/
#ifndef DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_HH
#define DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_HH
// Both domains
#include <dune/grid/yaspgrid.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
// Porous medium flow domain
#include <dumux/porousmediumflow/2p2c/model.hh>
#include <dumux/discretization/cctpfa.hh>
#include "../2pspatialparams.hh"
#include"porousmediumsubproblem.hh"
// Free-flow domain
#include <dumux/discretization/staggered/freeflow/properties.hh>
#if EXNUMBER >= 1
#include <dumux/freeflow/compositional/zeroeqncmodel.hh>
#else
#include <dumux/freeflow/compositional/navierstokesncmodel.hh>
#endif
#include"freeflowsubproblem.hh"
namespace
Dumux
::
Properties
{
// Create new type tags
namespace
TTag
{
struct
DarcyTwoPTwoCNI
{
using
InheritsFrom
=
std
::
tuple
<
TwoPTwoCNI
,
CCTpfaModel
>
;
};
#if EXNUMBER >= 1
struct
StokesZeroEq
{
using
InheritsFrom
=
std
::
tuple
<
ZeroEqNCNI
,
StaggeredFreeFlowModel
>
;
};
#else
struct
StokesZeroEq
{
using
InheritsFrom
=
std
::
tuple
<
NavierStokesNCNI
,
StaggeredFreeFlowModel
>
;
};
#endif
}
// end namespace TTag
// Set the coupling manager
template
<
class
TypeTag
>
struct
CouplingManager
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
Traits
=
StaggeredMultiDomainTraits
<
TypeTag
,
TypeTag
,
Properties
::
TTag
::
DarcyTwoPTwoCNI
>
;
using
type
=
Dumux
::
StokesDarcyCouplingManager
<
Traits
>
;
};
template
<
class
TypeTag
>
struct
CouplingManager
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
Traits
=
StaggeredMultiDomainTraits
<
Properties
::
TTag
::
StokesZeroEq
,
Properties
::
TTag
::
StokesZeroEq
,
TypeTag
>
;
using
type
=
Dumux
::
StokesDarcyCouplingManager
<
Traits
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
type
=
Dumux
::
FreeFlowSubProblem
<
TypeTag
>
;
};
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
Dumux
::
PorousMediumSubProblem
<
TypeTag
>
;
};
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
type
=
Dune
::
YaspGrid
<
2
,
Dune
::
TensorProductCoordinates
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
,
2
>
>
;
};
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
Dune
::
YaspGrid
<
2
,
Dune
::
TensorProductCoordinates
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
,
2
>
>
;
};
// The fluid system
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
using
H2OAir
=
FluidSystems
::
H2OAir
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>>
;
static
constexpr
auto
phaseIdx
=
H2OAir
::
gasPhaseIdx
;
// simulate the air phase
using
type
=
FluidSystems
::
OnePAdapter
<
H2OAir
,
phaseIdx
>
;
};
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
FluidSystems
::
H2OAir
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>>
;
};
// The gas component balance (air) is replaced by the total mass balance
template
<
class
TypeTag
>
struct
ReplaceCompEqIdx
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
static
constexpr
int
value
=
3
;
};
template
<
class
TypeTag
>
struct
ReplaceCompEqIdx
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
int
value
=
3
;
};
// Use formulation based on mass fractions
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
static
constexpr
bool
value
=
true
;
};
//! Set the default formulation to pw-Sn: This can be over written in the problem.
template
<
class
TypeTag
>
struct
Formulation
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
static
constexpr
auto
value
=
TwoPFormulation
::
p1s0
;
};
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
DarcyTwoPTwoCNI
>
{
using
type
=
TwoPSpatialParams
<
GetPropType
<
TypeTag
,
GridGeometry
>
,
GetPropType
<
TypeTag
,
Scalar
>>
;
};
template
<
class
TypeTag
>
struct
EnableGridGeometryCache
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
template
<
class
TypeTag
>
struct
EnableGridFluxVariablesCache
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
template
<
class
TypeTag
>
struct
EnableGridVolumeVariablesCache
<
TypeTag
,
TTag
::
StokesZeroEq
>
{
static
constexpr
bool
value
=
true
;
};
}
//end namespace Dumux::Properties
#endif // DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_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