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
Snippets
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
Dmitri Naumov
ogs
Commits
9bda6a86
Commit
9bda6a86
authored
4 years ago
by
Dmitri Naumov
Browse files
Options
Downloads
Patches
Plain Diff
[PL/RM] Compute p_SR before rho_SR computation.
parent
be27733e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
+17
-6
17 additions, 6 deletions
ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
with
17 additions
and
6 deletions
ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
+
17
−
6
View file @
9bda6a86
...
@@ -657,15 +657,12 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
...
@@ -657,15 +657,12 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
variables
[
static_cast
<
int
>
(
MPL
::
Variable
::
temperature
)]
=
temperature
;
variables
[
static_cast
<
int
>
(
MPL
::
Variable
::
temperature
)]
=
temperature
;
auto
&
eps
=
_ip_data
[
ip
].
eps
;
auto
&
eps
=
_ip_data
[
ip
].
eps
;
auto
&
sigma_eff
=
_ip_data
[
ip
].
sigma_eff
;
auto
const
&
sigma_eff
=
_ip_data
[
ip
].
sigma_eff
;
auto
&
S_L
=
_ip_data
[
ip
].
saturation
;
auto
&
S_L
=
_ip_data
[
ip
].
saturation
;
auto
const
S_L_prev
=
_ip_data
[
ip
].
saturation_prev
;
auto
const
S_L_prev
=
_ip_data
[
ip
].
saturation_prev
;
auto
const
alpha
=
auto
const
alpha
=
solid_phase
.
property
(
MPL
::
PropertyType
::
biot_coefficient
)
solid_phase
.
property
(
MPL
::
PropertyType
::
biot_coefficient
)
.
template
value
<
double
>(
variables
,
x_position
,
t
,
dt
);
.
template
value
<
double
>(
variables
,
x_position
,
t
,
dt
);
auto
const
rho_SR
=
solid_phase
.
property
(
MPL
::
PropertyType
::
density
)
.
template
value
<
double
>(
variables
,
x_position
,
t
,
dt
);
auto
const
C_el
=
_ip_data
[
ip
].
computeElasticTangentStiffness
(
auto
const
C_el
=
_ip_data
[
ip
].
computeElasticTangentStiffness
(
t
,
x_position
,
dt
,
temperature
);
t
,
x_position
,
dt
,
temperature
);
...
@@ -803,6 +800,15 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
...
@@ -803,6 +800,15 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
displacement_index
,
displacement_index
)
displacement_index
,
displacement_index
)
.
noalias
()
+=
B
.
transpose
()
*
C
*
B
*
w
;
.
noalias
()
+=
B
.
transpose
()
*
C
*
B
*
w
;
auto
const
phi
=
_ip_data
[
ip
].
porosity
;
double
const
p_FR
=
-
chi_S_L
*
p_cap_ip
;
// p_SR
variables
[
static_cast
<
int
>
(
MPL
::
Variable
::
solid_grain_pressure
)]
=
p_FR
-
(
sigma_eff
+
sigma_sw
).
dot
(
identity2
)
/
(
3
*
(
1
-
phi
));
auto
const
rho_SR
=
solid_phase
.
property
(
MPL
::
PropertyType
::
density
)
.
template
value
<
double
>(
variables
,
x_position
,
t
,
dt
);
double
const
rho
=
rho_SR
*
(
1
-
porosity
)
+
S_L
*
porosity
*
rho_LR
;
double
const
rho
=
rho_SR
*
(
1
-
porosity
)
+
S_L
*
porosity
*
rho_LR
;
local_rhs
.
template
segment
<
displacement_size
>(
displacement_index
)
local_rhs
.
template
segment
<
displacement_size
>(
displacement_index
)
.
noalias
()
-=
(
B
.
transpose
()
*
(
sigma_eff
+
sigma_sw
)
-
.
noalias
()
-=
(
B
.
transpose
()
*
(
sigma_eff
+
sigma_sw
)
-
...
@@ -1535,10 +1541,15 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
...
@@ -1535,10 +1541,15 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
GlobalDimMatrixType
const
K_over_mu
=
k_rel
*
K_intrinsic
/
mu
;
GlobalDimMatrixType
const
K_over_mu
=
k_rel
*
K_intrinsic
/
mu
;
auto
const
phi
=
_ip_data
[
ip
].
porosity
;
auto
const
&
sigma_eff
=
_ip_data
[
ip
].
sigma_eff
;
double
const
p_FR
=
-
chi_S_L
*
p_cap_ip
;
// p_SR
variables
[
static_cast
<
int
>
(
MPL
::
Variable
::
solid_grain_pressure
)]
=
p_FR
-
(
sigma_eff
+
sigma_sw
).
dot
(
identity2
)
/
(
3
*
(
1
-
phi
));
auto
const
rho_SR
=
auto
const
rho_SR
=
solid_phase
.
property
(
MPL
::
PropertyType
::
density
)
solid_phase
.
property
(
MPL
::
PropertyType
::
density
)
.
template
value
<
double
>(
variables
,
x_position
,
t
,
dt
);
.
template
value
<
double
>(
variables
,
x_position
,
t
,
dt
);
auto
const
phi
=
_ip_data
[
ip
].
porosity
;
_ip_data
[
ip
].
dry_density_solid
=
(
1
-
phi
)
*
rho_SR
;
_ip_data
[
ip
].
dry_density_solid
=
(
1
-
phi
)
*
rho_SR
;
_ip_data
[
ip
].
dry_density_pellet_saturated
=
_ip_data
[
ip
].
dry_density_pellet_saturated
=
(
phi
-
phi_tr
)
*
rho_LR
+
(
1
-
phi
)
*
rho_SR
;
(
phi
-
phi_tr
)
*
rho_LR
+
(
1
-
phi
)
*
rho_SR
;
...
@@ -1561,7 +1572,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
...
@@ -1561,7 +1572,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
porosity_avg
+=
porosity_avg
+=
_ip_data
[
ip
].
porosity
;
// Note, this is not updated, because needs
_ip_data
[
ip
].
porosity
;
// Note, this is not updated, because needs
// xdot and dt to be passed.
// xdot and dt to be passed.
sigma_avg
+=
_ip_data
[
ip
].
sigma_eff
;
sigma_avg
+=
sigma_eff
;
}
}
saturation_avg
/=
n_integration_points
;
saturation_avg
/=
n_integration_points
;
porosity_avg
/=
n_integration_points
;
porosity_avg
/=
n_integration_points
;
...
...
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