[cig-commits] r21810 - in seismo/3D/SPECFEM3D/trunk/src: decompose_mesh generate_databases meshfem3D shared specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Wed Apr 10 20:24:34 PDT 2013
Author: dkomati1
Date: 2013-04-10 20:24:34 -0700 (Wed, 10 Apr 2013)
New Revision: 21810
Modified:
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90
seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90
seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90
seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_Dev.F90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90
Log:
done moving FULL_ATTENUATION_SOLID to the Par_file
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -43,7 +43,7 @@
STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE, &
ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION, &
LOCAL_PATH,TOMOGRAPHY_PATH,PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE, &
- f0_FOR_PML,IMODEL
+ f0_FOR_PML,IMODEL,FULL_ATTENUATION_SOLID
implicit none
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -45,7 +45,7 @@
ibelm_xmin, ibelm_xmax, ibelm_ymin, ibelm_ymax, ibelm_bottom, ibelm_top, &
nodes_ibelm_xmin,nodes_ibelm_xmax,nodes_ibelm_ymin,nodes_ibelm_ymax,&
nodes_ibelm_bottom,nodes_ibelm_top, &
- SAVE_MESH_FILES,PML_CONDITIONS, &
+ SAVE_MESH_FILES,PML_CONDITIONS,FULL_ATTENUATION_SOLID, &
ANISOTROPY,NPROC,APPROXIMATE_OCEAN_LOAD,OLSEN_ATTENUATION_RATIO, &
ATTENUATION,USE_OLSEN_ATTENUATION, &
nspec2D_moho_ext,ibelm_moho,nodes_ibelm_moho
@@ -277,7 +277,7 @@
if( ATTENUATION ) then
call get_attenuation_model(myrank,nspec,USE_OLSEN_ATTENUATION,OLSEN_ATTENUATION_RATIO, &
mustore,rho_vs,kappastore,rho_vp,qmu_attenuation_store, & !ZN
- ispec_is_elastic,min_resolved_period,prname)
+ ispec_is_elastic,min_resolved_period,prname,FULL_ATTENUATION_SOLID)
endif
! cleanup
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -63,7 +63,7 @@
logical :: ATTENUATION,USE_OLSEN_ATTENUATION,APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,SAVE_FORWARD,USE_FORCE_POINT_SOURCE
logical :: ANISOTROPY,STACEY_ABSORBING_CONDITIONS,SAVE_MESH_FILES,STACEY_INSTEAD_OF_FREE_SURFACE
- logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
+ logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
logical :: USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical :: MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT,USE_HIGHRES_FOR_MOVIES
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -106,7 +106,7 @@
APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE
logical ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
- logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
+ logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
integer NPROC
integer MOVIE_TYPE,IMODEL
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -339,7 +339,7 @@
APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE
logical ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
- logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
+ logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
integer MOVIE_TYPE,IMODEL
character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -99,7 +99,7 @@
APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
- logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
+ logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
integer :: IMODEL
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -114,7 +114,7 @@
subroutine get_attenuation_model(myrank,nspec,USE_OLSEN_ATTENUATION,OLSEN_ATTENUATION_RATIO, &
mustore,rho_vs,kappastore,rho_vp,qmu_attenuation_store, & !ZN
- ispec_is_elastic,min_resolved_period,prname)
+ ispec_is_elastic,min_resolved_period,prname,FULL_ATTENUATION_SOLID)
! precalculates attenuation arrays and stores arrays into files
@@ -155,6 +155,7 @@
real(kind=CUSTOM_REAL):: vs_val,vp_val !ZN
integer :: i,j,k,ispec,ier
double precision :: qmin,qmax,qmin_all,qmax_all
+ logical :: FULL_ATTENUATION_SOLID
! initializes arrays
allocate(one_minus_sum_beta(NGLLX,NGLLY,NGLLZ,nspec), &
@@ -263,8 +264,8 @@
! based on calculation of strain relaxation times tau_eps
call get_attenuation_factors(myrank,Q_mu,MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD, &
f_c_source,tau_sigma_dble, &
- beta_dble,one_minus_sum_beta_dble,factor_scale_dble,&
- Q_kappa,beta_dble_kappa,one_minus_sum_beta_dble_kappa,factor_scale_dble_kappa) !ZN
+ beta_dble,one_minus_sum_beta_dble,factor_scale_dble, &
+ Q_kappa,beta_dble_kappa,one_minus_sum_beta_dble_kappa,factor_scale_dble_kappa,FULL_ATTENUATION_SOLID)
! stores factor for unrelaxed parameter
one_minus_sum_beta(i,j,k,ispec) = one_minus_sum_beta_dble
@@ -416,8 +417,8 @@
subroutine get_attenuation_factors(myrank,Q_mu,MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD, &
f_c_source,tau_sigma, &
- beta,one_minus_sum_beta,factor_scale,& !ZN
- Q_kappa,beta_kappa,one_minus_sum_beta_kappa,factor_scale_kappa) !ZN
+ beta,one_minus_sum_beta,factor_scale, &
+ Q_kappa,beta_kappa,one_minus_sum_beta_kappa,factor_scale_kappa,FULL_ATTENUATION_SOLID)
! returns: attenuation mechanisms beta,one_minus_sum_beta,factor_scale
@@ -440,11 +441,11 @@
double precision, dimension(N_SLS) :: beta,beta_kappa !ZN
double precision :: one_minus_sum_beta,one_minus_sum_beta_kappa !ZN
double precision :: factor_scale,factor_scale_kappa !ZN
+ logical :: FULL_ATTENUATION_SOLID
! local parameters
double precision, dimension(N_SLS) :: tau_eps,tau_eps_kappa
-
! determines tau_eps for Q_mu
call get_attenuation_tau_eps(Q_mu,tau_sigma,tau_eps, &
MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD)
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -107,7 +107,7 @@
APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
- logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
+ logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
integer :: MOVIE_TYPE,IMODEL
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -114,7 +114,7 @@
APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
- logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
+ logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
! ============ program starts here =====================
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_Dev.F90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_Dev.F90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -26,7 +26,7 @@
! Deville routine for NGLL == 5 (default)
- subroutine compute_forces_viscoelastic_Dev_5p( iphase ,NSPEC_AB,NGLOB_AB, &
+ subroutine compute_forces_viscoelastic_Dev_5p(iphase,NSPEC_AB,NGLOB_AB, &
displ,veloc,accel, &
xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
hprime_xx,hprime_xxT, &
@@ -38,9 +38,7 @@
one_minus_sum_beta_kappa,factor_common_kappa,& !ZN
alphaval,betaval,gammaval,& !ZN
NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_Kappa, &
-!ZN R_xx,R_yy,R_xy,R_xz,R_yz, &
R_trace,R_xx,R_yy,R_xy,R_xz,R_yz, & !ZN
-!ZN epsilondev_xx,epsilondev_yy,epsilondev_xy, &
epsilondev_trace,epsilondev_xx,epsilondev_yy,epsilondev_xy, & !ZN
epsilondev_xz,epsilondev_yz,epsilon_trace_over_3, &
ANISOTROPY,NSPEC_ANISO, &
@@ -61,8 +59,9 @@
use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NDIM, &
N_SLS,SAVE_MOHO_MESH, &
- ONE_THIRD,FOUR_THIRDS,m1,m2,FULL_ATTENUATION_SOLID,CONST_Q_KAPPA,IOUT
+ ONE_THIRD,FOUR_THIRDS,m1,m2,CONST_Q_KAPPA,IOUT
use fault_solver_dynamic, only : Kelvin_Voigt_eta
+ use specfem_par, only : FULL_ATTENUATION_SOLID
implicit none
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -54,9 +54,10 @@
num_phase_ispec_elastic,nspec_inner_elastic,nspec_outer_elastic, &
phase_ispec_inner_elastic,ispec_is_elastic)
- use constants, only: NGLLX,NGLLY,NGLLZ,NDIM,N_SLS,SAVE_MOHO_MESH,ONE_THIRD,FOUR_THIRDS,FULL_ATTENUATION_SOLID,IOUT !ZN
+ use constants, only: NGLLX,NGLLY,NGLLZ,NDIM,N_SLS,SAVE_MOHO_MESH,ONE_THIRD,FOUR_THIRDS,IOUT
use pml_par
use fault_solver_dynamic, only : Kelvin_Voigt_eta
+ use specfem_par, only : FULL_ATTENUATION_SOLID
implicit none
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90 2013-04-11 02:58:21 UTC (rev 21809)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90 2013-04-11 03:24:34 UTC (rev 21810)
@@ -748,7 +748,6 @@
! and store NEW model files vp_new.bin vs_new.bin rho_new.bin vp_new.vtk vs_new.vtk rho_new.vtk
! calling save_external_bin_m_up with SAVE_MESH_FILES=true
! and also write NEW attenuation files attenuation.bin and attenuation.vtk (this should be equal to the old one)
- ! calling get_attenuation_model
!---------------------------------------------------------------------------------------------
if( myrank == 0 ) then
@@ -916,7 +915,7 @@
call sync_all()
- ! calculate min_resolved_period needed for get_attenuation_model
+ ! calculate min_resolved_period needed for attenuation model
call check_mesh_resolution(myrank,NSPEC,NGLOB,ibool,&
xstore,ystore,zstore, &
kappastore_new,mustore_new,rho_vp_new,rho_vs_new, &
@@ -934,7 +933,7 @@
if( ATTENUATION ) then
call get_attenuation_model(myrank,NSPEC,USE_OLSEN_ATTENUATION,OLSEN_ATTENUATION_RATIO, &
mustore_new,rho_vs_new,kappastore_new,rho_vp_new,qmu_attenuation_store, & !ZN
- ispec_is_elastic,min_resolved_period,prname_new)
+ ispec_is_elastic,min_resolved_period,prname_new,FULL_ATTENUATION_SOLID)
endif
!----------------------------
More information about the CIG-COMMITS
mailing list