[cig-commits] [commit] devel: removed USE_GUENNEAU (037544b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Feb 18 14:55:48 PST 2014
Repository : ssh://geoshell/specfem2d
On branch : devel
Link : https://github.com/geodynamics/specfem2d/compare/3bae725501ad5989ffbc8b45021f2471cb801bad...cdb75e3d25498690e7bec83c6968ef273427b044
>---------------------------------------------------------------
commit 037544b491cb770758f22f6ba5dbde5f2b7fa834
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Tue Feb 18 23:49:45 2014 +0100
removed USE_GUENNEAU
>---------------------------------------------------------------
037544b491cb770758f22f6ba5dbde5f2b7fa834
flags.guess | 5 +++--
src/specfem2D/compute_forces_viscoelastic.F90 | 22 ----------------------
src/specfem2D/invert_mass_matrix.F90 | 22 +---------------------
src/specfem2D/specfem2D.F90 | 4 ----
4 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/flags.guess b/flags.guess
index 971c632..b53faac 100644
--- a/flags.guess
+++ b/flags.guess
@@ -42,13 +42,14 @@ case $FC in
# I/O throughput lingers at 2.5 MB/s, with it it can increase to ~44 MB/s
# However it does not make much of a difference on NFS mounted volumes or with SFS 3.1.1 / Lustre 1.6.7.1
if test x"$FLAGS_CHECK" = x; then
- FLAGS_CHECK="-O3 -check nobounds -xHost -ftz -assume buffered_io -assume byterecl -align sequence -vec-report0 -std03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage"
+ #FLAGS_CHECK="-O3 -check nobounds -xHost -ftz -assume buffered_io -assume byterecl -align sequence -vec-report0 -std03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage"
+ FLAGS_CHECK="-check all -debug -g -O0 -fp-stack-check -traceback -ftrapuv -xHost -ftz -assume buffered_io -assume byterecl -align sequence -vec-report0 -std03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage"
fi
# useful for debugging...
# for debugging: change -O3 -check nobounds to -check all -debug -g -O0 -fp-stack-check -traceback -ftrapuv
#
## DK DK
-## DK DK two other flags that can be useful: USE_BINARY_FOR_EXTERNAL_MESH_DATABASE USE_GUENNEAU
+## DK DK another flag that can be useful: USE_BINARY_FOR_EXTERNAL_MESH_DATABASE
## DK DK
;;
gfortran|*/gfortran|f95|*/f95)
diff --git a/src/specfem2D/compute_forces_viscoelastic.F90 b/src/specfem2D/compute_forces_viscoelastic.F90
index a18c93f..caa0bad 100644
--- a/src/specfem2D/compute_forces_viscoelastic.F90
+++ b/src/specfem2D/compute_forces_viscoelastic.F90
@@ -167,17 +167,6 @@ subroutine compute_forces_viscoelastic(p_sv,nglob,nspec,myrank,nelemabs,numat, &
real(kind=CUSTOM_REAL) :: nx,nz,vx,vy,vz,vn,rho_vp,rho_vs,tx,ty,tz,weight,xxi,zxi,xgamma,zgamma,jacobian1D
real(kind=CUSTOM_REAL) :: displx,disply,displz,displn,spring_position,displtx,displty,displtz
-!! DK DK added this for Guenneau, March 2012
-#ifdef USE_GUENNEAU
- integer :: kmato_ispec_outside_Guenneau
- real(kind=CUSTOM_REAL) :: ct, st, r, a, inva, lambda, mu, x, y, &
- lambdaplus2mu, ct2 , ct3 , ct4 , twoct2 , st2 , st3 , st4
- real(kind=CUSTOM_REAL) :: epsilon_xx,epsilon_xz,epsilon_zx,epsilon_zz
- real(kind=CUSTOM_REAL) :: C1111, C1112, C1121, C1122, C1211, C1212, C1221, C1222, C2111, C2112, C2121, &
- C2122, C2211, C2212, C2221, C2222
-#endif
-!! DK DK added this for Guenneau, March 2012
-
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLZ) :: tempx1,tempx2,tempy1,tempy2,tempz1,tempz2
! Jacobian matrix and determinant
@@ -747,12 +736,6 @@ subroutine compute_forces_viscoelastic(p_sv,nglob,nspec,myrank,nelemabs,numat, &
sigma_zz = lambdaplus2mu_unrelaxed_elastic*duz_dzl + lambdal_unrelaxed_elastic*dux_dxl
sigma_zx = sigma_xz
-!! DK DK added this for Guenneau, March 2012
-#ifdef USE_GUENNEAU
- include "include_stiffness_Guenneau.f90"
-#endif
-!! DK DK added this for Guenneau, March 2012
-
if(PML_BOUNDARY_CONDITIONS .and. is_PML(ispec) .and. nspec_PML > 0) then
if(ROTATE_PML_ACTIVATE)then
theta = -ROTATE_PML_ANGLE/180._CUSTOM_REAL*Pi
@@ -820,11 +803,6 @@ subroutine compute_forces_viscoelastic(p_sv,nglob,nspec,myrank,nelemabs,numat, &
sigma_xz = c15*dux_dxl + c35*duz_dzl + c55*(duz_dxl + dux_dzl)
endif
-! the stress tensor is symmetric by default, unless defined otherwise
-#ifdef USE_GUENNEAU
- sigma_zx = sigma_xz
-#endif
-
! weak formulation term based on stress tensor (non-symmetric form)
! also add GLL integration weights
jacobianl = jacobian(i,j,ispec)
diff --git a/src/specfem2D/invert_mass_matrix.F90 b/src/specfem2D/invert_mass_matrix.F90
index 6c97ad1..1f4840b 100644
--- a/src/specfem2D/invert_mass_matrix.F90
+++ b/src/specfem2D/invert_mass_matrix.F90
@@ -58,10 +58,6 @@
ibegin_edge4,iend_edge4,ibegin_edge2,iend_edge2, &
rmass_inverse_elastic_three,&
nelemabs,vsext,xix,xiz,gammaz,gammax, &
-!! DK DK added this for Guenneau, March 2012
-#ifdef USE_GUENNEAU
- coord, &
-#endif
K_x_store,K_z_store,is_PML,&
d_x_store,d_z_store,PML_BOUNDARY_CONDITIONS,region_CPML, &
nspec_PML,spec_to_PML,time_stepping_scheme)
@@ -135,14 +131,7 @@
logical :: PML_BOUNDARY_CONDITIONS,this_element_has_PML
integer, dimension(nspec) :: region_CPML
-!! DK DK added this for Guenneau, March 2012
-#ifdef USE_GUENNEAU
- double precision, dimension(NDIM,nglob_elastic), intent(in) :: coord
- real(kind=CUSTOM_REAL) :: r, epsr, epsfi, x, y
-#endif
-!! DK DK added this for Guenneau, March 2012
-
-!! time scheme
+ ! time scheme
integer :: time_stepping_scheme
! initialize mass matrix
@@ -231,17 +220,8 @@
endif
else
-!! DK DK added this for Guenneau, March 2012
-#ifdef USE_GUENNEAU
- include "include_mass_Guenneau.f90"
-#endif
-!! DK DK added this for Guenneau, March 2012
-
rmass_inverse_elastic_one(iglob) = rmass_inverse_elastic_one(iglob) &
+ wxgll(i)*wzgll(j)*rhol*jacobian(i,j,ispec)
-#ifdef USE_GUENNEAU
- endif
-#endif
rmass_inverse_elastic_three(iglob) = rmass_inverse_elastic_one(iglob)
endif
diff --git a/src/specfem2D/specfem2D.F90 b/src/specfem2D/specfem2D.F90
index 74d7bf8..cc1aeaf 100644
--- a/src/specfem2D/specfem2D.F90
+++ b/src/specfem2D/specfem2D.F90
@@ -3253,10 +3253,6 @@
ibegin_edge4,iend_edge4,ibegin_edge2,iend_edge2, &
rmass_inverse_elastic_three,&
nelemabs,vsext,xix,xiz,gammaz,gammax, &
-!! DK DK added this for Guenneau, March 2012
-#ifdef USE_GUENNEAU
- coord, &
-#endif
K_x_store,K_z_store,is_PML,&
d_x_store,d_z_store,PML_BOUNDARY_CONDITIONS,region_CPML, &
nspec_PML,spec_to_PML,time_stepping_scheme)
More information about the CIG-COMMITS
mailing list