[cig-commits] r22714 - seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Aug 18 11:50:20 PDT 2013
Author: dkomati1
Date: 2013-08-18 11:50:20 -0700 (Sun, 18 Aug 2013)
New Revision: 22714
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.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/prepare_timerun.f90
Log:
changed
if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
to
if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
to avoid out-of-bound array access when ATTENUATION is off
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90 2013-08-18 13:40:10 UTC (rev 22713)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90 2013-08-18 18:50:20 UTC (rev 22714)
@@ -183,7 +183,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
one_minus_sum_beta_use = one_minus_sum_beta(ijk,1,1,ispec)
else if(ATTENUATION_VAL) then
one_minus_sum_beta_use = one_minus_sum_beta(1,1,1,ispec)
@@ -391,7 +391,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
one_minus_sum_beta_use = one_minus_sum_beta(i,j,k,ispec)
else if(ATTENUATION_VAL) then
one_minus_sum_beta_use = one_minus_sum_beta(1,1,1,ispec)
@@ -709,7 +709,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
one_minus_sum_beta_use = one_minus_sum_beta(ijk,1,1,ispec)
else if(ATTENUATION_VAL) then
one_minus_sum_beta_use = one_minus_sum_beta(1,1,1,ispec)
@@ -1103,7 +1103,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
one_minus_sum_beta_use = one_minus_sum_beta(i,j,k,ispec)
else if(ATTENUATION_VAL) then
one_minus_sum_beta_use = one_minus_sum_beta(1,1,1,ispec)
@@ -1598,7 +1598,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
one_minus_sum_beta_use = one_minus_sum_beta(ijk,1,1,ispec)
minus_sum_beta = one_minus_sum_beta_use - 1.0_CUSTOM_REAL
else if(ATTENUATION_VAL) then
@@ -1842,7 +1842,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
one_minus_sum_beta_use = one_minus_sum_beta(i,j,k,ispec)
minus_sum_beta = one_minus_sum_beta_use - 1.0_CUSTOM_REAL
else if(ATTENUATION_VAL) then
@@ -2098,7 +2098,7 @@
! reformatted R_memory to handle large factor_common and reduced [alpha,beta,gamma]val
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
#ifdef FORCE_VECTORIZATION
do ijk=1,NGLLCUBE
factor_common_c44_muv(ijk,1,1) = factor_common(i_SLS,ijk,1,1,ispec)
@@ -2246,7 +2246,7 @@
do i_SLS = 1,N_SLS
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
if(USE_LDDRK) then
do i_memory = 1,5
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-08-18 13:40:10 UTC (rev 22713)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-08-18 18:50:20 UTC (rev 22714)
@@ -381,7 +381,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
one_minus_sum_beta_use = one_minus_sum_beta(i,j,k,ispec)
minus_sum_beta = one_minus_sum_beta_use - 1.0
else if(ATTENUATION_VAL) then
@@ -921,7 +921,7 @@
! reformatted R_memory to handle large factor_common and reduced [alpha,beta,gamma]val
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
do k = 1,NGLLZ
do j = 1,NGLLZ
do i = 1,NGLLZ
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-08-18 13:40:10 UTC (rev 22713)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-08-18 18:50:20 UTC (rev 22714)
@@ -442,7 +442,7 @@
eps_trace_over_3(ijk,1,1,ispec) = templ
endif
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
minus_sum_beta = one_minus_sum_beta(ijk,1,1,ispec) - 1.0_CUSTOM_REAL
else if(ATTENUATION_VAL) then
minus_sum_beta = one_minus_sum_beta(1,1,1,ispec) - 1.0_CUSTOM_REAL
@@ -495,7 +495,7 @@
mul = muvstore(ijk,1,1,ispec)
! use unrelaxed parameters if attenuation
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
mul = mul * one_minus_sum_beta(ijk,1,1,ispec)
else if(ATTENUATION_VAL) then
mul = mul * one_minus_sum_beta(1,1,1,ispec)
@@ -697,7 +697,7 @@
eps_trace_over_3(i,j,k,ispec) = templ
endif
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
minus_sum_beta = one_minus_sum_beta(i,j,k,ispec) - 1.0_CUSTOM_REAL
else if(ATTENUATION_VAL) then
minus_sum_beta = one_minus_sum_beta(1,1,1,ispec) - 1.0_CUSTOM_REAL
@@ -750,7 +750,7 @@
mul = muvstore(i,j,k,ispec)
! use unrelaxed parameters if attenuation
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
mul = mul * one_minus_sum_beta(i,j,k,ispec)
else if(ATTENUATION_VAL) then
mul = mul * one_minus_sum_beta(1,1,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-08-18 13:40:10 UTC (rev 22713)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-08-18 18:50:20 UTC (rev 22714)
@@ -359,7 +359,7 @@
eps_trace_over_3(i,j,k,ispec) = templ
endif
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
minus_sum_beta = one_minus_sum_beta(i,j,k,ispec) - 1.0
else if(ATTENUATION_VAL) then
minus_sum_beta = one_minus_sum_beta(1,1,1,ispec) - 1.0
@@ -414,7 +414,7 @@
mul = muvstore(i,j,k,ispec)
! use unrelaxed parameters if attenuation
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
mul = mul * one_minus_sum_beta(i,j,k,ispec)
else if(ATTENUATION_VAL) then
mul = mul * one_minus_sum_beta(1,1,1,ispec)
@@ -670,7 +670,7 @@
do i_SLS = 1,N_SLS
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
do k = 1,NGLLZ
do j = 1,NGLLZ
do i = 1,NGLLZ
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90 2013-08-18 13:40:10 UTC (rev 22713)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90 2013-08-18 18:50:20 UTC (rev 22714)
@@ -746,7 +746,7 @@
do j=1,NGLLY
do i=1,NGLLX
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
scale_factor = factor_scale_crust_mantle(i,j,k,ispec)
else
scale_factor = factor_scale_crust_mantle(1,1,1,ispec)
@@ -800,7 +800,7 @@
do j=1,NGLLY
do i=1,NGLLX
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
scale_factor_minus_one = factor_scale_inner_core(i,j,k,ispec) - 1.0
else
scale_factor_minus_one = factor_scale_inner_core(1,1,1,ispec) - 1.0
@@ -820,7 +820,7 @@
+ scale_factor_minus_one * mul
endif
- if(ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL) then
+ if(ATTENUATION_VAL .and. (ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL)) then
muvstore_inner_core(i,j,k,ispec) = muvstore_inner_core(i,j,k,ispec) * factor_scale_inner_core(i,j,k,ispec)
else
muvstore_inner_core(i,j,k,ispec) = muvstore_inner_core(i,j,k,ispec) * factor_scale_inner_core(1,1,1,ispec)
More information about the CIG-COMMITS
mailing list