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

Removed passing of call_cnt for debugging and fixed typo

parent f23a11f5
No related branches found
No related tags found
No related merge requests found
......@@ -19,7 +19,7 @@
recursive subroutine make_cut (level,levelmax,ndof,ael,bel,icon,x,y,z,kfix,mat,&
u,v,w,temp,pressure,strain,is_plastic,nnode,f, &
lsf,nlsf,r0,s0,t0,rst,icut,ileaves,eviscosity, &
vbounded,params,threadinfo,weightel,call_cnt)
vbounded,params,threadinfo,weightel)
!------------------------------------------------------------------------------|
!(((((((((((((((( Purpose of the routine ))))))))))))))))))))))))))))))))))))))
......@@ -93,7 +93,6 @@ double precision,intent(inout) :: eviscosity
logical,intent(inout) :: vbounded
type(thread),intent(inout) :: threadinfo
double precision,intent(inout) :: weightel
integer,intent(in) :: call_cnt
!------------------------------------------------------------------------------|
!(((((((((((((((( declaration of the subroutine internal variables )))))))))))))
......@@ -102,8 +101,8 @@ integer,intent(in) :: call_cnt
integer :: matel,matrule,i,j,k,err
double precision,allocatable :: vol_lsf(:)
double precision :: aelp(params%mpe*ndof,params%mpe*ndof),belp(params%mpe*ndof)
double precision :: prod,vol_lsf0,eviscosityp,eps
logical :: is_plastic_temp,vbounded_temp,weight
double precision :: prod,vol_lsf0,eviscosityp,eps,weight
logical :: is_plastic_temp,vbounded_temp
!-------------------------------------------------------------------------------
!-------------------------------------------------------------------------------
......@@ -135,19 +134,19 @@ if (.not.params%excl_vol) then
ileaves,level,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,&
pressure,strain,r0,s0,t0,rst,f,ael,bel, &
eviscosity,weightel,is_plastic,vbounded, &
threadinfo,call_cnt)
threadinfo)
else ! Use divFEM
if (level.eq.levelmax) then
call set_elem_props(params,mat,matrule,ndof,nlsf,nnode,icon,kfix, &
ileaves,level,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,&
pressure,strain,r0,s0,t0,rst,f,ael,bel, &
eviscosity,weightel,is_plastic,vbounded, &
threadinfo,call_cnt)
threadinfo)
else
call divide_element(params,mat,level,levelmax,ndof,nlsf,nnode, &
icon,kfix,ileaves,lsf,r0,s0,t0,rst,x,y,z,u,v, &
w,temp,pressure,strain,eviscosity,weightel, &
ael,bel,f,is_plastic,vbounded,threadinfo,call_cnt)
ael,bel,f,is_plastic,vbounded,threadinfo)
endif
endif
deallocate (vol_lsf)
......@@ -172,19 +171,19 @@ else
ileaves,level,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,&
pressure,strain,r0,s0,t0,rst,f,ael,bel, &
eviscosity,weightel,is_plastic,vbounded, &
threadinfo,call_cnt)
threadinfo)
else ! Use divFEM
if (level.eq.levelmax) then
call set_elem_props(params,mat,matrule,ndof,nlsf,nnode,icon,kfix, &
ileaves,level,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,&
pressure,strain,r0,s0,t0,rst,f,ael,bel, &
eviscosity,weightel,is_plastic,vbounded, &
threadinfo,call_cnt)
threadinfo)
else
call divide_element(params,mat,level,levelmax,ndof,nlsf,nnode, &
icon,kfix,ileaves,lsf,r0,s0,t0,rst,x,y,z,u,v, &
w,temp,pressure,strain,eviscosity,weightel, &
ael,bel,f,is_plastic,vbounded,threadinfo,call_cnt)
ael,bel,f,is_plastic,vbounded,threadinfo)
endif
endif
deallocate (vol_lsf)
......@@ -206,7 +205,7 @@ if (icut.eq.0) then
mat(matel)%diffusivity,mat(matel)%heat, &
mat(matel)%plasticity_type,mat(matel)%plasticity_parameters,&
u,v,w,temp,pressure,strain,is_plastic_temp,nnode,f,r0,s0,t0,&
rst,ileaves,eviscosityp,vbounded_temp,threadinfo,weight,call_cnt)
rst,ileaves,eviscosityp,vbounded_temp,threadinfo,weight)
ael=ael+aelp/(8.d0**level)
bel=bel+belp/(8.d0**level)
......@@ -268,7 +267,7 @@ end subroutine get_mat_volume
subroutine set_elem_props (params,mat,matrule,ndof,nlsf,nnode,icon,kfix, &
ileaves,level,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp, &
pressure,strain,r0,s0,t0,rst,f,ael,bel,eviscosity, &
weightel,is_plastic,vbounded,threadinfo,call_cnt)
weightel,is_plastic,vbounded,threadinfo)
use threads
use definitions
......@@ -301,7 +300,6 @@ double precision,intent(out) :: weightel
logical,intent(out) :: is_plastic
logical,intent(out) :: vbounded
type(thread),intent(inout) :: threadinfo
integer,intent(in) :: call_cnt
!------------------------------------------------------------------------------|
!(((((((((((((((( declaration of the subroutine internal variables )))))))))))))
......@@ -394,7 +392,7 @@ call make_matrix (params,ndof,aelp,belp,icon,x,y,z,kfix,viscosity,density, &
penal,expon,activ,expan,diffusivity,heat,plasticity_type, &
plasticity_parameters,u,v,w,temp,pressure,strain, &
is_plastic_temp,nnode,f,r0,s0,t0,rst,ileaves,eviscosityp, &
vbounded_temp,threadinfo,weight,call_cnt)
vbounded_temp,threadinfo,weight)
is_plastic=(is_plastic.or.is_plastic_temp)
vbounded=(vbounded.or.vbounded_temp)
......@@ -410,7 +408,7 @@ end subroutine set_elem_props
subroutine divide_element(params,mat,level,levelmax,ndof,nlsf,nnode,icon,kfix, &
ileaves,lsf,r0,s0,t0,rst,x,y,z,u,v,w,temp,pressure, &
strain,eviscosity,weightel,ael,bel,f,is_plastic, &
vbounded,threadinfo,call_cnt)
vbounded,threadinfo)
use threads
use definitions
......@@ -442,7 +440,6 @@ double precision,intent(inout) :: f(nnode*ndof)
logical,intent(inout) :: is_plastic
logical,intent(inout) :: vbounded
type(thread),intent(inout) :: threadinfo
integer,intent(in) :: call_cnt
!------------------------------------------------------------------------------|
!(((((((((((((((( declaration of the subroutine internal variables )))))))))))))
......@@ -499,7 +496,7 @@ do kk=1,2
call make_cut (levelp,levelmax,ndof,ael,bel,icon,x,y,z,kfix,mat,u,v,w,&
temp,pressure,strain,is_plastic,nnode,f,lsfp,nlsf,r0p, &
s0p,t0p,rstp,jcut,ileaves,eviscosity,vbounded,params, &
threadinfo,weightel,call_cnt)
threadinfo,weightel)
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