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
Commits
d3c9070a
Commit
d3c9070a
authored
Jul 01, 2020
by
Martin Schneider
Committed by
Timo Koch
Sep 30, 2020
Browse files
[disc][wmpfa] Add ccwmpfa as possible discretization method
parent
920c9e82
Changes
2
Hide whitespace changes
Inline
Side-by-side
dumux/discretization/cellcentered/elementsolution.hh
View file @
d3c9070a
...
...
@@ -112,7 +112,8 @@ private:
template
<
class
Element
,
class
SolutionVector
,
class
GridGeometry
>
auto
elementSolution
(
const
Element
&
element
,
const
SolutionVector
&
sol
,
const
GridGeometry
&
gg
)
->
std
::
enable_if_t
<
GridGeometry
::
discMethod
==
DiscretizationMethod
::
cctpfa
||
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
,
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
||
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccwmpfa
,
CCElementSolution
<
typename
GridGeometry
::
LocalView
,
std
::
decay_t
<
decltype
(
std
::
declval
<
SolutionVector
>
()[
0
])
>>
>
...
...
@@ -128,7 +129,8 @@ auto elementSolution(const Element& element, const SolutionVector& sol, const Gr
template
<
class
Element
,
class
ElementVolumeVariables
,
class
FVElementGeometry
>
auto
elementSolution
(
const
Element
&
element
,
const
ElementVolumeVariables
&
elemVolVars
,
const
FVElementGeometry
&
gg
)
->
std
::
enable_if_t
<
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
cctpfa
||
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
,
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
||
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccwmpfa
,
CCElementSolution
<
FVElementGeometry
,
typename
ElementVolumeVariables
::
VolumeVariables
::
PrimaryVariables
>>
{
using
PrimaryVariables
=
typename
ElementVolumeVariables
::
VolumeVariables
::
PrimaryVariables
;
...
...
@@ -143,7 +145,8 @@ auto elementSolution(const Element& element, const ElementVolumeVariables& elemV
template
<
class
FVElementGeometry
,
class
PrimaryVariables
>
auto
elementSolution
(
PrimaryVariables
&&
priVars
)
->
std
::
enable_if_t
<
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
cctpfa
||
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
,
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
||
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccwmpfa
,
CCElementSolution
<
FVElementGeometry
,
PrimaryVariables
>>
{
return
CCElementSolution
<
FVElementGeometry
,
PrimaryVariables
>
(
std
::
move
(
priVars
));
...
...
@@ -157,7 +160,8 @@ auto elementSolution(PrimaryVariables&& priVars)
template
<
class
FVElementGeometry
,
class
PrimaryVariables
>
auto
elementSolution
(
const
PrimaryVariables
&
priVars
)
->
std
::
enable_if_t
<
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
cctpfa
||
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
,
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccmpfa
||
FVElementGeometry
::
GridGeometry
::
discMethod
==
DiscretizationMethod
::
ccwmpfa
,
CCElementSolution
<
FVElementGeometry
,
PrimaryVariables
>>
{
return
CCElementSolution
<
FVElementGeometry
,
PrimaryVariables
>
(
priVars
);
...
...
dumux/discretization/method.hh
View file @
d3c9070a
...
...
@@ -35,7 +35,7 @@ namespace Dumux {
*/
enum
class
DiscretizationMethod
{
none
,
box
,
cctpfa
,
ccmpfa
,
staggered
,
fem
none
,
box
,
cctpfa
,
ccmpfa
,
ccwmpfa
,
staggered
,
fem
};
}
// end namespace Dumux
...
...
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