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
385f01a4
Commit
385f01a4
authored
4 years ago
by
renchao.lu
Committed by
Dmitri Naumov
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[PL/CT] Rename as pore diffusion.
parent
b90fb0f7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ProcessLib/ComponentTransport/ComponentTransportFEM.h
+10
-10
10 additions, 10 deletions
ProcessLib/ComponentTransport/ComponentTransportFEM.h
ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+1
-1
1 addition, 1 deletion
...ib/ComponentTransport/CreateComponentTransportProcess.cpp
with
11 additions
and
11 deletions
ProcessLib/ComponentTransport/ComponentTransportFEM.h
+
10
−
10
View file @
385f01a4
...
@@ -479,11 +479,11 @@ public:
...
@@ -479,11 +479,11 @@ public:
.
property
(
MaterialPropertyLib
::
PropertyType
::
decay_rate
)
.
property
(
MaterialPropertyLib
::
PropertyType
::
decay_rate
)
.
template
value
<
double
>(
vars
,
pos
,
t
,
dt
);
.
template
value
<
double
>(
vars
,
pos
,
t
,
dt
);
auto
const
&
molecular
_diffusion_coefficient
=
auto
const
&
pore
_diffusion_coefficient
=
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
component
component
.
property
(
MaterialPropertyLib
::
PropertyType
::
.
property
(
molecular
_diffusion
)
MaterialPropertyLib
::
PropertyType
::
pore
_diffusion
)
.
value
(
vars
,
pos
,
t
,
dt
));
.
value
(
vars
,
pos
,
t
,
dt
));
auto
const
&
K
=
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
auto
const
&
K
=
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
...
@@ -518,7 +518,7 @@ public:
...
@@ -518,7 +518,7 @@ public:
GlobalDimMatrixType
const
hydrodynamic_dispersion
=
GlobalDimMatrixType
const
hydrodynamic_dispersion
=
velocity_magnitude
!=
0.0
velocity_magnitude
!=
0.0
?
GlobalDimMatrixType
(
porosity
*
?
GlobalDimMatrixType
(
porosity
*
molecular
_diffusion_coefficient
+
pore
_diffusion_coefficient
+
solute_dispersivity_transverse
*
solute_dispersivity_transverse
*
velocity_magnitude
*
I
+
velocity_magnitude
*
I
+
(
solute_dispersivity_longitudinal
-
(
solute_dispersivity_longitudinal
-
...
@@ -526,7 +526,7 @@ public:
...
@@ -526,7 +526,7 @@ public:
velocity_magnitude
*
velocity
*
velocity_magnitude
*
velocity
*
velocity
.
transpose
())
velocity
.
transpose
())
:
GlobalDimMatrixType
(
porosity
*
:
GlobalDimMatrixType
(
porosity
*
molecular
_diffusion_coefficient
+
pore
_diffusion_coefficient
+
solute_dispersivity_transverse
*
solute_dispersivity_transverse
*
velocity_magnitude
*
I
);
velocity_magnitude
*
I
);
const
double
R_times_phi
(
retardation_factor
*
porosity
);
const
double
R_times_phi
(
retardation_factor
*
porosity
);
...
@@ -807,11 +807,11 @@ public:
...
@@ -807,11 +807,11 @@ public:
.
property
(
MaterialPropertyLib
::
PropertyType
::
decay_rate
)
.
property
(
MaterialPropertyLib
::
PropertyType
::
decay_rate
)
.
template
value
<
double
>(
vars
,
pos
,
t
,
dt
);
.
template
value
<
double
>(
vars
,
pos
,
t
,
dt
);
auto
const
&
molecular
_diffusion_coefficient
=
auto
const
&
pore
_diffusion_coefficient
=
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
component
component
.
property
(
MaterialPropertyLib
::
PropertyType
::
.
property
(
molecular
_diffusion
)
MaterialPropertyLib
::
PropertyType
::
pore
_diffusion
)
.
value
(
vars
,
pos
,
t
,
dt
));
.
value
(
vars
,
pos
,
t
,
dt
));
auto
const
&
K
=
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
auto
const
&
K
=
MaterialPropertyLib
::
formEigenTensor
<
GlobalDim
>
(
...
@@ -833,7 +833,7 @@ public:
...
@@ -833,7 +833,7 @@ public:
GlobalDimMatrixType
const
hydrodynamic_dispersion
=
GlobalDimMatrixType
const
hydrodynamic_dispersion
=
velocity_magnitude
!=
0.0
velocity_magnitude
!=
0.0
?
GlobalDimMatrixType
(
porosity
*
?
GlobalDimMatrixType
(
porosity
*
molecular
_diffusion_coefficient
+
pore
_diffusion_coefficient
+
solute_dispersivity_transverse
*
solute_dispersivity_transverse
*
velocity_magnitude
*
I
+
velocity_magnitude
*
I
+
(
solute_dispersivity_longitudinal
-
(
solute_dispersivity_longitudinal
-
...
@@ -841,7 +841,7 @@ public:
...
@@ -841,7 +841,7 @@ public:
velocity_magnitude
*
velocity
*
velocity_magnitude
*
velocity
*
velocity
.
transpose
())
velocity
.
transpose
())
:
GlobalDimMatrixType
(
porosity
*
:
GlobalDimMatrixType
(
porosity
*
molecular
_diffusion_coefficient
+
pore
_diffusion_coefficient
+
solute_dispersivity_transverse
*
solute_dispersivity_transverse
*
velocity_magnitude
*
I
);
velocity_magnitude
*
I
);
...
...
This diff is collapsed.
Click to expand it.
ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+
1
−
1
View file @
385f01a4
...
@@ -41,7 +41,7 @@ void checkMPLProperties(
...
@@ -41,7 +41,7 @@ void checkMPLProperties(
std
::
array
const
required_properties_components
=
{
std
::
array
const
required_properties_components
=
{
MaterialPropertyLib
::
PropertyType
::
retardation_factor
,
MaterialPropertyLib
::
PropertyType
::
retardation_factor
,
MaterialPropertyLib
::
PropertyType
::
decay_rate
,
MaterialPropertyLib
::
PropertyType
::
decay_rate
,
MaterialPropertyLib
::
PropertyType
::
molecular
_diffusion
};
MaterialPropertyLib
::
PropertyType
::
pore
_diffusion
};
for
(
auto
const
&
element
:
mesh
.
getElements
())
for
(
auto
const
&
element
:
mesh
.
getElements
())
{
{
...
...
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