Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
50117b37
Commit
50117b37
authored
6 years ago
by
Timo Koch
Browse files
Options
Downloads
Patches
Plain Diff
[1pncmin] assert that numPhases matches in model and fluidsystem
parent
67094b28
No related branches found
No related tags found
1 merge request
!1125
Fix/remove phase idx
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/porousmediumflow/1pncmin/model.hh
+7
-4
7 additions, 4 deletions
dumux/porousmediumflow/1pncmin/model.hh
with
7 additions
and
4 deletions
dumux/porousmediumflow/1pncmin/model.hh
+
7
−
4
View file @
50117b37
...
@@ -82,10 +82,8 @@ v = - \frac{k_{r}}{\mu} \mbox{\bf K}
...
@@ -82,10 +82,8 @@ v = - \frac{k_{r}}{\mu} \mbox{\bf K}
#include
<dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh>
#include
<dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh>
#include
<dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
#include
<dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
namespace
Dumux
namespace
Dumux
{
{
namespace
Properties
{
namespace
Properties
{
//////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
// Type tags
// Type tags
//////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
...
@@ -108,6 +106,11 @@ private:
...
@@ -108,6 +106,11 @@ private:
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
using
PT
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
)
::
PermeabilityType
;
using
PT
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
)
::
PermeabilityType
;
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
OnePNCVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
SSY
,
SST
,
PT
,
MT
>
;
using
Traits
=
OnePNCVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
SSY
,
SST
,
PT
,
MT
>
;
using
NonMinVolVars
=
OnePNCVolumeVariables
<
Traits
>
;
using
NonMinVolVars
=
OnePNCVolumeVariables
<
Traits
>
;
public:
public:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment