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
a97fb6db
Commit
a97fb6db
authored
6 years ago
by
Dennis Gläser
Browse files
Options
Downloads
Patches
Plain Diff
[inertsolidstate] cleanup
parent
05baf62e
No related branches found
No related tags found
1 merge request
!977
Cleanup/indentations
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/material/solidstates/inertsolidstate.hh
+18
-19
18 additions, 19 deletions
dumux/material/solidstates/inertsolidstate.hh
with
18 additions
and
19 deletions
dumux/material/solidstates/inertsolidstate.hh
+
18
−
19
View file @
a97fb6db
...
@@ -45,6 +45,10 @@ public:
...
@@ -45,6 +45,10 @@ public:
numInertComponents
=
SolidSystem
::
numInertComponents
,
numInertComponents
=
SolidSystem
::
numInertComponents
,
};
};
/*!
* \brief Allows compile-time evaluation of if the solid system
* is inert or takes part in any kind of reactions.
*/
static
constexpr
bool
isInert
()
static
constexpr
bool
isInert
()
{
{
static_assert
(
SolidSystem
::
isInert
(),
"Only inert solid systems are allowed with the InertSolidState"
);
static_assert
(
SolidSystem
::
isInert
(),
"Only inert solid systems are allowed with the InertSolidState"
);
...
@@ -72,19 +76,20 @@ public:
...
@@ -72,19 +76,20 @@ public:
return
porosity
;
return
porosity
;
}
}
/*!
//! The mass density of the solid phase in \f$\mathrm{[kg/m^3]}\f$
* \brief The mass density \f$\rho_\alpha\f$ of the fluid phase
Scalar
density
()
const
{
return
density_
;
}
* \f$\alpha\f$ in \f$\mathrm{[kg/m^3]}\f$
*/
//! The heat capacity of the solid phase in \f$\mathrm{[J/(kg*K)}\f$
Scalar
density
()
const
Scalar
heatCapacity
()
const
{
return
heatCapacity_
;
}
{
return
density_
;
}
Scalar
heatCapacity
()
const
//! The thermal conductivity of the solid phase in \f$\mathrm{[[W/(m*K)]}\f$
{
return
he
atCapac
ity_
;
}
Scalar
thermalConductivity
()
const
{
return
t
he
rmalConduciv
ity_
;
}
Scalar
thermalConductivity
()
const
//! The temperature of the solid phase in \f$\mathrm{[K]}\f$
{
return
thermalConducivity
_
;
}
Scalar
temperature
()
const
{
return
temperature
_
;
}
//! The volume fraction of a solid component within the solid phase
Scalar
volumeFraction
(
const
int
compIdx
)
const
{
return
volumeFraction_
[
compIdx
];
}
/*!
/*!
* \brief The molar density \f$\rho_{mol,\alpha}\f$
* \brief The molar density \f$\rho_{mol,\alpha}\f$
...
@@ -97,15 +102,6 @@ public:
...
@@ -97,15 +102,6 @@ public:
Scalar
molarDensity
()
const
Scalar
molarDensity
()
const
{
return
density_
/
averageMolarMass
();
}
{
return
density_
/
averageMolarMass
();
}
/*!
* \brief The temperature within the domain \f$\mathrm{[K]}\f$
*/
Scalar
temperature
()
const
{
return
temperature_
;
}
Scalar
volumeFraction
(
const
int
compIdx
)
const
{
return
volumeFraction_
[
compIdx
];
}
/*****************************************************
/*****************************************************
* Setter methods. Note that these are not part of the
* Setter methods. Note that these are not part of the
* generic InertSolidState interface but specific for each
* generic InertSolidState interface but specific for each
...
@@ -156,6 +152,9 @@ public:
...
@@ -156,6 +152,9 @@ public:
void
setHeatCapacity
(
Scalar
value
)
void
setHeatCapacity
(
Scalar
value
)
{
heatCapacity_
=
value
;
}
{
heatCapacity_
=
value
;
}
/*!
* \brief Set the volume fraction of a solid component
*/
void
setVolumeFraction
(
const
int
compIdx
,
Scalar
value
)
void
setVolumeFraction
(
const
int
compIdx
,
Scalar
value
)
{
volumeFraction_
[
compIdx
]
=
value
;
}
{
volumeFraction_
[
compIdx
]
=
value
;
}
...
...
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