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
Commits
92bc8ea8
Commit
92bc8ea8
authored
Feb 27, 2021
by
Timo Koch
Browse files
Merge branch 'feature/separate-properties-1pnc' into 'master'
[test][1pnc] Separate properties into their own header See merge request
!2488
parents
8ca291c8
a8a43c79
Changes
22
Hide whitespace changes
Inline
Side-by-side
test/porenetwork/1pnc/properties.hh
View file @
92bc8ea8
...
...
@@ -24,7 +24,8 @@
#ifndef DUMUX_PNM1P2C_PROPERTIES_HH
#define DUMUX_PNM1P2C_PROPERTIES_HH
// Pore-network model
#include
<dune/foamgrid/foamgrid.hh>
#include
<dumux/porenetwork/1pnc/model.hh>
#include
<dumux/common/properties.hh>
...
...
@@ -32,7 +33,6 @@
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
// the problem
#include
"problem.hh"
//////////
...
...
test/porousmediumflow/1pnc/1p2c/isothermal/main.cc
View file @
92bc8ea8
...
...
@@ -46,7 +46,7 @@
#include
<dumux/io/vtkoutputmodule.hh>
#include
<dumux/io/grid/gridmanager.hh>
#include
"pro
blem
.hh"
#include
"pro
perties
.hh"
int
main
(
int
argc
,
char
**
argv
)
{
...
...
test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh
View file @
92bc8ea8
...
...
@@ -26,78 +26,15 @@
#ifndef DUMUX_1P2C_TEST_PROBLEM_HH
#define DUMUX_1P2C_TEST_PROBLEM_HH
#if HAVE_UG
#include
<dune/grid/uggrid.hh>
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/common/parameters.hh>
#include
<dumux/common/math.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/discretization/ccmpfa.hh>
#include
<dumux/discretization/box.hh>
#include
<dumux/discretization/evalsolution.hh>
#include
<dumux/discretization/evalgradients.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
"../spatialparams.hh"
namespace
Dumux
{
template
<
class
TypeTag
>
class
OnePTwoCTestProblem
;
namespace
Properties
{
// Create new type tags
namespace
TTag
{
struct
OnePTwoCTest
{
using
InheritsFrom
=
std
::
tuple
<
OnePNC
>
;
};
struct
OnePTwoCTestBox
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCTest
,
BoxModel
>
;
};
struct
OnePTwoCTestCCTpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCTest
,
CCTpfaModel
>
;
};
struct
OnePTwoCTestCCMpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCTest
,
CCMpfaModel
>
;
};
}
// end namespace TTag
// Set the grid type
#if HAVE_UG
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
type
=
Dune
::
UGGrid
<
2
>
;
};
#else
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
#endif
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
type
=
OnePTwoCTestProblem
<
TypeTag
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
H2ON2
=
FluidSystems
::
H2ON2
<
Scalar
,
FluidSystems
::
H2ON2DefaultPolicy
<
/*simplified=*/
true
>>
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2ON2
,
H2ON2
::
liquidPhaseIdx
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
OnePNCTestSpatialParams
<
GridGeometry
,
Scalar
>
;
};
// Define whether mole(true) or mass (false) fractions are used
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
static
constexpr
bool
value
=
true
;
};
}
/*!
* \ingroup OnePNCTests
* \brief Definition of a problem for the 1pnc problem:
...
...
test/porousmediumflow/1pnc/1p2c/isothermal/properties.hh
0 → 100644
View file @
92bc8ea8
// -*- 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 3 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
* \ingroup OnePNCTests
* \brief Definition of a problem for the 1pnc problem:
* Component transport of nitrogen dissolved in the water phase.
*/
#ifndef DUMUX_1P2C_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P2C_TEST_PROBLEM_PROPERTIES_HH
#if HAVE_UG
#include
<dune/grid/uggrid.hh>
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/math.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/discretization/ccmpfa.hh>
#include
<dumux/discretization/box.hh>
#include
<dumux/discretization/evalsolution.hh>
#include
<dumux/discretization/evalgradients.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
"problem.hh"
#include
"../spatialparams.hh"
namespace
Dumux
::
Properties
{
// Create new type tags
namespace
TTag
{
struct
OnePTwoCTest
{
using
InheritsFrom
=
std
::
tuple
<
OnePNC
>
;
};
struct
OnePTwoCTestBox
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCTest
,
BoxModel
>
;
};
struct
OnePTwoCTestCCTpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCTest
,
CCTpfaModel
>
;
};
struct
OnePTwoCTestCCMpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCTest
,
CCMpfaModel
>
;
};
}
// end namespace TTag
// Set the grid type
#if HAVE_UG
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
type
=
Dune
::
UGGrid
<
2
>
;
};
#else
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
#endif
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
type
=
OnePTwoCTestProblem
<
TypeTag
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
H2ON2
=
FluidSystems
::
H2ON2
<
Scalar
,
FluidSystems
::
H2ON2DefaultPolicy
<
/*simplified=*/
true
>>
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2ON2
,
H2ON2
::
liquidPhaseIdx
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
OnePNCTestSpatialParams
<
GridGeometry
,
Scalar
>
;
};
// Define whether mole(true) or mass (false) fractions are used
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
OnePTwoCTest
>
{
static
constexpr
bool
value
=
true
;
};
}
// end namespace Dumux::Properties
#endif
test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/main.cc
View file @
92bc8ea8
...
...
@@ -41,7 +41,7 @@
#include
<dumux/io/grid/gridmanager_yasp.hh>
#include
<dumux/io/container.hh>
#include
"pro
blem
.hh"
#include
"pro
perties
.hh"
int
main
(
int
argc
,
char
**
argv
)
{
...
...
test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/problem.hh
View file @
92bc8ea8
...
...
@@ -26,56 +26,14 @@
#ifndef DUMUX_SALTWATERINTRUSION_TEST_PROBLEM_HH
#define DUMUX_SALTWATERINTRUSION_TEST_PROBLEM_HH
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/common/parameters.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/discretization/box.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/material/fluidsystems/brine.hh>
#include
"../../spatialparams.hh"
namespace
Dumux
{
template
<
class
TypeTag
>
class
SaltWaterIntrusionTestProblem
;
namespace
Properties
{
// Create new type tags
namespace
TTag
{
struct
SaltWaterIntrusionTest
{
using
InheritsFrom
=
std
::
tuple
<
OnePNC
,
BoxModel
>
;
};
}
// end namespace TTag
// Use a structured yasp grid
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
type
=
SaltWaterIntrusionTestProblem
<
TypeTag
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
type
=
FluidSystems
::
Brine
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
OnePNCTestSpatialParams
<
GridGeometry
,
Scalar
>
;
};
// Use mass fractions to set salinity conveniently
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
static
constexpr
bool
value
=
false
;
};
}
// end namespace Properties
/*!
* \ingroup OnePNCTests
* \brief Definition of a problem involving salt water intrusion into a
...
...
test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/properties.hh
0 → 100644
View file @
92bc8ea8
// -*- 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 3 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
* \ingroup OnePNCTests
* \brief Definition of a problem involving salt
* water intrusion into a fresh water aquifer.
*/
#ifndef DUMUX_SALTWATERINTRUSION_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_SALTWATERINTRUSION_TEST_PROBLEM_PROPERTIES_HH
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/box.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/material/fluidsystems/brine.hh>
#include
"problem.hh"
#include
"../../spatialparams.hh"
namespace
Dumux
::
Properties
{
// Create new type tags
namespace
TTag
{
struct
SaltWaterIntrusionTest
{
using
InheritsFrom
=
std
::
tuple
<
OnePNC
,
BoxModel
>
;
};
}
// end namespace TTag
// Use a structured yasp grid
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
type
=
SaltWaterIntrusionTestProblem
<
TypeTag
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
type
=
FluidSystems
::
Brine
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
OnePNCTestSpatialParams
<
GridGeometry
,
Scalar
>
;
};
// Use mass fractions to set salinity conveniently
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
SaltWaterIntrusionTest
>
{
static
constexpr
bool
value
=
false
;
};
}
// end namespace Dumux::Properties
#endif
test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc
View file @
92bc8ea8
...
...
@@ -24,7 +24,7 @@
#include
<config.h>
#include
"pro
blem
.hh"
#include
"pro
perties
.hh"
#include
<ctime>
#include
<iostream>
...
...
test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh
View file @
92bc8ea8
...
...
@@ -26,75 +26,15 @@
#ifndef DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_HH
#define DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_HH
#if HAVE_UG
#include
<dune/grid/uggrid.hh>
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/common/parameters.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/discretization/elementsolution.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/discretization/ccmpfa.hh>
#include
<dumux/discretization/box.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
<dumux/material/components/h2o.hh>
#include
"../../spatialparams.hh"
namespace
Dumux
{
template
<
class
TypeTag
>
class
OnePTwoCNIConductionProblem
;
namespace
Properties
{
// Create new type tags
namespace
TTag
{
struct
OnePTwoCNIConduction
{
using
InheritsFrom
=
std
::
tuple
<
OnePNCNI
>
;
};
struct
OnePTwoCNIConductionCCTpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConduction
,
CCTpfaModel
>
;
};
struct
OnePTwoCNIConductionCCMpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConduction
,
CCMpfaModel
>
;
};
struct
OnePTwoCNIConductionBox
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConduction
,
BoxModel
>
;
};
}
// end namespace TTag
// Set the grid type
#if HAVE_UG
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
type
=
Dune
::
UGGrid
<
2
>
;
};
#else
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
#endif
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
type
=
OnePTwoCNIConductionProblem
<
TypeTag
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
H2ON2
=
FluidSystems
::
H2ON2
<
Scalar
,
FluidSystems
::
H2ON2DefaultPolicy
<
/*simplified=*/
true
>>
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2ON2
,
H2ON2
::
liquidPhaseIdx
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
OnePNCTestSpatialParams
<
GridGeometry
,
Scalar
>
;
};
// Define whether mole(true) or mass (false) fractions are used
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
static
constexpr
bool
value
=
true
;
};
}
/*!
* \ingroup OnePNCTests
* \brief Definition of a problem, for the 1pnc problem.
...
...
test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/properties.hh
0 → 100644
View file @
92bc8ea8
// -*- 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 3 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
* \ingroup OnePNCTests
* \brief Test for the OnePNCModel in combination with the NI model for a conduction problem.
*
* The simulation domain is a tube with an elevated temperature on the left hand side.
*/
#ifndef DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_PROPERTIES_HH
#if HAVE_UG
#include
<dune/grid/uggrid.hh>
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/elementsolution.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/discretization/ccmpfa.hh>
#include
<dumux/discretization/box.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
"problem.hh"
#include
"../../spatialparams.hh"
namespace
Dumux
::
Properties
{
// Create new type tags
namespace
TTag
{
struct
OnePTwoCNIConduction
{
using
InheritsFrom
=
std
::
tuple
<
OnePNCNI
>
;
};
struct
OnePTwoCNIConductionCCTpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConduction
,
CCTpfaModel
>
;
};
struct
OnePTwoCNIConductionCCMpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConduction
,
CCMpfaModel
>
;
};
struct
OnePTwoCNIConductionBox
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConduction
,
BoxModel
>
;
};
}
// end namespace TTag
// Set the grid type
#if HAVE_UG
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
type
=
Dune
::
UGGrid
<
2
>
;
};
#else
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
#endif
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
type
=
OnePTwoCNIConductionProblem
<
TypeTag
>
;
};
// Set fluid configuration
template
<
class
TypeTag
>
struct
FluidSystem
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
H2ON2
=
FluidSystems
::
H2ON2
<
Scalar
,
FluidSystems
::
H2ON2DefaultPolicy
<
/*simplified=*/
true
>>
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2ON2
,
H2ON2
::
liquidPhaseIdx
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
OnePNCTestSpatialParams
<
GridGeometry
,
Scalar
>
;
};
// Define whether mole(true) or mass (false) fractions are used
template
<
class
TypeTag
>
struct
UseMoles
<
TypeTag
,
TTag
::
OnePTwoCNIConduction
>
{
static
constexpr
bool
value
=
true
;
};
}
// End namespace properties
#endif
test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc
View file @
92bc8ea8
...
...
@@ -24,7 +24,7 @@
#include
<config.h>
#include
"pro
blem
.hh"
#include
"pro
perties
.hh"
#include
<ctime>
#include
<iostream>
...
...
test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/problem.hh
View file @
92bc8ea8
...
...
@@ -26,76 +26,15 @@
#ifndef DUMUX_1P2CNI_CONVECTION_TEST_PROBLEM_HH
#define DUMUX_1P2CNI_CONVECTION_TEST_PROBLEM_HH
#if HAVE_UG
#include
<dune/grid/uggrid.hh>
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/common/parameters.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/discretization/elementsolution.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/discretization/ccmpfa.hh>
#include
<dumux/discretization/box.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2on2.hh>
#include
<dumux/material/components/h2o.hh>
#include
"../../spatialparams.hh"
namespace
Dumux
{
template
<
class
TypeTag
>
class
OnePTwoCNIConvectionProblem
;
namespace
Properties
{
// Create new type tags
namespace
TTag
{
struct
OnePTwoCNIConvection
{
using
InheritsFrom
=
std
::
tuple
<
OnePNCNI
>
;
};
struct
OnePTwoCNIConvectionCCTpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConvection
,
CCTpfaModel
>
;
};
struct
OnePTwoCNIConvectionCCMpfa
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConvection
,
CCMpfaModel
>
;
};
struct
OnePTwoCNIConvectionBox
{
using
InheritsFrom
=
std
::
tuple
<
OnePTwoCNIConvection
,
BoxModel
>
;
};
}
// end namespace TTag
// Set the grid type