[cig-commits] r22606 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: create_header_file meshfem3D shared specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Jul 14 08:09:04 PDT 2013
Author: dkomati1
Date: 2013-07-14 08:09:04 -0700 (Sun, 14 Jul 2013)
New Revision: 22606
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90
Log:
added new flag PARTIAL_PHYS_DISPERSION_ONLY_VAL to values_from_mesher.h, and switched to it in the solver to improve performance
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -217,7 +217,7 @@
NSPEC_CRUST_MANTLE_STACEY,NSPEC_OUTER_CORE_STACEY, &
NGLOB_CRUST_MANTLE_OCEANS,NSPEC_OUTER_CORE_ROTATION, &
SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME,SAVE_REGULAR_KL,NOISE_TOMOGRAPHY, &
- ATT1,ATT2,ATT3,ATT4,ATT5,APPROXIMATE_HESS_KL,ANISOTROPIC_KL)
+ ATT1,ATT2,ATT3,ATT4,ATT5,APPROXIMATE_HESS_KL,ANISOTROPIC_KL,PARTIAL_PHYS_DISPERSION_ONLY)
print *
print *,'edit file OUTPUT_FILES/values_from_mesher.h to see'
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -877,7 +877,7 @@
NSPEC_CRUST_MANTLE_STACEY,NSPEC_OUTER_CORE_STACEY, &
NGLOB_CRUST_MANTLE_OCEANS,NSPEC_OUTER_CORE_ROTATION, &
SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME,SAVE_REGULAR_KL,NOISE_TOMOGRAPHY, &
- ATT1,ATT2,ATT3,ATT4,ATT5,APPROXIMATE_HESS_KL,ANISOTROPIC_KL)
+ ATT1,ATT2,ATT3,ATT4,ATT5,APPROXIMATE_HESS_KL,ANISOTROPIC_KL,PARTIAL_PHYS_DISPERSION_ONLY)
endif ! end of section executed by main process only
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -52,7 +52,7 @@
NSPEC_CRUST_MANTLE_STACEY,NSPEC_OUTER_CORE_STACEY, &
NGLOB_CRUST_MANTLE_OCEANS,NSPEC_OUTER_CORE_ROTATION, &
SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME,SAVE_REGULAR_KL,NOISE_TOMOGRAPHY, &
- ATT1,ATT2,ATT3,ATT4,ATT5,APPROXIMATE_HESS_KL,ANISOTROPIC_KL)
+ ATT1,ATT2,ATT3,ATT4,ATT5,APPROXIMATE_HESS_KL,ANISOTROPIC_KL,PARTIAL_PHYS_DISPERSION_ONLY)
implicit none
@@ -64,7 +64,7 @@
logical TRANSVERSE_ISOTROPY,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
ELLIPTICITY,GRAVITY,ROTATION,TOPOGRAPHY,OCEANS,ATTENUATION,ATTENUATION_3D,INCLUDE_CENTRAL_CUBE, &
- SAVE_REGULAR_KL,APPROXIMATE_HESS_KL,ANISOTROPIC_KL
+ SAVE_REGULAR_KL,APPROXIMATE_HESS_KL,ANISOTROPIC_KL,PARTIAL_PHYS_DISPERSION_ONLY
double precision ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES, &
CENTER_LONGITUDE_IN_DEGREES,CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH
@@ -446,6 +446,12 @@
write(IOUT,*) 'integer, parameter :: NSPEC_OUTER_CORE_ROTATION = ',NSPEC_OUTER_CORE_ROTATION
write(IOUT,*)
+ if(PARTIAL_PHYS_DISPERSION_ONLY) then
+ write(IOUT,*) 'logical, parameter :: PARTIAL_PHYS_DISPERSION_ONLY_VAL = .true.'
+ else
+ write(IOUT,*) 'logical, parameter :: PARTIAL_PHYS_DISPERSION_ONLY_VAL = .false.'
+ endif
+
write(IOUT,*) 'integer, parameter :: NGLOB1D_RADIAL_CM = ',NGLOB1D_RADIAL(IREGION_CRUST_MANTLE)
write(IOUT,*) 'integer, parameter :: NGLOB1D_RADIAL_OC = ',NGLOB1D_RADIAL(IREGION_OUTER_CORE)
write(IOUT,*) 'integer, parameter :: NGLOB1D_RADIAL_IC = ',NGLOB1D_RADIAL(IREGION_INNER_CORE)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -35,7 +35,7 @@
R_memory, &
one_minus_sum_beta,vnspec, &
tempx1,tempx2,tempx3,tempy1,tempy2,tempy3,tempz1,tempz2,tempz3, &
- dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H,PARTIAL_PHYS_DISPERSION_ONLY)
+ dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H)
implicit none
@@ -116,8 +116,6 @@
integer :: int_radius
integer :: iglob1
- logical :: PARTIAL_PHYS_DISPERSION_ONLY
-
! isotropic element
do k=1,NGLLZ
@@ -206,7 +204,7 @@
sigma_yz = mul*duzdyl_plus_duydzl
! subtract memory variables if attenuation
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
! do NOT put this is a subroutine, otherwise the call to the subroutine prevents compilers from vectorizing the outer loop
do i_SLS = 1,N_SLS
R_xx_val = R_memory(1,i_SLS,i,j,k,ispec)
@@ -364,7 +362,7 @@
R_memory, &
one_minus_sum_beta,vnspec, &
tempx1,tempx2,tempx3,tempy1,tempy2,tempy3,tempz1,tempz2,tempz3, &
- dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H,PARTIAL_PHYS_DISPERSION_ONLY)
+ dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H)
implicit none
@@ -460,8 +458,6 @@
integer :: int_radius
integer :: iglob1
- logical :: PARTIAL_PHYS_DISPERSION_ONLY
-
! transverse isotropic element
do k=1,NGLLZ
@@ -737,7 +733,7 @@
c45*duzdxl_plus_duxdzl + c44*duzdyl_plus_duydzl + c34*duzdzl
! subtract memory variables if attenuation
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
! do NOT put this is a subroutine, otherwise the call to the subroutine prevents compilers from vectorizing the outer loop
do i_SLS = 1,N_SLS
R_xx_val = R_memory(1,i_SLS,i,j,k,ispec)
@@ -898,7 +894,7 @@
R_memory, &
one_minus_sum_beta,vnspec, &
tempx1,tempx2,tempx3,tempy1,tempy2,tempy3,tempz1,tempz2,tempz3, &
- dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H,PARTIAL_PHYS_DISPERSION_ONLY)
+ dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H)
implicit none
@@ -983,8 +979,6 @@
integer :: int_radius
integer :: iglob1
- logical :: PARTIAL_PHYS_DISPERSION_ONLY
-
! anisotropic elements
do k=1,NGLLZ
@@ -1110,7 +1104,7 @@
c45*duzdxl_plus_duxdzl + c44*duzdyl_plus_duydzl + c34*duzdzl
! subtract memory variables if attenuation
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
! do NOT put this is a subroutine, otherwise the call to the subroutine prevents compilers from vectorizing the outer loop
do i_SLS = 1,N_SLS
R_xx_val = R_memory(1,i_SLS,i,j,k,ispec)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -53,7 +53,7 @@
c36store,c44store,c45store,c46store,c55store,c56store,c66store, &
ibool,ispec_is_tiso, &
R_memory,one_minus_sum_beta,deltat, &
- alphaval,betaval,gammaval,factor_common,vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
+ alphaval,betaval,gammaval,factor_common,vnspec,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev,eps_trace_over_3)
@@ -103,7 +103,6 @@
! memory variables R_ij are stored at the local rather than global level
! to allow for optimization of cache access by compiler
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_memory
- logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: eps_trace_over_3
@@ -395,7 +394,7 @@
R_memory, &
one_minus_sum_beta,vnspec, &
tempx1,tempx2,tempx3,tempy1,tempy2,tempy3,tempz1,tempz2,tempz3, &
- dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H,PARTIAL_PHYS_DISPERSION_ONLY)
+ dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H)
else
if( .not. ispec_is_tiso(ispec) ) then
! isotropic element
@@ -409,7 +408,7 @@
R_memory, &
one_minus_sum_beta,vnspec, &
tempx1,tempx2,tempx3,tempy1,tempy2,tempy3,tempz1,tempz2,tempz3, &
- dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H,PARTIAL_PHYS_DISPERSION_ONLY)
+ dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H)
else
! transverse isotropic element
@@ -423,7 +422,7 @@
R_memory, &
one_minus_sum_beta,vnspec, &
tempx1,tempx2,tempx3,tempy1,tempy2,tempy3,tempz1,tempz2,tempz3, &
- dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H,PARTIAL_PHYS_DISPERSION_ONLY)
+ dummyx_loc,dummyy_loc,dummyz_loc,epsilondev_loc,eps_trace_over_3_loc,rho_s_H)
endif ! .not. ispec_is_tiso
endif
@@ -542,7 +541,7 @@
! therefore Q_\alpha is not zero; for instance for V_p / V_s = sqrt(3)
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
! updates R_memory
epsilondev_loc_nsub1(1,:,:,:) = epsilondev(1,:,:,:,ispec)
epsilondev_loc_nsub1(2,:,:,:) = epsilondev(2,:,:,:,ispec)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -53,7 +53,7 @@
c36store,c44store,c45store,c46store,c55store,c56store,c66store, &
ibool,ispec_is_tiso, &
R_memory,one_minus_sum_beta,deltat, &
- alphaval,betaval,gammaval,factor_common,vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
+ alphaval,betaval,gammaval,factor_common,vnspec,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev,eps_trace_over_3)
@@ -84,7 +84,6 @@
! for attenuation
real(kind=CUSTOM_REAL) R_xx_val,R_yy_val
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_memory
- logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: eps_trace_over_3
@@ -681,7 +680,7 @@
endif ! end of test whether isotropic or anisotropic element
! subtract memory variables if attenuation
- if(ATTENUATION_VAL .and. ( PARTIAL_PHYS_DISPERSION_ONLY .eqv. .false. ) ) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
do i_SLS = 1,N_SLS
R_xx_val = R_memory(1,i_SLS,i,j,k,ispec)
R_yy_val = R_memory(2,i_SLS,i,j,k,ispec)
@@ -902,7 +901,7 @@
! therefore Q_\alpha is not zero; for instance for V_p / V_s = sqrt(3)
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
epsilondev_loc_nsub1(1,:,:,:) = epsilondev(1,:,:,:,ispec)
epsilondev_loc_nsub1(2,:,:,:) = epsilondev(2,:,:,:,ispec)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -49,7 +49,7 @@
kappavstore,muvstore,ibool,idoubling, &
c11store,c33store,c12store,c13store,c44store,R_memory,one_minus_sum_beta,deltat, &
alphaval,betaval,gammaval,factor_common, &
- vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
+ vnspec,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev,eps_trace_over_3)
@@ -86,7 +86,6 @@
real(kind=CUSTOM_REAL), dimension(N_SLS) :: alphaval,betaval,gammaval
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: R_memory
- logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: eps_trace_over_3
@@ -518,7 +517,7 @@
endif
! subtract memory variables if attenuation
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
! do NOT put this is a subroutine, otherwise the call to the subroutine prevents compilers from vectorizing the outer loop
do i_SLS = 1,N_SLS
R_xx_val = R_memory(1,i_SLS,i,j,k,ispec)
@@ -779,7 +778,7 @@
! equation (9.59) page 350): Q_\alpha = Q_\mu * 3 * (V_p/V_s)^2 / 4
! therefore Q_\alpha is not zero; for instance for V_p / V_s = sqrt(3)
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
! updates R_memory
epsilondev_loc_nsub1(1,:,:,:) = epsilondev(1,:,:,:,ispec)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -50,7 +50,7 @@
kappavstore,muvstore,ibool,idoubling, &
c11store,c33store,c12store,c13store,c44store,R_memory,one_minus_sum_beta,deltat, &
alphaval,betaval,gammaval,factor_common, &
- vnspec,PARTIAL_PHYS_DISPERSION_ONLY,&
+ vnspec,&
istage,R_memory_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev,eps_trace_over_3)
@@ -84,7 +84,6 @@
real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: R_memory
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ) :: epsilondev_loc,epsilondev_loc_nsub1
- logical :: PARTIAL_PHYS_DISPERSION_ONLY
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: epsilondev
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE_ATTENUATION) :: eps_trace_over_3
@@ -435,7 +434,7 @@
endif
! subtract memory variables if attenuation
- if(ATTENUATION_VAL .and. ( PARTIAL_PHYS_DISPERSION_ONLY .eqv. .false. ) ) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
do i_SLS = 1,N_SLS
R_xx_val = R_memory(1,i_SLS,i,j,k,ispec)
R_yy_val = R_memory(2,i_SLS,i,j,k,ispec)
@@ -659,7 +658,7 @@
! therefore Q_\alpha is not zero; for instance for V_p / V_s = sqrt(3)
! we get Q_\alpha = (9 / 4) * Q_\mu = 2.25 * Q_\mu
- if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY) then
+ if(ATTENUATION_VAL .and. .not. PARTIAL_PHYS_DISPERSION_ONLY_VAL) then
epsilondev_loc_nsub1(1,i,j,k) = epsilondev(1,i,j,k,ispec)
epsilondev_loc_nsub1(2,i,j,k) = epsilondev(2,i,j,k,ispec)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -319,7 +319,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -360,7 +360,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -397,7 +397,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -431,7 +431,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
@@ -615,7 +615,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -656,7 +656,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -693,7 +693,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -727,7 +727,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -348,7 +348,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -389,7 +389,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -426,7 +426,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -460,7 +460,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
@@ -640,7 +640,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -681,7 +681,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,deltat, &
alphaval,betaval,gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -718,7 +718,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -752,7 +752,7 @@
R_memory_inner_core,one_minus_sum_beta_inner_core,deltat, &
alphaval,betaval,gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -328,7 +328,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -369,7 +369,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -407,7 +407,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -441,7 +441,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
@@ -608,7 +608,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -649,7 +649,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -686,7 +686,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -720,7 +720,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90 2013-07-14 14:39:27 UTC (rev 22605)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90 2013-07-14 15:09:04 UTC (rev 22606)
@@ -359,7 +359,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -400,7 +400,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -438,7 +438,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -472,7 +472,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
@@ -673,7 +673,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
else
@@ -714,7 +714,7 @@
ibool_crust_mantle,ispec_is_tiso_crust_mantle, &
b_R_memory_crust_mantle,one_minus_sum_beta_crust_mantle,b_deltat, &
b_alphaval,b_betaval,b_gammaval,factor_common_crust_mantle, &
- size(factor_common_crust_mantle,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_crust_mantle,5),&
istage,R_memory_crust_mantle_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_crust_mantle,eps_trace_over_3_crust_mantle)
endif
@@ -751,7 +751,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
else
@@ -785,7 +785,7 @@
b_R_memory_inner_core,one_minus_sum_beta_inner_core,b_deltat, &
b_alphaval,b_betaval,b_gammaval, &
factor_common_inner_core, &
- size(factor_common_inner_core,5),PARTIAL_PHYS_DISPERSION_ONLY,&
+ size(factor_common_inner_core,5),&
istage,R_memory_inner_core_lddrk,tau_sigma_CUSTOM_REAL,USE_LDDRK,&
epsilondev_inner_core,eps_trace_over_3_inner_core)
endif
More information about the CIG-COMMITS
mailing list