Cleaned up unnecessary argument passing

src/compute_pressure.f90

@@ -102,13 +102,11 @@ do ileaves=1+iproc,osolve%nleaves,nproc
       s0=-1.d0
       t0=-1.d0
       rst=2.d0
-      call pressure_cut (params,level,levelmax,osolve%icon(1,ileaves), &
-                         osolve%x,osolve%y,osolve%z,                   &
-                         mat,params%materialn,                         &
-                         ov%unode,ov%vnode,ov%wnode,osolve%temp,       &
-                         press(ileaves),osolve%strain,osolve%nnode,    &    
-                         lsf_el,osolve%nlsf,r0,s0,t0,rst,icut,ileaves, &
-                         osolve%eviscosity(ileaves))
+      call pressure_cut (params,level,levelmax,osolve%icon(1,ileaves),         &
+                         osolve%x,osolve%y,osolve%z,mat,params%materialn,      &
+                         ov%unode,ov%vnode,ov%wnode,osolve%temp,press(ileaves),&
+                         osolve%strain,osolve%nnode,lsf_el,osolve%nlsf,r0,s0,  &
+                         t0,rst,icut,ileaves,osolve%eviscosity(ileaves))
       deallocate (lsf_el)
    endif
 enddo

src/make_pressure.f90

@@ -18,8 +18,9 @@
 
 subroutine make_pressure (params,icon,xg,yg,zg,viscosity0,penalty,expon,unode, &
                          vnode,wnode,temp,pressure,strain,nnode,r0,s0,t0,rst,  &
-                         plasticity_type,plasticity_parameters,eviscosity)
-use definitions 
+                         eviscosity)
+
+use definitions
 use invariants
 !use mpi
 
@@ -63,8 +64,6 @@ double precision pressure
 double precision strain(nnode)
 integer nnode
 double precision r0,s0,t0,rst
-character (len=8) plasticity_type
-double precision plasticity_parameters(9)
 double precision eviscosity
 
 !------------------------------------------------------------------------------|
@@ -80,14 +79,12 @@ double precision velox,veloy,veloz,tau,uvwnorm,xmin,xmax,ymin,ymax
 double precision zmin,zmax,dx,dy,dz,alpha,div
 double precision eps,r,s,t,w,volume
 double precision jcb(3,3),jcbi(3,3),jcbp(3,3),jcbip(3,3)
-!double precision,dimension(:),allocatable :: rr,ss,tt,ww,h
 double precision,dimension(:),allocatable :: x,y,z
 double precision,dimension(:),allocatable :: dhdx,dhdy,dhdz
 logical is_plastic_dummy,flag_vrm_pb
 
 double precision :: rr,ss,tt,ww
 
-
 !------------------------------------------------------------------------------|
 !------------------------------------------------------------------------------|
 

src/pressure_cut.f90

@@ -126,8 +126,7 @@ enddo
 if (icut.eq.0) then
   call make_pressure(params,icon,x,y,z,mat(matel)%viscosity,mat(matel)%penalty,&
                     mat(matel)%expon,u,v,w,temp,pressurep,strain,nnode,r0,s0,  &
-                    t0,rst,mat(matel)%plasticity_type,                         &
-                    mat(matel)%plasticity_parameters,eviscosity)
+                    t0,rst,eviscosity)
 
   pressure=pressure+pressurep/(8.d0**level)
 endif
@@ -219,8 +218,6 @@ double precision,intent(out) :: pressure
 
 integer :: matel,i
 double precision :: eps,viscosity,penal,expon,pressurep,xmean,ymean,zmean
-double precision :: plasticity_parameters(9)
-character(len=8) :: plasticity_type
 
 !-------------------------------------------------------------------------------
 !-------------------------------------------------------------------------------
@@ -248,8 +245,6 @@ case (1)
   viscosity=mat(matel)%viscosity
   penal=mat(matel)%penalty
   expon=mat(matel)%expon
-  plasticity_type=mat(matel)%plasticity_type
-  plasticity_parameters=mat(matel)%plasticity_parameters
 
 case(2)                                                                         ! Assign material properties of volumetric minority material
   matel=materialn(sum(minloc(vol_lsf)))
@@ -262,8 +257,6 @@ case(2)
   viscosity=mat(matel)%viscosity
   penal=mat(matel)%penalty
   expon=mat(matel)%expon
-  plasticity_type=mat(matel)%plasticity_type
-  plasticity_parameters=mat(matel)%plasticity_parameters
 
 case default
   if (matrule.ne.0) write(*,*) 'Invalid matrule value, using divFEM'
@@ -287,20 +280,11 @@ case default
   penal=penal+vol_lsf0*mat(matel)%penalty
   expon=expon+vol_lsf0*mat(matel)%expon
   matel=materialn(sum(maxloc(vol_lsf)))
-  plasticity_type=mat(matel)%plasticity_type
-  plasticity_parameters=mat(matel)%plasticity_parameters
 
 end select
 
-if (maxval(vol_lsf).lt.eps) then
-  matel=materialn(0)
-  plasticity_type=mat(matel)%plasticity_type
-  plasticity_parameters=mat(matel)%plasticity_parameters
-endif
-
 call make_pressure (params,icon,x,y,z,viscosity,penal,expon,u,v,w,temp,        &
-                   pressurep,strain,nnode,r0,s0,t0,rst,plasticity_type,        &
-                   plasticity_parameters,eviscosity)
+                   pressurep,strain,nnode,r0,s0,t0,rst,eviscosity)
 
 pressure=pressure+pressurep/(8.d0**level)