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

[surendra at geodynamics.org]

Author: surendra
Date: 2012-10-26 20:19:45 -0700 (Fri, 26 Oct 2012)
New Revision: 20951

Modified:
   seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_dynamic.f90
Log:
Repeated a fix that had to be ignored during resolving conflict

Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_dynamic.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_dynamic.f90	2012-10-27 03:15:37 UTC (rev 20950)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_dynamic.f90	2012-10-27 03:19:45 UTC (rev 20951)
@@ -263,9 +263,7 @@
     allocate(bc%MU(bc%nglob))
     if (RATE_AND_STATE) then
       allocate(bc%rsf)
-      call rsf_init(bc%rsf,bc%T0,bc%Fload,bc%coord,IIN_PAR)
-     ! WARNING: the line below is only valid for pure strike-slip faulting
-      bc%V(1,:) = bc%rsf%V_init
+      call rsf_init(bc%rsf,bc%T0,bc%V,bc%Fload,bc%coord,IIN_PAR)
     else 
       allocate(bc%swf)
       call swf_init(bc%swf,bc%MU,bc%coord,IIN_PAR)
@@ -703,10 +701,11 @@
 
 !=====================================================================
 
-subroutine rsf_init(f,T0,nucFload,coord,IIN_PAR)
+subroutine rsf_init(f,T0,V,nucFload,coord,IIN_PAR)
 
   type(rsf_type), intent(out) :: f
   real(kind=CUSTOM_REAL), intent(in) :: T0(:,:)
+  real(kind=CUSTOM_REAL), intent(inout) :: V(:,:)
   real(kind=CUSTOM_REAL), intent(in) :: coord(:,:)
   real(kind=CUSTOM_REAL), pointer :: nucFload(:)
   integer, intent(in) :: IIN_PAR
@@ -857,7 +856,7 @@
                         - f%f0 - f%a*log(f%V_init/f%V0) ) &
                       / f%b )
   else
-     f%theta =  f%a * log(TWO*V0/V_init * sinh(-sqrt(T0(1,:)**2+T0(2,:)**2)/T0(3,:)/f%a))
+     f%theta =  f%a * log(TWO*f%V0/V_init * sinh(-sqrt(T0(1,:)**2+T0(2,:)**2)/T0(3,:)/f%a))
   endif
 
  ! WARNING : ad hoc for SCEC benchmark TPV10x
@@ -868,6 +867,9 @@
   nucFload = Fload
   call init_2d_distribution(nucFload,coord,IIN_PAR,nFload)
 
+ ! WARNING: the line below is only valid for pure strike-slip faulting
+  V(1,:) = bc%rsf%V_init
+
 end subroutine rsf_init
 
 !---------------------------------------------------------------------