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

[surendra at geodynamics.org]

Author: surendra
Date: 2012-03-26 15:23:02 -0700 (Mon, 26 Mar 2012)
New Revision: 19878

Modified:
   seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90
Log:
More correction to take into account correct friction law

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-03-26 20:39:06 UTC (rev 19877)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90	2012-03-26 22:23:02 UTC (rev 19878)
@@ -641,7 +641,7 @@
   real(kind=CUSTOM_REAL), dimension(3,bc%nglob) :: T
   real(kind=CUSTOM_REAL), dimension(bc%nglob) :: tStick,tnew
   real(kind=CUSTOM_REAL), dimension(3,bc%nglob) :: dD,dV,dA
-  real(kind=CUSTOM_REAL), dimension(bc%nglob) :: theta_old, Vnorm, Vnorm_old
+  real(kind=CUSTOM_REAL), dimension(bc%nglob) :: theta_old, theta_new, Vnorm, Vnorm_old, dc
   real(kind=CUSTOM_REAL) :: half_dt
 
   real(kind=CUSTOM_REAL), dimension(bc%nglob) :: ta, Vf,Vf1,tau1,Vf2,tau2,Vfavg
@@ -805,7 +805,15 @@
 
   !-- intermediate storage of outputs --
   Vnorm = sqrt(bc%V(1,:)*bc%V(1,:)+bc%V(2,:)*bc%V(2,:))
-  call store_dataXZ(bc%dataXZ, strength, theta_old, bc%swf%theta, bc%swf%dc, &
+  if(.not. Rate_AND_State) then
+    theta_new = bc%swf%theta
+    dc = bc%swf%dc
+  else
+    theta_new = bc%rsf%theta
+    dc = bc%rsf%L
+  endif
+
+  call store_dataXZ(bc%dataXZ, strength, theta_old, theta_new, dc, &
        Vnorm_old, Vnorm, it*bc%dt,bc%dt)
   call store_dataT(bc%dataT,bc%D,bc%V,bc%T,it)
 
@@ -1249,7 +1257,11 @@
   integer, intent(in) :: nglob
 
   allocate(DataXZ%stg(nglob))
-  DataXZ%sta => bc%swf%theta
+  if(.not. Rate_AND_State) then
+    DataXZ%sta => bc%swf%theta
+  else
+    DataXZ%sta => bc%rsf%theta
+  endif
   DataXZ%d1 => bc%d(1,:)
   DataXZ%d2 => bc%d(2,:)
   DataXZ%v1 => bc%v(1,:)