[cig-commits] r22648 - in seismo/3D/SPECFEM3D_GLOBE/trunk: setup src/meshfem3D src/shared src/specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sat Jul 20 06:15:21 PDT 2013
Author: dkomati1
Date: 2013-07-20 06:15:20 -0700 (Sat, 20 Jul 2013)
New Revision: 22648
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/setup/constants.h.in
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
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:
added ATTENUATION_1D_WITH_3D_STORAGE_VAL to setup/constants.h.in
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/setup/constants.h.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/setup/constants.h.in 2013-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/setup/constants.h.in 2013-07-20 13:15:20 UTC (rev 22648)
@@ -709,3 +709,7 @@
(/0.0_CUSTOM_REAL,0.032918605146_CUSTOM_REAL,0.249351723343_CUSTOM_REAL,&
0.466911705055_CUSTOM_REAL,0.582030414044_CUSTOM_REAL,0.847252983783_CUSTOM_REAL/)
+!! DK DK temporary fix for 1D attenuation arrays
+ logical, parameter :: ATTENUATION_1D_WITH_3D_STORAGE = .true.
+ logical, parameter :: ATTENUATION_1D_WITH_3D_STORAGE_VAL = ATTENUATION_1D_WITH_3D_STORAGE
+
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90 2013-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90 2013-07-20 13:15:20 UTC (rev 22648)
@@ -320,7 +320,7 @@
endif ! of CUSTOM_REAL
if(ATTENUATION) then
- if(ATTENUATION_3D) then
+ if(ATTENUATION_3D .or. ATTENUATION_1D_WITH_3D_STORAGE) then
tau_e_store(:,i,j,k,ispec) = tau_e(:)
Qmu_store(i,j,k,ispec) = Qmu
else
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90 2013-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90 2013-07-20 13:15:20 UTC (rev 22648)
@@ -370,7 +370,7 @@
if(ATTENUATION) then
!! DK DK July 2013: to save a huge amount of memory, when 3D attenuation is off it is sufficient to save a single point
!! DK DK July 2013: per spectral element because the Q attenuation factor is then constant per layer of the geological model
- if(ATTENUATION_3D) then
+ if(ATTENUATION_3D .or. ATTENUATION_1D_WITH_3D_STORAGE) then
ATT1 = NGLLX
ATT2 = NGLLY
ATT3 = NGLLZ
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90 2013-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_element.F90 2013-07-20 13:15:20 UTC (rev 22648)
@@ -181,7 +181,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -389,7 +389,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -705,7 +705,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -1099,7 +1099,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -1592,7 +1592,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL) then
+ if(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
@@ -1836,7 +1836,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL) then
+ if(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
@@ -2092,7 +2092,7 @@
! reformatted R_memory to handle large factor_common and reduced [alpha,beta,gamma]val
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -2240,7 +2240,7 @@
do i_SLS = 1,N_SLS
- if(ATTENUATION_3D_VAL) then
+ if(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-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-20 13:15:20 UTC (rev 22648)
@@ -379,7 +379,7 @@
endif
! precompute terms for attenuation if needed
- if(ATTENUATION_3D_VAL) then
+ if(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
@@ -919,7 +919,7 @@
! reformatted R_memory to handle large factor_common and reduced [alpha,beta,gamma]val
- if(ATTENUATION_3D_VAL) then
+ if(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-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-07-20 13:15:20 UTC (rev 22648)
@@ -440,7 +440,7 @@
eps_trace_over_3(ijk,1,1,ispec) = templ
endif
- if(ATTENUATION_3D_VAL) then
+ if(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
@@ -493,7 +493,7 @@
mul = muvstore(ijk,1,1,ispec)
! use unrelaxed parameters if attenuation
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -695,7 +695,7 @@
eps_trace_over_3(i,j,k,ispec) = templ
endif
- if(ATTENUATION_3D_VAL) then
+ if(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
@@ -748,7 +748,7 @@
mul = muvstore(i,j,k,ispec)
! use unrelaxed parameters if attenuation
- if(ATTENUATION_3D_VAL) then
+ if(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-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-07-20 13:15:20 UTC (rev 22648)
@@ -357,7 +357,7 @@
eps_trace_over_3(i,j,k,ispec) = templ
endif
- if(ATTENUATION_3D_VAL) then
+ if(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
@@ -412,7 +412,7 @@
mul = muvstore(i,j,k,ispec)
! use unrelaxed parameters if attenuation
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -668,7 +668,7 @@
do i_SLS = 1,N_SLS
- if(ATTENUATION_3D_VAL) then
+ if(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-07-18 13:54:23 UTC (rev 22647)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90 2013-07-20 13:15:20 UTC (rev 22648)
@@ -745,7 +745,7 @@
do j=1,NGLLY
do i=1,NGLLX
- if(ATTENUATION_3D_VAL) then
+ if(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)
@@ -799,7 +799,7 @@
do j=1,NGLLY
do i=1,NGLLX
- if(ATTENUATION_3D_VAL) then
+ if(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
@@ -819,7 +819,7 @@
+ scale_factor_minus_one * mul
endif
- if(ATTENUATION_3D_VAL) then
+ if(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