Cleaned up/improved spinup steady-state thermal calculation option; Updated...

Cleaned up/improved spinup steady-state thermal calculation option; Updated strain softening module to avoid name conflict

src/make_matrix.f90

@@ -24,7 +24,7 @@ subroutine make_matrix (params,ndof,ael,bel,icon,xg,yg,zg,kfix,viscosity0,     &
                         fvisc_weak_onset,fvisc_weak_end,fvisc_weak_final,unode,&
                         vnode,wnode,temp,pressure,strain,e2dp,is_plastic,nnode,&
                         ffff,r0,s0,t0,rst,ileaves,eviscosity,vbounded,         &
-                        yield_ratio,frict_angle,sstemp,threadinfo,weight)
+                        yield_ratio,frict_angle,threadinfo,weight)
 
 !------------------------------------------------------------------------------|
 !(((((((((((((((( Purpose of the routine  ))))))))))))))))))))))))))))))))))))))
@@ -61,6 +61,7 @@ use constants
 use definitions
 use gauss
 use invariants
+use strain_soften
 !use mpi
 use threads
 
@@ -103,7 +104,6 @@ logical vbounded
 double precision :: yield_ratio
 double precision :: frict_angle
 logical is_plastic
-logical sstemp
 type (thread) threadinfo
 double precision weight
 
@@ -129,7 +129,6 @@ double precision,dimension(:),allocatable :: h,dhdr,dhds,dhdt,ht
 double precision,dimension(:),allocatable :: dhdx,dhdy,dhdz
 double precision,dimension(:),allocatable :: vel
 double precision,dimension(:,:),allocatable :: b,bd,bl,aelp
-character (len=16) fvisc_weak_type
 
 !-------------------------------------------------------------------------------
 !-------------------------------------------------------------------------------
@@ -261,7 +260,7 @@ do iint=1,nint
      if (expon.gt.1.d0+eps .or. expon.lt.1.d0-eps) viscosity=viscosity*(e2d/e2dref)**(1.d0/expon-1.d0)
    endif
 
-   if (fvisc_weak_onset.gt.0.d0) then
+   if (fvisc_weak_onset.gt.eps) then
      fviscosity = ss_new(fviscosity,fvisc_weak_type,fvisc_weak_onset,          &
                          fvisc_weak_end,fvisc_weak_final,straintot,e2d,e2dprev,&
                          flag_vrm_pb)
@@ -531,7 +530,7 @@ alpha=1.d0
 dynamic=1.d0
 dt=params%dt
 
-if (sstemp) then
+if (params%sstemp_spinup .and. params%in_spinup) then
   dynamic=0.d0
   dt=1.d0
 endif