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
2e891e39
Commit
2e891e39
authored
Nov 29, 2017
by
Johannes Hommel
Browse files
[2pncmin][next] using "using" in poro-perm laws
parent
5631db1f
Changes
3
Hide whitespace changes
Inline
Side-by-side
dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh
View file @
2e891e39
...
...
@@ -69,7 +69,9 @@ public:
{
auto
initPoro
=
spatialParams
().
initialPorosity
(
element
,
scv
);
auto
poro
=
spatialParams
().
porosity
(
element
,
scv
,
elemSol
);
auto
factor
=
std
::
pow
((
1.0
-
initPoro
)
/
(
1.0
-
poro
),
2
)
*
std
::
pow
(
poro
/
initPoro
,
3
);
using
std
::
pow
;
auto
factor
=
pow
((
1.0
-
initPoro
)
/
(
1.0
-
poro
),
2
)
*
pow
(
poro
/
initPoro
,
3
);
return
applyFactorToPermeability_
(
spatialParams
().
initialPermeability
(
element
,
scv
),
factor
);
}
...
...
dumux/material/fluidmatrixinteractions/porosityprecipitation.hh
View file @
2e891e39
...
...
@@ -72,7 +72,9 @@ public:
sumPrecipitates
+=
priVars
[
numComponents
+
solidPhaseIdx
];
auto
minPoro
=
spatialParams_
().
minPorosity
(
element
,
scv
);
return
std
::
max
(
minPoro
,
spatialParams_
().
initialPorosity
(
element
,
scv
)
-
sumPrecipitates
);
using
std
::
max
;
return
max
(
minPoro
,
spatialParams_
().
initialPorosity
(
element
,
scv
)
-
sumPrecipitates
);
}
private:
...
...
dumux/material/fluidsystems/brineair.hh
View file @
2e891e39
...
...
@@ -290,7 +290,7 @@ public:
*/
static
Scalar
precipitateMolarDensity
(
int
phaseIdx
)
{
return
precipitateDensity
(
phaseIdx
)
/
molarMass
(
phaseIdx
);
return
precipitateDensity
(
phaseIdx
)
/
molarMass
(
phaseIdx
);
//TODO this only works for this specific case here with phaseIdx=compIdx!
}
/****************************************
...
...
Write
Preview
Supports
Markdown
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