[cig-commits] r20499 - seismo/2D/SPECFEM2D/trunk/src/specfem2D

[xie.zhinan at geodynamics.org]

Author: xie.zhinan
Date: 2012-07-07 11:52:58 -0700 (Sat, 07 Jul 2012)
New Revision: 20499

Modified:
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.F90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/invert_mass_matrix.F90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
Log:
delete an unneeded variable anyabs_local


Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.F90	2012-07-07 18:22:35 UTC (rev 20498)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.F90	2012-07-07 18:52:58 UTC (rev 20499)
@@ -220,7 +220,7 @@
   logical, dimension(nspec) :: is_PML
   integer, dimension(nspec) :: spec_to_PML
   integer, dimension(NGLLX,NGLLZ,nspec) :: ibool_PML
-  logical :: PML_BOUNDARY_CONDITIONS, anyabs_local
+  logical :: PML_BOUNDARY_CONDITIONS
 
   real(kind=CUSTOM_REAL), dimension(2,3,NGLLX,NGLLZ,nspec_PML) :: rmemory_displ_elastic,rmemory_displ_elastic_corner
   real(kind=CUSTOM_REAL), dimension(2,NGLLX,NGLLZ,nspec_PML) :: &
@@ -231,11 +231,11 @@
   real(kind=CUSTOM_REAL), dimension(3,NGLLX,NGLLZ,nspec_PML) :: accel_elastic_PML, accel_elastic_PML_corner
   real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLZ,nspec_PML) ::PML_dux_dxl,PML_dux_dzl,PML_duz_dxl,PML_duz_dzl,&
                            PML_dux_dxl_new,PML_dux_dzl_new,PML_duz_dxl_new,PML_duz_dzl_new
-  real(kind=CUSTOM_REAL) :: coef0_x, coef1_x, coef2_x, coef0_z, coef1_z, coef2_z,bb !,aa
+  real(kind=CUSTOM_REAL) :: coef0_x, coef1_x, coef2_x, coef0_z, coef1_z, coef2_z,bb
 
-  real(kind=CUSTOM_REAL) :: A0, A1, A2, A3, A4, A5, A6, A7, A8 !, A9, A10
+  real(kind=CUSTOM_REAL) :: A0, A1, A2, A3, A4, A5, A6, A7, A8
 
-  real(kind=CUSTOM_REAL) :: dux_dxi_new,dux_dgamma_new,duz_dxi_new,duz_dgamma_new !duy_dxi_new,duy_dgamma_new
+  real(kind=CUSTOM_REAL) :: dux_dxi_new,dux_dgamma_new,duz_dxi_new,duz_dgamma_new
   real(kind=CUSTOM_REAL) :: dux_dxl_new,dux_dzl_new,duz_dxl_new,duz_dzl_new
   real(kind=CUSTOM_REAL), dimension(3,nglob) :: displ_elastic_new
 
@@ -248,8 +248,6 @@
   sigma_zz = 0
   sigma_zx = 0
 
-  anyabs_local=.false. ! to avoid having an uninitialized variable
-
   if( PML_BOUNDARY_CONDITIONS ) then
     accel_elastic_PML = 0._CUSTOM_REAL
     accel_elastic_PML_corner = 0._CUSTOM_REAL
@@ -262,9 +260,6 @@
     PML_duz_dxl_new = 0._CUSTOM_REAL
     PML_duz_dzl_new = 0._CUSTOM_REAL
     displ_elastic_new = displ_elastic + deltat * veloc_elastic
-    anyabs_local=.false.
-  elseif(.not.PML_BOUNDARY_CONDITIONS .and. anyabs )then
-    anyabs_local=.true.
   endif
 
 
@@ -374,7 +369,7 @@
               duz_dxl = duz_dxi*xixl + duz_dgamma*gammaxl
               duz_dzl = duz_dxi*xizl + duz_dgamma*gammazl
 
-              if( PML_BOUNDARY_CONDITIONS ) then
+              if(PML_BOUNDARY_CONDITIONS) then
                 if(is_PML(ispec))then
                   ! derivative along x and along z
                   dux_dxi_new = ZERO
@@ -405,8 +400,8 @@
               endif
 
 
-              if( PML_BOUNDARY_CONDITIONS ) then
-                if( is_PML(ispec) ) then
+              if(PML_BOUNDARY_CONDITIONS) then
+                if(is_PML(ispec)) then
                   ispec_PML=spec_to_PML(ispec)
                   iPML=ibool_PML(i,j,ispec)
 
@@ -1209,7 +1204,7 @@
   !
   !--- absorbing boundaries
   !
-  if(anyabs_local) then
+  if(.not. PML_BOUNDARY_CONDITIONS .and. anyabs) then
 
      count_left=1
      count_right=1

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/invert_mass_matrix.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/invert_mass_matrix.F90	2012-07-07 18:22:35 UTC (rev 20498)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/invert_mass_matrix.F90	2012-07-07 18:52:58 UTC (rev 20499)
@@ -127,7 +127,7 @@
   real(kind=CUSTOM_REAL), dimension(npoin_PML) :: K_x_store,K_z_store,d_x_store,d_z_store
   integer, dimension(NGLLX,NGLLZ,nspec) :: ibool_PML
   logical, dimension(nspec) :: is_PML
-  logical :: PML_BOUNDARY_CONDITIONS, anyabs_local
+  logical :: PML_BOUNDARY_CONDITIONS
 !! DK DK added this for Guenneau, March 2012
 #ifdef USE_GUENNEAU
   double precision, dimension(NDIM,nglob_elastic), intent(in) :: coord
@@ -142,10 +142,6 @@
   if(any_poroelastic) rmass_w_inverse_poroelastic(:) = 0._CUSTOM_REAL
   if(any_acoustic) rmass_inverse_acoustic(:) = 0._CUSTOM_REAL
 
-  anyabs_local=.false. ! to avoid having an uninitialized variable
-  if(PML_BOUNDARY_CONDITIONS)anyabs_local=.false.
-  if(.not.PML_BOUNDARY_CONDITIONS .and. anyabs)anyabs_local=.true.
-
   do ispec = 1,nspec
     do j = 1,NGLLZ
       do i = 1,NGLLX
@@ -185,6 +181,7 @@
           ! for elastic medium
 
 
+print *,'PML_BOUNDARY_CONDITIONS in invert mass = ',PML_BOUNDARY_CONDITIONS
         if(PML_BOUNDARY_CONDITIONS)then
         if (is_PML(ispec)) then
           iPML=ibool_PML(i,j,ispec)
@@ -259,7 +256,7 @@
   !--- DK and Zhinan Xie: one per component of the wave field i.e. one per spatial dimension.
   !--- DK and Zhinan Xie: This was also suggested by Jean-Paul Ampuero in 2003.
   !
-  if(anyabs_local) then
+  if(.not. PML_BOUNDARY_CONDITIONS .and. anyabs) then
      count_left=1
      count_right=1
      count_bottom=1

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2012-07-07 18:22:35 UTC (rev 20498)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2012-07-07 18:52:58 UTC (rev 20499)
@@ -2979,6 +2979,7 @@
   !
   !---- build the global mass matrix
   !
+print *,'PML_BOUNDARY_CONDITIONS in calling program = ',PML_BOUNDARY_CONDITIONS
   call invert_mass_matrix_init(any_elastic,any_acoustic,any_poroelastic, &
                                 rmass_inverse_elastic_one,nglob_elastic, &
                                 rmass_inverse_acoustic,nglob_acoustic, &