Skip to content
Snippets Groups Projects
Commit 8e83d359 authored by Dave Whipp's avatar Dave Whipp
Browse files

Added passing of matnum, ematnump and leaf_mat_bins in divide_element calls

parent 9fc6d3a8
No related branches found
No related tags found
No related merge requests found
......@@ -219,10 +219,11 @@ if (.not.params%excl_vol) then
weightel,yield_ratio,frict_angle,is_plastic, &
vbounded,threadinfo)
else
call divide_element(params,mat,level,levelmax,ndof,nlsf,nnode, &
icon,kfix,ileaves,matnum,lsf,r0,s0,t0,rst,x,y,&
z,u,v,w,temp,pressure,strain,e2dp,eviscosity, &
weightel,ael,bel,f,yield_ratio,frict_angle, &
call divide_element(params,mat,level,levelmax,ndof,nlsf,nnode, &
icon,kfix,ileaves,leaf_mat_bin,ematnump, &
matnum,lsf,r0,s0,t0,rst,x,y,z,u,v,w,temp, &
pressure,strain,e2dp,eviscosity,weightel, &
ael,bel,f,yield_ratio,frict_angle, &
is_plastic,vbounded,threadinfo)
endif
endif
......@@ -326,10 +327,11 @@ else
weightel,yield_ratio,frict_angle,is_plastic, &
vbounded,threadinfo)
else
call divide_element(params,mat,level,levelmax,ndof,nlsf,nnode, &
icon,kfix,ileaves,matnum,lsf,r0,s0,t0,rst,x,y,&
z,u,v,w,temp,pressure,strain,e2dp,eviscosity, &
weightel,ael,bel,f,yield_ratio,frict_angle, &
call divide_element(params,mat,level,levelmax,ndof,nlsf,nnode, &
icon,kfix,ileaves,leaf_mat_bin,ematnump, &
matnum,lsf,r0,s0,t0,rst,x,y,z,u,v,w,temp, &
pressure,strain,e2dp,eviscosity,weightel, &
ael,bel,f,yield_ratio,frict_angle, &
is_plastic,vbounded,threadinfo)
endif
endif
......@@ -684,10 +686,10 @@ end subroutine set_elem_props
!-------------------------------------------------------------------------------
subroutine divide_element(params,mat,level,levelmax,ndof,nlsf,nnode,icon,kfix, &
ileaves,matnum,lsf,r0,s0,t0,rst,x,y,z,u,v,w,temp, &
pressure,strain,e2dp,eviscosity,weightel,ael,bel,f, &
yield_ratio,frict_angle,is_plastic,vbounded, &
threadinfo)
ileaves,leaf_mat_bin,ematnump,matnum,lsf,r0,s0,t0,rst,&
x,y,z,u,v,w,temp,pressure,strain,e2dp,eviscosity, &
weightel,ael,bel,f,yield_ratio,frict_angle,is_plastic,&
vbounded,threadinfo)
use threads
use definitions
......@@ -704,6 +706,8 @@ integer,intent(in) :: nnode
integer,intent(in) :: icon(params%mpe)
integer,intent(in) :: kfix(nnode*ndof)
integer,intent(in) :: ileaves
integer,intent(in) :: leaf_mat_bin(0:params%nmat)
integer,intent(in) :: ematnump
integer,intent(inout) :: matnum
double precision,intent(in) :: lsf(params%mpe,nlsf)
double precision,intent(in) :: r0,s0,t0,rst
......@@ -780,7 +784,7 @@ do kk=1,2
temp,pressure,strain,e2dp,is_plastic,nnode,f,lsfp,nlsf, &
r0p,s0p,t0p,rstp,jcut,ileaves,eviscosity,vbounded, &
yield_ratio,frict_angle,params,threadinfo,weightel, &
matnum)
matnum,leaf_mat_bin,ematnump)
enddo
enddo
enddo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment