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
4a73ae99
Commit
4a73ae99
authored
1 year ago
by
Anna Mareike Kostelecky
Committed by
Timo Koch
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "Rename Parameter "GrainFouriersLaw.UseAdaptedVolumeForPyramid""
parent
9acfbfa7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3671
[dualnetwork] Rename Parameter "GrainFouriersLaw.UseAdaptedVolumeForPyramid" to "GrainFouriersLaw.UseVolumeEqualPyramid"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dumux/flux/porenetwork/grainfourierslaw.hh
+5
-2
5 additions, 2 deletions
dumux/flux/porenetwork/grainfourierslaw.hh
test/multidomain/dualnetwork/fourierslaw.hh
+3
-0
3 additions, 0 deletions
test/multidomain/dualnetwork/fourierslaw.hh
with
8 additions
and
2 deletions
dumux/flux/porenetwork/grainfourierslaw.hh
+
5
−
2
View file @
4a73ae99
...
...
@@ -50,6 +50,9 @@ struct TruncatedPyramidGrainFouriersLaw
auto
getPyramidBaseLengthFromVolume
=
[
&
](
const
Scalar
v
,
const
Scalar
h
)
{
// Using the formula for the volume of a pyramid frustum to calculate its base length:
// v = 1/3 h * (a^2 + a*b + b^2), where a is the base side length, b the top side length,
// h the height and v the volume of the frustum.
const
Scalar
b
=
topSideLength
;
using
std
::
sqrt
;
return
0.5
*
sqrt
(
3.0
)
*
sqrt
(
-
(
b
*
b
*
h
-
4.0
*
v
)
/
h
)
-
0.5
*
b
;
...
...
@@ -58,7 +61,7 @@ struct TruncatedPyramidGrainFouriersLaw
// the pyramid base length of the inside pore
const
Scalar
insideBaseSideLength
=
[
&
]()
{
static
const
bool
useAdaptedVolume
=
getParamFromGroup
<
bool
>
(
problem
.
paramGroup
(),
"
GrainFouriersLaw.UseAdapted
Volume
For
Pyramid"
,
false
);
static
const
bool
useAdaptedVolume
=
getParamFromGroup
<
bool
>
(
problem
.
paramGroup
(),
"
Problem.Use
Volume
Equal
Pyramid"
,
false
);
if
(
useAdaptedVolume
)
return
getPyramidBaseLengthFromVolume
(
0.5
*
insideVolVars
.
poreVolume
(),
insideHeight
);
...
...
@@ -69,7 +72,7 @@ struct TruncatedPyramidGrainFouriersLaw
// the pyramid base length of the outside pore
const
Scalar
outsideBaseSideLength
=
[
&
]()
{
static
const
bool
useAdaptedVolume
=
getParamFromGroup
<
bool
>
(
problem
.
paramGroup
(),
"
GrainFouriersLaw.UseAdapted
Volume
For
Pyramid"
,
false
);
static
const
bool
useAdaptedVolume
=
getParamFromGroup
<
bool
>
(
problem
.
paramGroup
(),
"
Problem.Use
Volume
Equal
Pyramid"
,
false
);
if
(
useAdaptedVolume
)
return
getPyramidBaseLengthFromVolume
(
0.5
*
outsideVolVars
.
poreVolume
(),
outsideHeight
);
...
...
This diff is collapsed.
Click to expand it.
test/multidomain/dualnetwork/fourierslaw.hh
+
3
−
0
View file @
4a73ae99
...
...
@@ -103,6 +103,9 @@ struct FluidOrGrainPyramidFouriersLaw
static
const
bool
realVolume
=
getParamFromGroup
<
bool
>
(
problem
.
paramGroup
(),
"Problem.UseVolumeEqualPyramid"
,
true
);
if
(
realVolume
)
{
// Using the formula for the volume of a pyramid frustum to calculate its base length and base area:
// v = 1/3 h * (a^2 + a*b + b^2), where a is the base side length, b the top side length,
// h the height and v the volume of the frustum .
using
std
::
sqrt
;
const
Scalar
vol
=
0.5
*
volVars
.
poreVolume
();
const
Scalar
baseLenTop
=
sqrt
(
pyramidFrustumTopArea
);
...
...
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