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-course
Commits
f56b6ed3
Commit
f56b6ed3
authored
Apr 02, 2020
by
Ned Coltman
Browse files
[ex-runtime][propertiesheader] move properties to separate header
parent
d0d7949a
Changes
3
Hide whitespace changes
Inline
Side-by-side
exercises/exercise-runtimeparams/main.cc
View file @
f56b6ed3
...
...
@@ -47,8 +47,8 @@
#include
<dumux/io/vtkoutputmodule.hh>
#include
<dumux/io/grid/gridmanager.hh>
// The pro
blem
file, where
setup-specific boundary and initial cond
itions are de
fined.
#include
"pro
blem
.hh"
// The pro
perties
file, where
compile time defin
itions are
ma
de
#include
"pro
perties
.hh"
////////////////////////
// the main function
...
...
exercises/exercise-runtimeparams/problem.hh
View file @
f56b6ed3
...
...
@@ -25,53 +25,11 @@
#ifndef DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
#define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/porousmediumflow/2p/model.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
"spatialparams.hh"
namespace
Dumux
{
// forward declare problem
template
<
class
TypeTag
>
class
InjectionProblem2P
;
namespace
Properties
{
// define the TypeTag for this problem with a cell-centered two-point flux approximation spatial discretization.
// Create new type tags
namespace
TTag
{
struct
Injection2p
{
using
InheritsFrom
=
std
::
tuple
<
TwoP
>
;
};
struct
Injection2pCC
{
using
InheritsFrom
=
std
::
tuple
<
Injection2p
,
CCTpfaModel
>
;
};
}
// end namespace TTag
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
Injection2p
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
Injection2p
>
{
using
type
=
InjectionProblem2P
<
TypeTag
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
Injection2p
>
{
private:
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
public:
using
type
=
InjectionSpatialParams
<
FVGridGeometry
,
Scalar
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
Injection2p
>
{
using
type
=
FluidSystems
::
H2ON2
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
,
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplifiedRelations=*/
true
>
>
;
};
}
// end namespace Properties
/*!
* \ingroup TwoPModel
* \ingroup ImplicitTestProblems
...
...
@@ -229,7 +187,6 @@ public:
// \}
/*!
* \name Volume terms
*/
...
...
exercises/exercise-runtimeparams/properties.hh
0 → 100644
View file @
f56b6ed3
// -*- 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 two-phase porousmediumflow properties file for exercise runtime parameters
*/
#ifndef DUMUX_EXRUNTIMEPARAMS_PROPERTIES_HH
#define DUMUX_EXRUNTIMEPARAMS_PROPERTIES_HH
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/porousmediumflow/2p/model.hh>
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
"spatialparams.hh"
#include
"problem.hh"
namespace
Dumux
::
Properties
{
// Define the TypeTag for this problem
// with a cell-centered two-point flux approximation spatial discretization.
namespace
TTag
{
struct
Injection2p
{
using
InheritsFrom
=
std
::
tuple
<
TwoP
>
;
};
struct
Injection2pCC
{
using
InheritsFrom
=
std
::
tuple
<
Injection2p
,
CCTpfaModel
>
;
};
}
// end namespace TTag
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
Injection2p
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
Injection2p
>
{
using
type
=
InjectionProblem2P
<
TypeTag
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
Injection2p
>
{
private:
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
public:
using
type
=
InjectionSpatialParams
<
FVGridGeometry
,
Scalar
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
Injection2p
>
{
using
type
=
FluidSystems
::
H2ON2
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
,
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplifiedRelations=*/
true
>
>
;
};
}
//end namespace Dumux::Properties
#endif
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