[cig-commits] r21770 - in seismo/3D/SPECFEM3D/trunk/src: generate_databases shared specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Mon Apr 8 10:54:11 PDT 2013
Author: dkomati1
Date: 2013-04-08 10:54:10 -0700 (Mon, 08 Apr 2013)
New Revision: 21770
Modified:
seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90
seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_Dev.F90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_noDev.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_memory_variables.f90
Log:
added these CPML flags for clarity:
! flags for the seven CPML regions
integer, parameter :: CPML_X_ONLY = 1
integer, parameter :: CPML_Y_ONLY = 2
integer, parameter :: CPML_Z_ONLY = 3
integer, parameter :: CPML_XY_ONLY = 4
integer, parameter :: CPML_XZ_ONLY = 5
integer, parameter :: CPML_YZ_ONLY = 6
integer, parameter :: CPML_XYZ = 7
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90 2013-04-08 17:38:37 UTC (rev 21769)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90 2013-04-08 17:54:10 UTC (rev 21770)
@@ -175,7 +175,7 @@
iglob = ibool(i,j,k,ispec)
- if( CPML_regions(ispec_CPML) == 1 ) then
+ if( CPML_regions(ispec_CPML) == CPML_X_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- X-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -233,7 +233,7 @@
alpha_store(i,j,k,ispec_CPML) = alpha_x
- elseif( CPML_regions(ispec_CPML) == 2 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_Y_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Y-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -289,7 +289,7 @@
alpha_store(i,j,k,ispec_CPML) = alpha_y
- elseif( CPML_regions(ispec_CPML) == 3 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_Z_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Z-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -346,7 +346,7 @@
alpha_store(i,j,k,ispec_CPML) = alpha_z
- elseif( CPML_regions(ispec_CPML) == 4 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_XY_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XY-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -507,7 +507,7 @@
alpha_store(i,j,k,ispec_CPML) = ALPHA_MAX_PML / 2.d0
- elseif( CPML_regions(ispec_CPML) == 5 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_XZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -671,7 +671,7 @@
alpha_store(i,j,k,ispec_CPML) = ALPHA_MAX_PML / 2.d0
- elseif( CPML_regions(ispec_CPML) == 6 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_YZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- YZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -834,7 +834,7 @@
alpha_store(i,j,k,ispec_CPML) = ALPHA_MAX_PML / 2.d0
- elseif( CPML_regions(ispec_CPML) == 7 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_XYZ ) then
!------------------------------------------------------------------------------
!---------------------------- XYZ-corner C-PML --------------------------------
!------------------------------------------------------------------------------
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in 2013-04-08 17:38:37 UTC (rev 21769)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in 2013-04-08 17:54:10 UTC (rev 21770)
@@ -161,11 +161,14 @@
! empirical damping modified factor
real(kind=CUSTOM_REAL), parameter :: damping_factor = 1.2d0
-! absorb boundaries using a PML region
-! (EXPERIMENTAL feature)
-! (only acoustic domains supported...)
-! (user parameters can be specified in PML_init.f90)
- logical,parameter :: ABSORB_USE_PML = .false.
+! flags for the seven CPML regions
+ integer, parameter :: CPML_X_ONLY = 1
+ integer, parameter :: CPML_Y_ONLY = 2
+ integer, parameter :: CPML_Z_ONLY = 3
+ integer, parameter :: CPML_XY_ONLY = 4
+ integer, parameter :: CPML_XZ_ONLY = 5
+ integer, parameter :: CPML_YZ_ONLY = 6
+ integer, parameter :: CPML_XYZ = 7
!!-----------------------------------------------------------
!!
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_Dev.F90 2013-04-08 17:38:37 UTC (rev 21769)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_Dev.F90 2013-04-08 17:54:10 UTC (rev 21770)
@@ -40,7 +40,7 @@
! note that pressure is defined as:
! p = - Chi_dot_dot
!
- use specfem_par,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,TINYVAL_SNGL,ABSORB_USE_PML, &
+ use specfem_par,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,TINYVAL_SNGL, &
STACEY_ABSORBING_CONDITIONS,PML_CONDITIONS,m1,m2,NGLLCUBE
implicit none
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_noDev.f90 2013-04-08 17:38:37 UTC (rev 21769)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_acoustic_noDev.f90 2013-04-08 17:54:10 UTC (rev 21770)
@@ -41,7 +41,7 @@
! note that pressure is defined as:
! p = - Chi_dot_dot
!
- use specfem_par,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,TINYVAL_SNGL,ABSORB_USE_PML,STACEY_ABSORBING_CONDITIONS,PML_CONDITIONS
+ use specfem_par,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,TINYVAL_SNGL,STACEY_ABSORBING_CONDITIONS,PML_CONDITIONS
use pml_par
implicit none
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90 2013-04-08 17:38:37 UTC (rev 21769)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90 2013-04-08 17:54:10 UTC (rev 21770)
@@ -74,7 +74,7 @@
iglob = ibool(i,j,k,ispec)
- if( CPML_regions(ispec_CPML) == 1 ) then
+ if( CPML_regions(ispec_CPML) == CPML_X_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- X-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -163,7 +163,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == 2 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_Y_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Y-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -252,7 +252,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == 3 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_Z_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Z-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -341,7 +341,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == 4 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_XY_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XY-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -455,7 +455,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == 5 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_XZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -569,7 +569,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == 6 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_YZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- YZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -683,7 +683,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == 7 ) then
+ elseif( CPML_regions(ispec_CPML) == CPML_XYZ ) then
!------------------------------------------------------------------------------
!---------------------------- XYZ-corner C-PML --------------------------------
!------------------------------------------------------------------------------
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_memory_variables.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_memory_variables.f90 2013-04-08 17:38:37 UTC (rev 21769)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_memory_variables.f90 2013-04-08 17:54:10 UTC (rev 21770)
@@ -87,7 +87,7 @@
gammazl = gammaz(i,j,k,ispec)
jacobianl = jacobian(i,j,k,ispec)
- if( CPML_regions(ispec_CPML) == 1 ) then
+ if( CPML_regions(ispec_CPML) == CPML_X_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- X-surface C-PML ---------------------------------
@@ -361,7 +361,7 @@
tempz3(i,j,k) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
endif
- else if( CPML_regions(ispec_CPML) == 2 ) then
+ else if( CPML_regions(ispec_CPML) == CPML_Y_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Y-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -633,7 +633,7 @@
tempz3(i,j,k) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
endif
- else if( CPML_regions(ispec_CPML) == 3 ) then
+ else if( CPML_regions(ispec_CPML) == CPML_Z_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Z-surface C-PML ---------------------------------
@@ -905,7 +905,7 @@
tempz3(i,j,k) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
endif
- else if( CPML_regions(ispec_CPML) == 4 ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XY_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XY-edge C-PML -----------------------------------
@@ -1216,7 +1216,7 @@
tempz3(i,j,k) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
endif
- else if( CPML_regions(ispec_CPML) == 5 ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XZ-edge C-PML -----------------------------------
@@ -1527,7 +1527,7 @@
tempz3(i,j,k) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
endif
- else if( CPML_regions(ispec_CPML) == 6 ) then
+ else if( CPML_regions(ispec_CPML) == CPML_YZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- YZ-edge C-PML -----------------------------------
@@ -1837,7 +1837,7 @@
tempz3(i,j,k) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
endif
- else if( CPML_regions(ispec_CPML) == 7 ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XYZ ) then
!------------------------------------------------------------------------------
!---------------------------- XYZ-corner C-PML --------------------------------
More information about the CIG-COMMITS
mailing list