Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
DOUAR WSMP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
HUGG
DOUAR WSMP
Commits
720c2a2c
Commit
720c2a2c
authored
12 years ago
by
Dave Whipp
Browse files
Options
Downloads
Patches
Plain Diff
Fixed typos
parent
e1566909
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/read_input_file.f90
+2
-2
2 additions, 2 deletions
src/read_input_file.f90
src/update_cloud_structure.f90
+1
-1
1 addition, 1 deletion
src/update_cloud_structure.f90
src/vrm.f90
+6
-4
6 additions, 4 deletions
src/vrm.f90
with
9 additions
and
7 deletions
src/read_input_file.f90
+
2
−
2
View file @
720c2a2c
...
@@ -250,11 +250,11 @@ do i=0,params%nmat
...
@@ -250,11 +250,11 @@ do i=0,params%nmat
mat
(
i
)
%
plasticity_ss_type_coh
=
'tot_strain'
mat
(
i
)
%
plasticity_ss_type_coh
=
'tot_strain'
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'plasticity_ss_type_coh'
//
cm
(
il
:
3
),
mat
(
i
)
%
plasticity_ss_type_coh
,
ires
)
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'plasticity_ss_type_coh'
//
cm
(
il
:
3
),
mat
(
i
)
%
plasticity_ss_type_coh
,
ires
)
call
mpi_bcast
(
mat
(
i
)
%
plasticity_ss_type_coh
,
1
2
,
mpi_character
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
mat
(
i
)
%
plasticity_ss_type_coh
,
1
6
,
mpi_character
,
0
,
mpi_comm_world
,
ierr
)
mat
(
i
)
%
plasticity_ss_type_phi
=
'tot_strain'
mat
(
i
)
%
plasticity_ss_type_phi
=
'tot_strain'
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'plasticity_ss_type_phi'
//
cm
(
il
:
3
),
mat
(
i
)
%
plasticity_ss_type_phi
,
ires
)
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'plasticity_ss_type_phi'
//
cm
(
il
:
3
),
mat
(
i
)
%
plasticity_ss_type_phi
,
ires
)
call
mpi_bcast
(
mat
(
i
)
%
plasticity_ss_type_phi
,
1
2
,
mpi_character
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
mat
(
i
)
%
plasticity_ss_type_phi
,
1
6
,
mpi_character
,
0
,
mpi_comm_world
,
ierr
)
mat
(
i
)
%
plasticity_parameters
=
0.d0
mat
(
i
)
%
plasticity_parameters
=
0.d0
mat
(
i
)
%
plasticity_parameters
(
3
)
=
-1.d0
mat
(
i
)
%
plasticity_parameters
(
3
)
=
-1.d0
...
...
This diff is collapsed.
Click to expand it.
src/update_cloud_structure.f90
+
1
−
1
View file @
720c2a2c
...
@@ -380,7 +380,7 @@ do i=1,np
...
@@ -380,7 +380,7 @@ do i=1,np
ww
=
h
(
k
)/
dxyz
**
3
ww
=
h
(
k
)/
dxyz
**
3
w
(
ic
)
=
w
(
ic
)
+
ww
w
(
ic
)
=
w
(
ic
)
+
ww
strain
(
ic
)
=
strain
(
ic
)
+
ww
*
cl
%
strain
(
i
)
strain
(
ic
)
=
strain
(
ic
)
+
ww
*
cl
%
strain
(
i
)
e2dp
(
ic
)
=
e2dp
(
u
c
)
+
ww
*
cl
%
e2dp
(
i
)
e2dp
(
ic
)
=
e2dp
(
i
c
)
+
ww
*
cl
%
e2dp
(
i
)
enddo
enddo
enddo
enddo
...
...
This diff is collapsed.
Click to expand it.
src/vrm.f90
+
6
−
4
View file @
720c2a2c
...
@@ -281,7 +281,8 @@ select case (trim(plasticity_type))
...
@@ -281,7 +281,8 @@ select case (trim(plasticity_type))
strain_soft_in_c
=
plasticity_parameters
(
6
)
strain_soft_in_c
=
plasticity_parameters
(
6
)
if
(
strain_soft_in_phi
.gt.
0.d0
.or.
strain_soft_in_c
.gt.
0.d0
)
then
if
(
strain_soft_in_phi
.gt.
0.d0
.or.
strain_soft_in_c
.gt.
0.d0
)
then
call
strain_soften
(
c
,
phi
,
plasticity_ss_type_coh
,
plasticity_ss_type_phi
,
&
call
strain_soften
(
c
,
phi
,
plasticity_ss_type_coh
,
plasticity_ss_type_phi
,
&
plasticity_parameters
,
straintot
,
e2d
,
flag_vrm_pb
)
plasticity_parameters
,
straintot
,
e2d
,
e2dprev
,
&
flag_vrm_pb
)
endif
endif
friction_angle
=
phi
*
180.d0
/
pi
friction_angle
=
phi
*
180.d0
/
pi
sin_phi
=
sin
(
phi
)
sin_phi
=
sin
(
phi
)
...
@@ -326,7 +327,7 @@ select case (trim(plasticity_type))
...
@@ -326,7 +327,7 @@ select case (trim(plasticity_type))
if
(
strain_soft_in_c
.gt.
0.d0
)
then
if
(
strain_soft_in_c
.gt.
0.d0
)
then
call
strain_soften
(
yield
,
phi
,
plasticity_ss_type_coh
,
&
call
strain_soften
(
yield
,
phi
,
plasticity_ss_type_coh
,
&
plasticity_ss_type_phi
,
plasticity_parameters
,
&
plasticity_ss_type_phi
,
plasticity_parameters
,
&
straintot
,
e2d
,
flag_vrm_pb
)
straintot
,
e2d
,
e2dprev
,
flag_vrm_pb
)
endif
endif
cos_theta
=
cos
(
theta
)
cos_theta
=
cos
(
theta
)
fail
=
2.d0
*
viscosity
*
e2d
*
cos_theta
-
yield
fail
=
2.d0
*
viscosity
*
e2d
*
cos_theta
-
yield
...
@@ -350,7 +351,8 @@ end subroutine vrm
...
@@ -350,7 +351,8 @@ end subroutine vrm
!-------------------------------------------------------------------------------
!-------------------------------------------------------------------------------
subroutine
strain_soften
(
c
,
phi
,
plasticity_ss_type_coh
,
plasticity_ss_type_phi
,
&
subroutine
strain_soften
(
c
,
phi
,
plasticity_ss_type_coh
,
plasticity_ss_type_phi
,
&
plasticity_parameters
,
straintot
,
e2d
,
flag_vrm_pb
)
plasticity_parameters
,
straintot
,
e2d
,
e2dprev
,
&
flag_vrm_pb
)
use
constants
use
constants
...
@@ -368,7 +370,7 @@ use constants
...
@@ -368,7 +370,7 @@ use constants
implicit
none
implicit
none
character
(
len
=
16
)
plasticity_ss_type_coh
,
plasticity_ss_type_phi
character
(
len
=
16
)
plasticity_ss_type_coh
,
plasticity_ss_type_phi
double precision
plasticity_parameters
(
9
)
double precision
plasticity_parameters
(
9
)
double precision
::
c
,
phi
,
straintot
,
e2d
double precision
::
c
,
phi
,
straintot
,
e2d
,
e2dprev
logical
::
flag_vrm_pb
logical
::
flag_vrm_pb
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
...
...
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