[cig-commits] r21642 - seismo/3D/SPECFEM3D/trunk/src/specfem3D

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2013-03-26 15:08:33 -0700 (Tue, 26 Mar 2013)
New Revision: 21642

Modified:
   seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90
   seismo/3D/SPECFEM3D/trunk/src/specfem3D/create_color_image.f90
   seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90
   seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90
Log:
fixed the rhostore() bug detected by Zhinan in src/specfem3D/pml_compute_accel_contribution.f90


Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90	2013-03-26 21:54:41 UTC (rev 21641)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90	2013-03-26 22:08:33 UTC (rev 21642)
@@ -484,7 +484,7 @@
                  epsilondev_xy_loc(i,j,k) = 0.5 * duxdyl_plus_duydxl_att
                  epsilondev_xz_loc(i,j,k) = 0.5 * duzdxl_plus_duxdzl_att
                  epsilondev_yz_loc(i,j,k) = 0.5 * duzdyl_plus_duydzl_att
-                 
+
               else if(PML_CONDITIONS) then
                     ! do not merge this second line with the first using an ".and." statement
                     ! because array CPML_mask_ibool() is unallocated when PML_CONDITIONS is false

Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/create_color_image.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/create_color_image.f90	2013-03-26 21:54:41 UTC (rev 21641)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/create_color_image.f90	2013-03-26 22:08:33 UTC (rev 21642)
@@ -799,8 +799,8 @@
   subroutine get_iglob_vp(iglob,ispec,vp)
 
   use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,FOUR_THIRDS
-  use specfem_par,only: mustore,kappastore,ibool,myrank
-  use specfem_par_acoustic,only: ACOUSTIC_SIMULATION,rhostore
+  use specfem_par,only: mustore,kappastore,rhostore,ibool,myrank
+  use specfem_par_acoustic,only: ACOUSTIC_SIMULATION
   use specfem_par_elastic,only: ELASTIC_SIMULATION,rho_vp
   implicit none
 
@@ -837,13 +837,13 @@
 
   use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NDIM
   use specfem_par_acoustic,only: ACOUSTIC_SIMULATION,potential_acoustic,potential_dot_acoustic, &
-                                rhostore,ispec_is_acoustic, &
+                                ispec_is_acoustic, &
                                 b_potential_acoustic,b_potential_dot_acoustic
   use specfem_par_elastic,only: ELASTIC_SIMULATION,displ,veloc, &
                                 ispec_is_elastic ! ,b_displ,b_veloc
   use specfem_par,only: NSPEC_AB,NGLOB_AB,hprime_xx,hprime_yy,hprime_zz, &
                         xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
-                        ibool,SIMULATION_TYPE,GRAVITY
+                        ibool,rhostore,SIMULATION_TYPE,GRAVITY
   use specfem_par_movie,only:SAVE_DISPLACEMENT
   implicit none
 

Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90	2013-03-26 21:54:41 UTC (rev 21641)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90	2013-03-26 22:08:33 UTC (rev 21642)
@@ -35,8 +35,8 @@
   ! Anisotropic-Medium PML for Vector FETD With Modified Basis Functions,
   ! IEEE Transactions on Antennas and Propagation, vol. 54, no. 1, (2006)
 
-  use specfem_par, only: ibool,wgllwgll_yz,wgllwgll_xz,wgllwgll_xy,it,kappastore
-  use specfem_par_elastic, only: rho_vp,displ,veloc,ispec_is_elastic
+  use specfem_par, only: ibool,wgllwgll_yz,wgllwgll_xz,wgllwgll_xy,it,kappastore,rhostore
+  use specfem_par_elastic, only: displ,veloc,ispec_is_elastic
   use specfem_par_acoustic, only: potential_acoustic,potential_dot_acoustic,potential_dot_dot_acoustic,ispec_is_acoustic
   use pml_par, only: NSPEC_CPML,rmemory_displ_elastic,rmemory_potential_acoustic,CPML_regions,spec_to_CPML,alpha_store, &
                      d_store_x,d_store_y,d_store_z,K_store_x,K_store_y,K_store_z,potential_dot_dot_acoustic_CPML
@@ -62,9 +62,11 @@
      do j=1,NGLLY
         do i=1,NGLLX
            if( ispec_is_elastic(ispec) ) then
-              rhol = rho_vp(i,j,k,ispec)
+              rhol = rhostore(i,j,k,ispec)
            else if( ispec_is_acoustic(ispec) ) then
               kappal = kappastore(i,j,k,ispec)
+           else
+              stop 'CPML elements should be either acoustic or elastic; exiting...'
            endif
 
            iglob = ibool(i,j,k,ispec)

Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90	2013-03-26 21:54:41 UTC (rev 21641)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90	2013-03-26 22:08:33 UTC (rev 21642)
@@ -57,6 +57,9 @@
   ! isotropic
   real(kind=CUSTOM_REAL), dimension(:,:,:,:), allocatable :: kappastore,mustore
 
+! density
+  real(kind=CUSTOM_REAL), dimension(:,:,:,:), allocatable :: rhostore
+
 ! CUDA mesh pointer<->integer wrapper
   integer(kind=8) :: Mesh_pointer
 
@@ -399,9 +402,6 @@
                         potential_dot_acoustic,potential_dot_dot_acoustic
   real(kind=CUSTOM_REAL), dimension(:), allocatable :: potential_acoustic_adj_coupling
 
-! density
-  real(kind=CUSTOM_REAL), dimension(:,:,:,:), allocatable :: rhostore
-
 ! mass matrix
   real(kind=CUSTOM_REAL), dimension(:), allocatable :: rmass_acoustic
   real(kind=CUSTOM_REAL), dimension(:), allocatable :: rmassz_acoustic