[cig-commits] r20881 - seismo/3D/FAULT_SOURCE/branches/new_fault_db/src

[surendra at geodynamics.org]

Author: surendra
Date: 2012-10-22 18:10:58 -0700 (Mon, 22 Oct 2012)
New Revision: 20881

Modified:
   seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90
Log:
Fixed some errors that didn't get resolved during a conflict in previous commit

Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90	2012-10-23 00:04:24 UTC (rev 20880)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90	2012-10-23 01:10:58 UTC (rev 20881)
@@ -614,14 +614,14 @@
           endif
         
           bc%rsf%a(i) = 0.008 + 0.008 * (ONE - B1*B2)
-          bc%rsf%Vw(iglob) = 0.1 + 0.9 * (ONE - B1*B2)
+          bc%rsf%Vw(i) = 0.1 + 0.9 * (ONE - B1*B2)
 
         elseif( abs(x)<=W1 .and. abs(z-hypo_z)<=W2 ) then
           bc%rsf%a(i) = 0.008
-          bc%rsf%Vw(iglob) = 0.1_CUSTOM_REAL
+          bc%rsf%Vw(i) = 0.1_CUSTOM_REAL
         else
           bc%rsf%a(i) = 0.016
-          bc%rsf%Vw(iglob) = 1.0_CUSTOM_REAL
+          bc%rsf%Vw(i) = 1.0_CUSTOM_REAL
         endif
 
       enddo
@@ -634,7 +634,7 @@
                             - bc%rsf%f0 - bc%rsf%a*log(bc%rsf%V_init/bc%rsf%V0) ) &
                           / bc%rsf%b )
       else
-         bc%rsf%theta =  bc%rsf%a * log(TWO*V0/V_init * sinh(-sqrt(bc%T0(1,:)**2+bc%T0(2,:)**2)/bc%T0(3,:)/bc%rsf%a)
+         bc%rsf%theta =  bc%rsf%a * log(TWO*V0/V_init * sinh(-sqrt(bc%T0(1,:)**2+bc%T0(2,:)**2)/bc%T0(3,:)/bc%rsf%a))
       endif
 
       allocate(bc%MU(bc%nglob)) 
@@ -908,7 +908,7 @@
       call rsf_update_state(Vf_old,bc%dt,bc%rsf)
       do i=1,bc%nglob
         Vf_new(i)=rtsafe(funcd,0.0,Vf_old(i)+5.0,1e-5,tStick(i),-T(3,i),bc%Z(i),bc%rsf%f0(i), &
-                         bc%rsf%V0(i),bc%rsf%a(i),bc%rsf%b(i),bc%rsf%L(i),bc%rsf%theta(i))
+                         bc%rsf%V0(i),bc%rsf%a(i),bc%rsf%b(i),bc%rsf%L(i),bc%rsf%theta(i),bc%rsf%StateLaw)
       enddo
       
       ! second pass
@@ -916,7 +916,7 @@
       call rsf_update_state(0.5e0_CUSTOM_REAL*(Vf_old + Vf_new),bc%dt,bc%rsf)
       do i=1,bc%nglob
         Vf_new(i)=rtsafe(funcd,0.0,Vf_old(i)+5.0,1e-5,tStick(i),-T(3,i),bc%Z(i),bc%rsf%f0(i), &
-                         bc%rsf%V0(i),bc%rsf%a(i),bc%rsf%b(i),bc%rsf%L(i),bc%rsf%theta(i))
+                         bc%rsf%V0(i),bc%rsf%a(i),bc%rsf%b(i),bc%rsf%L(i),bc%rsf%theta(i),bc%rsf%StateLaw)
       enddo
       
       tnew = tStick - bc%Z*Vf_new
@@ -1103,6 +1103,7 @@
 
   real(kind=CUSTOM_REAL) :: tStick,Seff,Z,f0,V0,a,b,L,theta
   double precision :: arg,fn,df,x
+  integer :: statelaw
 
   if(statelaw == 1) then
      arg = exp((f0+dble(b)*log(V0*theta/L))/a)/TWO/V0