Minor cleanup

src/make_matrix.f90

@@ -119,7 +119,7 @@ double precision f1(3,3),defgrad(3,3)
 double precision detf1,detf,e2dref,viscomean,frictmean,friction_angle
 double precision viscosity,compressibility,temperature
 double precision velox,veloy,veloz,tau,uvwnorm,xmin,xmax,ymin,ymax
-double precision zmin,zmax,dx,dy,dz,alpha,J2d,J3d,dt
+double precision zmin,zmax,dx,dy,dz,alpha,J2d,J3d,dt,dynamic
 double precision jcb(3,3),jcbi(3,3),jcbp(3,3),jcbip(3,3),d(6,6),dl(6,6)
 double precision,dimension(:),allocatable :: x,y,z,tnode,be
 double precision,dimension(:),allocatable :: h,dhdr,dhds,dhdt,ht
@@ -135,7 +135,7 @@ call mpi_comm_rank (mpi_comm_world,iproc,ierr)
 
 compressibility=penalty
 mpe=params%mpe
-dt=params%dt
+
 eps=tiny(eps)
 nint=8
 nb=6
@@ -518,8 +518,13 @@ goto 1112
 !-------------------------------------------------------------------------------
 
 alpha=1.d0
+dynamic=1.d0
+dt=params%dt
 
-if (sstemp) dt=1.d0
+if (sstemp) then
+  dynamic=0.d0
+  dt=1.d0
+endif
 
 do iint=1,nint
 
@@ -546,7 +551,7 @@ do iint=1,nint
       veloy=veloy+h(k)*vnode(ic)
       veloz=veloz+h(k)*wnode(ic)
    enddo
- 
+
    dhdr(1)=-(1.d0-s)*(1.d0-t)/8.d0
    dhdr(2)=(1.d0-s)*(1.d0-t)/8.d0
    dhdr(3)=-(1.d0+s)*(1.d0-t)/8.d0
@@ -641,11 +646,7 @@ do iint=1,nint
          ! xcond=diffusivity*(b(i,1)*b(j,1)+b(i,2)*b(j,2)+b(i,3)*b(j,3))*volume
          xcond=diffusivity*(b(i,1)*b(j,1)+b(i,2)*b(j,2)+b(i,3)*b(j,3))*volume &
               +ht(i)*(velox*b(j,1)+veloy*b(j,2)+veloz*b(j,3))*volume
-         if (sstemp) then
-           xmass=0.d0
-         else
-           xmass=h(i)*h(j)*volume
-         endif
+         xmass=h(i)*h(j)*volume*dynamic
          ael(i,j)=ael(i,j)+(xmass+dt*xcond*alpha)*w
          aelp(i,j)=aelp(i,j)+(xmass-dt*xcond*(1.d0-alpha))*w
       enddo