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
Merge requests
!3377
[swe] Implement viscosity interface in volume variables
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
[swe] Implement viscosity interface in volume variables
feature/swe-volvars-viscosity-interface
into
master
Overview
1
Commits
2
Pipelines
2
Changes
1
All threads resolved!
Hide all comments
Merged
Timo Koch
requested to merge
feature/swe-volvars-viscosity-interface
into
master
2 years ago
Overview
1
Commits
2
Pipelines
2
Changes
1
All threads resolved!
Hide all comments
Expand
0
0
Merge request reports
Compare
master
version 1
80026e02
2 years ago
master (base)
and
latest version
latest version
1c7d4856
2 commits,
2 years ago
version 1
80026e02
1 commit,
2 years ago
1 file
+
13
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
dumux/freeflow/shallowwater/volumevariables.hh
+
13
−
2
Options
@@ -93,8 +93,7 @@ public:
}
/*!
* \brief Return the fluid density
*
* \brief Returns the mass density \f$\mathrm{[kg/m^3]}\f$ of the fluid
*/
Scalar
density
(
int
phaseIdx
=
0
)
const
{
@@ -104,7 +103,19 @@ public:
// call with hard-coded sensible default values for water/river applications for now
return
FluidSystem
::
density
(
283.15
,
1e5
);
}
/*!
* \brief Return the dynamic viscosity \f$\mathrm{[Pa s]}\f$ of the fluid
*/
Scalar
viscosity
(
int
phaseIdx
=
0
)
const
{
static_assert
(
FluidSystem
::
viscosityIsConstant
(
0
),
"The shallow water model assumes fluids with constant viscosity"
);
// call with hard-coded sensible default values for water/river applications for now
return
FluidSystem
::
viscosity
(
283.15
,
1e5
);
}
private
:
Loading