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

[ampuero at geodynamics.org]

Author: ampuero
Date: 2011-05-05 22:58:13 -0700 (Thu, 05 May 2011)
New Revision: 18326

Modified:
   seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90
   seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90
   seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_kinematic.f90
Log:
same eta for all faults in Par_file_faults.in

Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90	2011-05-06 05:37:55 UTC (rev 18325)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_object.f90	2011-05-06 05:58:13 UTC (rev 18326)
@@ -88,18 +88,17 @@
   if (ier==0) then    
     read(IIN,*) nb  
     read(IIN,*) eta
-    if (nb>0) then
-      allocate(fault_db(nb))
-      do i=1,nb
-        fault_db(i)%eta = eta
-      enddo 
-    endif
   else
     write(6,*) 'File Par_file_faults.in does not exist '
     return
   end if
   close(IIN)
 
+  if (nb>0) allocate(fault_db(nb))
+  do i=1,nb
+    fault_db(i)%eta = eta
+  enddo 
+
  ! read fault database file
   open(unit=IIN,file=prname(1:len_trim(prname))//'Database_fault', &
        status='old',action='read',form='formatted',iostat=ier)

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	2011-05-06 05:37:55 UTC (rev 18325)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90	2011-05-06 05:58:13 UTC (rev 18326)
@@ -143,9 +143,7 @@
   
   read(IIN_PAR,*) nbfaults
   if (nbfaults==0) return
-  do iflt=1,nbfaults
-    read(IIN_PAR,*) 
-  enddo 
+  read(IIN_PAR,*) ! eta
   read(IIN_PAR,*) SIMULATION_TYPE_DYN 
   if ( SIMULATION_TYPE_DYN == 2 ) then
     close(IIN_BIN)

Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_kinematic.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_kinematic.f90	2011-05-06 05:37:55 UTC (rev 18325)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_kinematic.f90	2011-05-06 05:58:13 UTC (rev 18326)
@@ -119,12 +119,14 @@
 ! WARNING TO DO: should be an MPI abort
 
  read(IIN_PAR,*) nbfaults
- do iflt=1,nbfaults
-   read(IIN_PAR,*) 
- enddo 
-
+  if (nbfaults==0) return
+ read(IIN_PAR,*)  ! eta
  read(IIN_PAR,*) SIMULATION_TYPE_KIN 
- if ( SIMULATION_TYPE_KIN == 1 ) goto 99
+ if ( SIMULATION_TYPE_KIN == 1 ) then
+    close(IIN_BIN)
+    close(IIN_PAR)
+    return
+ endif
  read(IIN_PAR,*) NTOUT
  read(IIN_PAR,*) NSNAP
  read(IIN_PAR,*) DUMMY
@@ -135,10 +137,10 @@
    read(IIN_PAR,nml=BEGIN_FAULT,end=100)
    call init_one_fault(faults(iflt),IIN_BIN,IIN_PAR,Minv,dt,nt,iflt)
  enddo 
-99 close(IIN_BIN)
-   close(IIN_PAR)
+  close(IIN_BIN)
+  close(IIN_PAR)
 
- return
+  return
 100 stop 'Did not find BEGIN_FAULT block #'
   ! WARNING TO DO: should be an MPI abort