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

[ampuero at geodynamics.org]

Author: ampuero
Date: 2011-05-05 23:14:06 -0700 (Thu, 05 May 2011)
New Revision: 18327

Modified:
   seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/compute_forces_elastic.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:
changed simulation_type flags to logical

Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/compute_forces_elastic.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/compute_forces_elastic.f90	2011-05-06 05:58:13 UTC (rev 18326)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/compute_forces_elastic.f90	2011-05-06 06:14:06 UTC (rev 18327)
@@ -208,9 +208,9 @@
 
 !Percy , Fault boundary term B*tau is added to the assembled forces 
 !        which at this point are stored in the array 'accel'
-  if (SIMULATION_TYPE_DYN == 1 ) call bc_dynflt_set3d_all(accel,veloc,displ)
+  if (SIMULATION_TYPE_DYN) call bc_dynflt_set3d_all(accel,veloc,displ)
   
-  if (SIMULATION_TYPE_KIN == 2 ) call bc_kinflt_set_all(accel,veloc,displ)
+  if (SIMULATION_TYPE_KIN) call bc_kinflt_set_all(accel,veloc,displ)
           
 ! multiplies with inverse of mass matrix (note: rmass has been inverted already)
   accel(1,:) = accel(1,:)*rmass(:)

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:58:13 UTC (rev 18326)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver.f90	2011-05-06 06:14:06 UTC (rev 18327)
@@ -89,7 +89,7 @@
  !Number of time steps defined by the user : NTOUT
   integer, save                :: NTOUT,NSNAP
 
-  integer, save :: SIMULATION_TYPE_DYN = 1
+  logical, save :: SIMULATION_TYPE_DYN = .false.
 
   real(kind=CUSTOM_REAL), allocatable, save :: Kelvin_Voigt_eta(:)
   
@@ -118,6 +118,7 @@
   integer :: iflt,ier,dummy_idfault
   integer :: nbfaults
   integer :: size_Kelvin_Voigt
+  integer :: SIMULATION_TYPE
   character(len=256) :: filename
   integer, parameter :: IIN_PAR =151
   integer, parameter :: IIN_BIN =170
@@ -144,12 +145,13 @@
   read(IIN_PAR,*) nbfaults
   if (nbfaults==0) return
   read(IIN_PAR,*) ! eta
-  read(IIN_PAR,*) SIMULATION_TYPE_DYN 
-  if ( SIMULATION_TYPE_DYN == 2 ) then
+  read(IIN_PAR,*) SIMULATION_TYPE
+  if ( SIMULATION_TYPE /= 1 ) then
     close(IIN_BIN)
     close(IIN_PAR)
     return 
   endif
+  SIMULATION_TYPE_DYN = .true.
   read(IIN_PAR,*) NTOUT
   read(IIN_PAR,*) NSNAP 
   read(IIN_PAR,*) V_HEALING

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:58:13 UTC (rev 18326)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/fault_solver_kinematic.f90	2011-05-06 06:14:06 UTC (rev 18327)
@@ -72,7 +72,7 @@
 !Number of time steps defined by the user : NTOUT
  integer, save                :: NTOUT,NSNAP
 
- integer, save :: SIMULATION_TYPE_KIN = 2
+ logical, save :: SIMULATION_TYPE_KIN = .false.
  
  public :: BC_KINFLT_init, BC_KINFLT_set_all, SIMULATION_TYPE_KIN
 
@@ -97,6 +97,7 @@
  real(kind=CUSTOM_REAL) :: dt
  integer :: iflt,ier,dummy_idfault
  integer :: nbfaults
+  integer :: SIMULATION_TYPE
  character(len=256) :: filename
  integer, parameter :: IIN_PAR =151
  integer, parameter :: IIN_BIN =170
@@ -118,25 +119,23 @@
  if( ier /= 0 ) stop 'Have not found proc*_fault_db.bin'
 ! WARNING TO DO: should be an MPI abort
 
- read(IIN_PAR,*) nbfaults
+  read(IIN_PAR,*) nbfaults
   if (nbfaults==0) return
- read(IIN_PAR,*)  ! eta
- read(IIN_PAR,*) SIMULATION_TYPE_KIN 
- 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
- read(IIN_PAR,*) DUMMY 
- read(IIN_BIN) nbfaults ! should be the same as in IIN_PAR
- allocate( faults(nbfaults) )
- do iflt=1,nbfaults
-   read(IIN_PAR,nml=BEGIN_FAULT,end=100)
-   call init_one_fault(faults(iflt),IIN_BIN,IIN_PAR,Minv,dt,nt,iflt)
- enddo 
+  read(IIN_PAR,*)  ! eta
+  read(IIN_PAR,*) SIMULATION_TYPE
+  if ( SIMULATION_TYPE == 2 ) then
+    SIMULATION_TYPE_KIN = .true.
+    read(IIN_PAR,*) NTOUT
+    read(IIN_PAR,*) NSNAP
+    read(IIN_PAR,*) DUMMY
+    read(IIN_PAR,*) DUMMY 
+    read(IIN_BIN) nbfaults ! should be the same as in IIN_PAR
+    allocate( faults(nbfaults) )
+    do iflt=1,nbfaults
+      read(IIN_PAR,nml=BEGIN_FAULT,end=100)
+      call init_one_fault(faults(iflt),IIN_BIN,IIN_PAR,Minv,dt,nt,iflt)
+    enddo 
+  endif
   close(IIN_BIN)
   close(IIN_PAR)