[cig-commits] r22509 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: meshfem3D shared specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Fri Jul 5 17:37:00 PDT 2013
Author: dkomati1
Date: 2013-07-05 17:37:00 -0700 (Fri, 05 Jul 2013)
New Revision: 22509
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/get_model_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_boundary_kernel.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_kernels.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
Log:
removed old 'idoubling' comments, now that idoubling is not used in crust_mantle any more
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.F90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/create_regions_mesh.F90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -767,12 +767,11 @@
! count number of anisotropic elements in current region
! should be zero in all the regions except in the mantle
! (used only for checks in meshfem3D() routine)
- !nspec_tiso = count(idoubling(1:nspec) == IFLAG_220_80) + count(idoubling(1:nspec) == IFLAG_80_MOHO)
nspec_tiso = count(ispec_is_tiso(:))
if(SORT_MESH_INNER_OUTER) then
-!!!! David Michea: detection of the edges, coloring and permutation separately
+! detection of the edges, coloring and permutation separately
allocate(perm(nspec))
! implement mesh coloring for GPUs if needed, to create subsets of disconnected elements
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/get_model_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/get_model_parameters.f90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/get_model_parameters.f90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -452,11 +452,6 @@
REFERENCE_1D_MODEL == REFERENCE_MODEL_SEA1D) .and. TRANSVERSE_ISOTROPY) &
stop 'models IASP91, AK135, 1066A, JP1D and SEA1D are currently isotropic'
- ! checks that 3D attenuation models use 3D arrays
- if( ATTENUATION_3D .and. ( .not. USE_3D_ATTENUATION_ARRAYS )) then
- stop '3D attenuation models need 3D attenuation arrays'
- endif
-
end subroutine get_model_parameters_flags
!
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -260,8 +260,7 @@
! ibool_outer_core
static_memory_size = static_memory_size + dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC(IREGION_OUTER_CORE)*dble(SIZE_INTEGER)
-! idoubling_crust_mantle (not needed anymore..)
-! static_memory_size = static_memory_size + NSPEC(IREGION_CRUST_MANTLE)*dble(SIZE_INTEGER)
+! idoubling_crust_mantle is not used anymore (the array does not exist anymore)
! idoubling_outer_core
static_memory_size = static_memory_size + NSPEC(IREGION_OUTER_CORE)*dble(SIZE_INTEGER)
! idoubling_inner_core
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_boundary_kernel.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_boundary_kernel.f90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_boundary_kernel.f90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -42,7 +42,6 @@
real(kind=CUSTOM_REAL), dimension(NDIM,*) :: displ,accel,b_displ
integer nspec, iregion_code
integer, dimension(NGLLX,NGLLY,NGLLZ,nspec) :: ibool
-! integer, dimension(*) :: idoubling
logical, dimension(*) :: ispec_is_tiso
real(kind=CUSTOM_REAL), dimension(*) :: ystore,zstore
@@ -129,7 +128,7 @@
c11store,c12store,c13store,c14store,c15store,c16store,c22store, &
c23store,c24store,c25store,c26store,c33store,c34store,c35store, &
c36store,c44store,c45store,c46store,c55store,c56store,c66store, &
- ystore,zstore,ibool,ispec_is_tiso) !idoubling)
+ ystore,zstore,ibool,ispec_is_tiso)
! ----- forward strain -------
temp1(:) = matmul(b_displl(:,:,j,k), hprime_xx(i,:))
@@ -154,7 +153,7 @@
c11store,c12store,c13store,c14store,c15store,c16store,c22store, &
c23store,c24store,c25store,c26store,c33store,c34store,c35store, &
c36store,c44store,c45store,c46store,c55store,c56store,c66store, &
- ystore,zstore,ibool,ispec_is_tiso) !-- idoubling)
+ ystore,zstore,ibool,ispec_is_tiso)
! ---- precompute K_d for F-S boundaries ----
if (fluid_solid_boundary) then
@@ -236,9 +235,8 @@
c11store,c12store,c13store,c14store,c15store,c16store,c22store, &
c23store,c24store,c25store,c26store,c33store,c34store,c35store, &
c36store,c44store,c45store,c46store,c55store,c56store,c66store, &
- ystore,zstore,ibool,ispec_is_tiso) !--idoubling)
+ ystore,zstore,ibool,ispec_is_tiso)
-
implicit none
include 'constants.h'
@@ -254,7 +252,6 @@
c36store,c44store,c45store,c46store,c55store,c56store,c66store
real(kind=CUSTOM_REAL), dimension(*) :: ystore,zstore
integer, dimension(NGLLX,NGLLY,NGLLZ,*) :: ibool
-! integer, dimension(*) :: idoubling
logical, dimension(*) :: ispec_is_tiso
! --- local variables ---
@@ -333,7 +330,6 @@
c45*duzdxl_plus_duxdzl + c44*duzdyl_plus_duydzl + c34*duzdzl
else if( .not. ispec_is_tiso(ispec) ) then
-!else if(.not. (TRANSVERSE_ISOTROPY_VAL .and. (idoubling(ispec) == IFLAG_80_MOHO .or. idoubling(ispec) == IFLAG_220_80))) then
! isotropic elements
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-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -64,28 +64,7 @@
! done for performance only using static allocation to allow for loop unrolling
include "OUTPUT_FILES/values_from_mesher.h"
-! model_attenuation_variables
-! type model_attenuation_variables
-! sequence
-! double precision min_period, max_period
-! double precision :: QT_c_source ! Source Frequency
-! double precision, dimension(:), pointer :: Qtau_s ! tau_sigma
-! double precision, dimension(:), pointer :: QrDisc ! Discontinutitues Defined
-! double precision, dimension(:), pointer :: Qr ! Radius
-! double precision, dimension(:), pointer :: Qmu ! Shear Attenuation
-! double precision, dimension(:,:), pointer :: Qtau_e ! tau_epsilon
-! double precision, dimension(:), pointer :: Qomsb, Qomsb2 ! one_minus_sum_beta
-! double precision, dimension(:,:), pointer :: Qfc, Qfc2 ! factor_common
-! double precision, dimension(:), pointer :: Qsf, Qsf2 ! scale_factor
-! integer, dimension(:), pointer :: Qrmin ! Max and Mins of idoubling
-! integer, dimension(:), pointer :: Qrmax ! Max and Mins of idoubling
-! integer, dimension(:), pointer :: interval_Q ! Steps
-! integer :: Qn ! Number of points
-! integer dummy_pad ! padding 4 bytes to align the structure
-! end type model_attenuation_variables
-
! array with the local to global mapping per slice
-! integer, dimension(NSPEC_CRUST_MANTLE) :: idoubling
logical, dimension(NSPEC_CRUST_MANTLE) :: ispec_is_tiso
! displacement and acceleration
@@ -469,7 +448,6 @@
else
! do not use transverse isotropy except if element is between d220 and Moho
-! if(.not. (TRANSVERSE_ISOTROPY_VAL .and. (idoubling(ispec)==IFLAG_220_80 .or. idoubling(ispec)==IFLAG_80_MOHO))) then
if( .not. ispec_is_tiso(ispec) ) then
! layer with no transverse isotropy, use kappav and muv
kappal = kappavstore(i,j,k,ispec)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/prepare_timerun.f90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -540,7 +540,6 @@
c33store_crust_mantle,c44store_crust_mantle, &
c55store_crust_mantle,c66store_crust_mantle, &
muvstore_crust_mantle,muhstore_crust_mantle,ispec_is_tiso_crust_mantle, &
- !----- idoubling_crust_mantle, &
muvstore_inner_core, &
SIMULATION_TYPE,MOVIE_VOLUME,muvstore_crust_mantle_3dmovie, &
c11store_inner_core,c12store_inner_core,c13store_inner_core, &
@@ -573,7 +572,6 @@
muvstore_crust_mantle
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPECMAX_TISO_MANTLE) :: &
muhstore_crust_mantle
-! integer, dimension(NSPEC_CRUST_MANTLE) :: idoubling_crust_mantle
logical, dimension(NSPEC_CRUST_MANTLE) :: ispec_is_tiso_crust_mantle
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: &
@@ -668,8 +666,6 @@
muvstore_crust_mantle(i,j,k,ispec) = muvstore_crust_mantle(i,j,k,ispec) * scale_factor
! scales transverse isotropic values for mu_h
- !if(TRANSVERSE_ISOTROPY_VAL .and. (idoubling_crust_mantle(ispec) == IFLAG_220_80 &
- ! .or. idoubling_crust_mantle(ispec) == IFLAG_80_MOHO)) &
if( ispec_is_tiso_crust_mantle(ispec) ) then
muhstore_crust_mantle(i,j,k,ispec) = muhstore_crust_mantle(i,j,k,ispec) * scale_factor
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_kernels.f90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_kernels.f90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -33,7 +33,6 @@
kappavstore_crust_mantle,ibool_crust_mantle, &
kappahstore_crust_mantle,muhstore_crust_mantle, &
eta_anisostore_crust_mantle,ispec_is_tiso_crust_mantle, &
- ! --idoubling_crust_mantle, &
LOCAL_PATH)
implicit none
@@ -60,7 +59,6 @@
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPECMAX_TISO_MANTLE) :: &
kappahstore_crust_mantle,muhstore_crust_mantle,eta_anisostore_crust_mantle
-! integer, dimension(NSPEC_CRUST_MANTLE) :: idoubling_crust_mantle
logical, dimension(NSPEC_CRUST_MANTLE) :: ispec_is_tiso_crust_mantle
integer, dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE) :: ibool_crust_mantle
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -35,7 +35,6 @@
kappavstore_crust_mantle,ibool_crust_mantle, &
kappahstore_crust_mantle,muhstore_crust_mantle, &
eta_anisostore_crust_mantle,ispec_is_tiso_crust_mantle, &
- ! --idoubling_crust_mantle, &
LOCAL_PATH)
implicit none
@@ -68,7 +67,6 @@
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPECMAX_TISO_MANTLE) :: &
kappahstore_crust_mantle,muhstore_crust_mantle,eta_anisostore_crust_mantle
-! integer, dimension(NSPEC_CRUST_MANTLE) :: idoubling_crust_mantle
logical, dimension(NSPEC_CRUST_MANTLE) :: ispec_is_tiso_crust_mantle
integer, dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE) :: ibool_crust_mantle
@@ -207,9 +205,6 @@
! Get A,C,F,L,N,eta from kappa,mu
! element can have transverse isotropy if between d220 and Moho
- !if( .not. (TRANSVERSE_ISOTROPY_VAL .and. &
- ! (idoubling_crust_mantle(ispec) == IFLAG_80_MOHO .or. &
- ! idoubling_crust_mantle(ispec) == IFLAG_220_80))) then
if( .not. ispec_is_tiso_crust_mantle(ispec) ) then
! layer with no transverse isotropy
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90 2013-07-05 22:17:58 UTC (rev 22508)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90 2013-07-06 00:37:00 UTC (rev 22509)
@@ -534,7 +534,6 @@
c55store_crust_mantle,c56store_crust_mantle,c66store_crust_mantle
! local to global mapping
-! integer, dimension(NSPEC_CRUST_MANTLE) :: idoubling_crust_mantle
logical, dimension(NSPEC_CRUST_MANTLE) :: ispec_is_tiso_crust_mantle
! mass matrices
@@ -1382,7 +1381,7 @@
if (myrank==0) then
write(IMAIN,*) ' '
- write(IMAIN,*) 'Finish locating kernel output regular grid'
+ write(IMAIN,*) 'Finished locating kernel output regular grid'
write(IMAIN,*) ' '
endif
endif
More information about the CIG-COMMITS
mailing list