Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Yuhao Liu
ogs
Commits
b90fb0f7
Commit
b90fb0f7
authored
4 years ago
by
renchao.lu
Committed by
Dmitri Naumov
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[MPL] Separate out pore diffusion.
parent
912c7ddd
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MaterialLib/MPL/PropertyType.h
+9
-1
9 additions, 1 deletion
MaterialLib/MPL/PropertyType.h
with
9 additions
and
1 deletion
MaterialLib/MPL/PropertyType.h
+
9
−
1
View file @
b90fb0f7
...
...
@@ -61,11 +61,14 @@ enum PropertyType : int
molar_mass
,
molar_volume
,
mole_fraction
,
///
used to compute the hydrodynamic dispersion tenso
r.
///
ion diffusivity in free wate
r.
molecular_diffusion
,
name
,
permeability
,
phase_velocity
,
/// ion diffusivity in the porous medium with account of the effect of
/// tortuosity and connectivity.
pore_diffusion
,
porosity
,
reference_density
,
reference_temperature
,
...
...
@@ -215,6 +218,10 @@ inline PropertyType convertStringToProperty(std::string const& inString)
{
return
PropertyType
::
permeability
;
}
if
(
boost
::
iequals
(
inString
,
"pore_diffusion"
))
{
return
PropertyType
::
pore_diffusion
;
}
if
(
boost
::
iequals
(
inString
,
"porosity"
))
{
return
PropertyType
::
porosity
;
...
...
@@ -354,6 +361,7 @@ static const std::array<std::string, PropertyType::number_of_properties>
"name"
,
"permeability"
,
"phase_velocity"
,
"pore_diffusion"
,
"porosity"
,
"reference_density"
,
"reference_temperature"
,
...
...
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