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
42601de8
Commit
42601de8
authored
6 years ago
by
Kilian Weishaupt
Browse files
Options
Downloads
Patches
Plain Diff
[3pwateroil][model] Add curly braces to switch statements
* fixes clang compiler error
parent
3cc4d975
Loading
Loading
1 merge request
!1188
Fix clang compiler errors
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/porousmediumflow/3pwateroil/model.hh
+12
-0
12 additions, 0 deletions
dumux/porousmediumflow/3pwateroil/model.hh
with
12 additions
and
0 deletions
dumux/porousmediumflow/3pwateroil/model.hh
+
12
−
0
View file @
42601de8
...
@@ -118,35 +118,47 @@ struct ThreePWaterOilModelTraits
...
@@ -118,35 +118,47 @@ struct ThreePWaterOilModelTraits
switch
(
state
)
switch
(
state
)
{
{
case
Indices
::
threePhases
:
case
Indices
::
threePhases
:
{
const
std
::
vector
<
std
::
string
>
s1
=
{
"p_g"
,
const
std
::
vector
<
std
::
string
>
s1
=
{
"p_g"
,
"S_w"
,
"S_w"
,
"S_n"
};
"S_n"
};
return
s1
[
pvIdx
];
return
s1
[
pvIdx
];
}
case
Indices
::
wPhaseOnly
:
case
Indices
::
wPhaseOnly
:
{
const
std
::
vector
<
std
::
string
>
s2
=
{
"p_w"
,
const
std
::
vector
<
std
::
string
>
s2
=
{
"p_w"
,
"T"
,
"T"
,
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
nCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
wPhaseIdx
)};
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
nCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
wPhaseIdx
)};
return
s2
[
pvIdx
];
return
s2
[
pvIdx
];
}
case
Indices
::
gnPhaseOnly
:
case
Indices
::
gnPhaseOnly
:
{
const
std
::
vector
<
std
::
string
>
s3
=
{
"p_g"
,
const
std
::
vector
<
std
::
string
>
s3
=
{
"p_g"
,
"S_n"
,
"S_n"
,
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
wCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
nPhaseIdx
)};
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
wCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
nPhaseIdx
)};
return
s3
[
pvIdx
];
return
s3
[
pvIdx
];
}
case
Indices
::
wnPhaseOnly
:
case
Indices
::
wnPhaseOnly
:
{
const
std
::
vector
<
std
::
string
>
s4
=
{
"p_w"
,
const
std
::
vector
<
std
::
string
>
s4
=
{
"p_w"
,
"T"
,
"T"
,
"S_n"
};
"S_n"
};
return
s4
[
pvIdx
];
return
s4
[
pvIdx
];
}
case
Indices
::
gPhaseOnly
:
case
Indices
::
gPhaseOnly
:
{
const
std
::
vector
<
std
::
string
>
s5
=
{
"p_g"
,
const
std
::
vector
<
std
::
string
>
s5
=
{
"p_g"
,
"T"
,
"T"
,
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
nCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
gPhaseIdx
)};
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
nCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
gPhaseIdx
)};
return
s5
[
pvIdx
];
return
s5
[
pvIdx
];
}
case
Indices
::
wgPhaseOnly
:
case
Indices
::
wgPhaseOnly
:
{
const
std
::
vector
<
std
::
string
>
s6
=
{
"p_g"
,
const
std
::
vector
<
std
::
string
>
s6
=
{
"p_g"
,
"S_w"
,
"S_w"
,
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
nCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
gPhaseIdx
)};
"x^"
+
FluidSystem
::
componentName
(
FluidSystem
::
nCompIdx
)
+
"_"
+
FluidSystem
::
phaseName
(
FluidSystem
::
gPhaseIdx
)};
return
s6
[
pvIdx
];
return
s6
[
pvIdx
];
}
}
}
}
}
};
};
...
...
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