[cig-commits] r22835 - in seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src: auxiliaries meshfem3D specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sat Sep 21 15:10:12 PDT 2013
Author: dkomati1
Date: 2013-09-21 15:10:12 -0700 (Sat, 21 Sep 2013)
New Revision: 22835
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/combine_vol_data_vtk.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/create_movie_AVS_DX.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_mass_matrices.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element_att_memory.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/update_displacement_Newmark.f90
Log:
fixed all Intel ifort warnings (mostly unused variables)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/combine_vol_data_vtk.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/combine_vol_data_vtk.f90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/combine_vol_data_vtk.f90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -87,7 +87,7 @@
! starts here--------------------------------------------------------------------------------------------------
do i = 1, 7
- call getarg(i,arg(i))
+ call get_command_argument(i,arg(i))
if (i < 7 .and. trim(arg(i)) == '') then
print *, ' '
print *, ' Usage: xcombine_vol_data slice_list filename input_topo_dir input_file_dir '
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/create_movie_AVS_DX.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/create_movie_AVS_DX.f90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/auxiliaries/create_movie_AVS_DX.f90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -790,13 +790,13 @@
if(.not. mask_point(ibool_number)) then
if( .not. ALL_THRESHOLD_OFF ) then
if(USE_OPENDX) then
- write(11,"(f7.4)") field_display(ilocnum+ieoff)
+ write(11,"(f11.4)") field_display(ilocnum+ieoff)
else
- write(11,"(i10,1x,f7.2)") ireorder(ibool_number),field_display(ilocnum+ieoff)
+ write(11,"(i10,1x,f11.4)") ireorder(ibool_number),field_display(ilocnum+ieoff)
endif
else
if(USE_OPENDX) then
- write(11,"(e7.4)") field_display(ilocnum+ieoff)
+ write(11,"(e11.4)") field_display(ilocnum+ieoff)
else
! format spezifier has problems w/ very small values
!write(11,"(i10,1x,e7.4)") ireorder(ibool_number),field_display(ilocnum+ieoff)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_mass_matrices.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_mass_matrices.f90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/create_mass_matrices.f90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -176,7 +176,7 @@
! then make the corrections to the copied mass matrices if needed
if( ROTATION .and. EXACT_MASS_MATRIX_FOR_ROTATION ) then
- call create_mass_matrices_rotation(myrank,nspec,ibool,idoubling,iregion_code)
+ call create_mass_matrices_rotation(nspec,ibool,idoubling,iregion_code)
endif
! absorbing boundaries
@@ -210,10 +210,9 @@
! save ocean load mass matrix as well if oceans
if(OCEANS .and. iregion_code == IREGION_CRUST_MANTLE) then
- call create_mass_matrices_ocean_load(myrank,nspec,ibool,xstore,ystore,zstore,NSPEC2D_TOP)
+ call create_mass_matrices_ocean_load(nspec,ibool,xstore,ystore,zstore,NSPEC2D_TOP)
endif
-
end subroutine create_mass_matrices
@@ -221,7 +220,7 @@
!-------------------------------------------------------------------------------------------------
!
- subroutine create_mass_matrices_rotation(myrank,nspec,ibool,idoubling,iregion_code)
+ subroutine create_mass_matrices_rotation(nspec,ibool,idoubling,iregion_code)
! in the case of Stacey boundary conditions, add C*deltat/2 contribution to the mass matrix
! on Stacey edges for the crust_mantle and outer_core regions but not for the inner_core region
@@ -242,7 +241,7 @@
implicit none
- integer :: myrank
+!!!!!!!!!!! integer :: myrank
integer :: nspec
@@ -780,7 +779,7 @@
!-------------------------------------------------------------------------------------------------
!
- subroutine create_mass_matrices_ocean_load(myrank,nspec,ibool,xstore,ystore,zstore,NSPEC2D_TOP)
+ subroutine create_mass_matrices_ocean_load(nspec,ibool,xstore,ystore,zstore,NSPEC2D_TOP)
use constants
@@ -799,7 +798,7 @@
implicit none
- integer :: myrank
+!!!!!!!!!!! integer :: myrank
integer :: nspec
integer,dimension(NGLLX,NGLLY,NGLLZ,nspec) :: ibool
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element_att_memory.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element_att_memory.F90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element_att_memory.F90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -38,7 +38,7 @@
alphaval,betaval,gammaval, &
c44store,muvstore, &
epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz, &
- epsilondev_loc,is_backward_field)
+ epsilondev_loc) !!!!!!!!!!!!!!!!! ,is_backward_field)
! crust mantle
! update memory variables based upon the Runge-Kutta scheme
@@ -83,7 +83,7 @@
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ) :: epsilondev_loc
- logical :: is_backward_field
+!!!!!!!!!!!!!!! logical :: is_backward_field
! local parameters
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ) :: factor_common_c44_muv
@@ -140,7 +140,7 @@
R_xx_lddrk,R_yy_lddrk,R_xy_lddrk,R_xz_lddrk,R_yz_lddrk, &
vx,vy,vz,vnspec,factor_common, &
c44store,muvstore, &
- epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz, &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz, &
epsilondev_loc, &
deltat)
! crust mantle
@@ -185,8 +185,8 @@
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPECMAX_ANISO_MANTLE) :: c44store
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPECMAX_ISO_MANTLE) :: muvstore
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE) :: &
- epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz
+! real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE) :: &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ) :: epsilondev_loc
@@ -263,7 +263,7 @@
alphaval,betaval,gammaval, &
muvstore, &
epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz, &
- epsilondev_loc,is_backward_field)
+ epsilondev_loc) !!!!!!!!!!!!! ,is_backward_field)
! inner core
! update memory variables based upon the Runge-Kutta scheme
@@ -305,7 +305,7 @@
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ) :: epsilondev_loc
- logical :: is_backward_field
+!!!!!!!!!!! logical :: is_backward_field
! local parameters
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ) :: factor_common_use
@@ -364,7 +364,7 @@
R_xx_lddrk,R_yy_lddrk,R_xy_lddrk,R_xz_lddrk,R_yz_lddrk, &
vx,vy,vz,vnspec,factor_common, &
muvstore, &
- epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz, &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz, &
epsilondev_loc, &
deltat)
! inner core
@@ -405,9 +405,9 @@
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: muvstore
-! real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: epsilondev
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: &
- epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz
+! real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: epsilondev
+! real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE) :: &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ) :: epsilondev_loc
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -28,7 +28,7 @@
subroutine compute_forces_crust_mantle_Dev( NSPEC,NGLOB,NSPEC_ATT, &
deltat, &
displ_crust_mantle, &
- veloc_crust_mantle, &
+! veloc_crust_mantle, &
accel_crust_mantle, &
phase_is_inner, &
R_xx,R_yy,R_xy,R_xz,R_yz, &
@@ -86,7 +86,7 @@
! displacement, velocity and acceleration
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: displ_crust_mantle
- real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_crust_mantle
+! real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_crust_mantle
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: accel_crust_mantle
! variable sized array variables
@@ -497,8 +497,8 @@
R_xx_lddrk,R_yy_lddrk,R_xy_lddrk,R_xz_lddrk,R_yz_lddrk, &
ATT1_VAL,ATT2_VAL,ATT3_VAL,vnspec,factor_common, &
c44store,muvstore, &
- epsilondev_xx,epsilondev_yy,epsilondev_xy, &
- epsilondev_xz,epsilondev_yz, &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy, &
+! epsilondev_xz,epsilondev_yz, &
epsilondev_loc, &
deltat)
else
@@ -508,7 +508,7 @@
c44store,muvstore, &
epsilondev_xx,epsilondev_yy,epsilondev_xy, &
epsilondev_xz,epsilondev_yz, &
- epsilondev_loc,is_backward_field)
+ epsilondev_loc) !!!!!!!!!!!!!!! ,is_backward_field)
endif
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -28,7 +28,7 @@
subroutine compute_forces_crust_mantle(NSPEC,NGLOB,NSPEC_ATT, &
deltat, &
displ_crust_mantle, &
- veloc_crust_mantle, &
+! veloc_crust_mantle, &
accel_crust_mantle, &
phase_is_inner, &
R_xx,R_yy,R_xy,R_xz,R_yz, &
@@ -37,7 +37,7 @@
epsilondev_xz,epsilondev_yz, &
epsilon_trace_over_3, &
alphaval,betaval,gammaval, &
- factor_common,vnspec,is_backward_field)
+ factor_common,vnspec) !!!!!!!!!!!!!!!!!!!!! ,is_backward_field)
use constants_solver
@@ -78,7 +78,7 @@
! displacement, velocity and acceleration
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: displ_crust_mantle
- real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_crust_mantle
+! real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_crust_mantle
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: accel_crust_mantle
! variable sized array variables
@@ -102,7 +102,7 @@
! inner/outer element run flag
logical :: phase_is_inner
- logical :: is_backward_field
+!!!!!!!!!!!!!!! logical :: is_backward_field
! local parameters
@@ -815,8 +815,8 @@
R_xx_lddrk,R_yy_lddrk,R_xy_lddrk,R_xz_lddrk,R_yz_lddrk, &
ATT1_VAL,ATT2_VAL,ATT3_VAL,vnspec,factor_common, &
c44store,muvstore, &
- epsilondev_xx,epsilondev_yy,epsilondev_xy, &
- epsilondev_xz,epsilondev_yz, &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy, &
+! epsilondev_xz,epsilondev_yz, &
epsilondev_loc, &
deltat)
else
@@ -826,7 +826,7 @@
c44store,muvstore, &
epsilondev_xx,epsilondev_yy,epsilondev_xy, &
epsilondev_xz,epsilondev_yz, &
- epsilondev_loc,is_backward_field)
+ epsilondev_loc) !!!!!!!!!!!!!!! ,is_backward_field)
endif
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -28,7 +28,7 @@
subroutine compute_forces_inner_core_Dev( NSPEC,NGLOB,NSPEC_ATT, &
deltat, &
displ_inner_core, &
- veloc_inner_core, &
+! veloc_inner_core, &
accel_inner_core, &
phase_is_inner, &
R_xx,R_yy,R_xy,R_xz,R_yz, &
@@ -37,7 +37,7 @@
epsilondev_xz,epsilondev_yz, &
epsilon_trace_over_3,&
alphaval,betaval,gammaval,factor_common, &
- vnspec,is_backward_field)
+ vnspec) !!!!!!!!!!!!!!!!! ,is_backward_field)
! this routine is optimized for NGLLX = NGLLY = NGLLZ = 5 using the Deville et al. (2002) inlined matrix-matrix products
@@ -76,7 +76,7 @@
! displacement and acceleration
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: displ_inner_core
- real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_inner_core
+! real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_inner_core
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: accel_inner_core
! for attenuation
@@ -100,7 +100,7 @@
! inner/outer element run flag
logical :: phase_is_inner
- logical :: is_backward_field
+!!!!!!!!!!!!!!! logical :: is_backward_field
! local parameters
@@ -720,8 +720,8 @@
R_xx_lddrk,R_yy_lddrk,R_xy_lddrk,R_xz_lddrk,R_yz_lddrk, &
ATT1_VAL,ATT2_VAL,ATT3_VAL,vnspec,factor_common, &
muvstore, &
- epsilondev_xx,epsilondev_yy,epsilondev_xy, &
- epsilondev_xz,epsilondev_yz, &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy, &
+! epsilondev_xz,epsilondev_yz, &
epsilondev_loc, &
deltat)
else
@@ -731,7 +731,7 @@
muvstore, &
epsilondev_xx,epsilondev_yy,epsilondev_xy, &
epsilondev_xz,epsilondev_yz, &
- epsilondev_loc,is_backward_field)
+ epsilondev_loc) !!!!!!!!!!!! ,is_backward_field)
endif
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -28,7 +28,7 @@
subroutine compute_forces_inner_core( NSPEC,NGLOB,NSPEC_ATT, &
deltat, &
displ_inner_core, &
- veloc_inner_core, &
+! veloc_inner_core, &
accel_inner_core, &
phase_is_inner, &
R_xx,R_yy,R_xy,R_xz,R_yz, &
@@ -37,7 +37,7 @@
epsilondev_xz,epsilondev_yz, &
epsilon_trace_over_3,&
alphaval,betaval,gammaval,factor_common, &
- vnspec,is_backward_field)
+ vnspec) !!!!!!!!!!!!!!!!!!! ,is_backward_field)
use constants_solver
@@ -71,7 +71,7 @@
! displacement, velocity and acceleration
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: displ_inner_core
- real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_inner_core
+! real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: veloc_inner_core
real(kind=CUSTOM_REAL), dimension(NDIM,NGLOB) :: accel_inner_core
! for attenuation
@@ -95,7 +95,7 @@
! inner/outer element run flag
logical :: phase_is_inner
- logical :: is_backward_field
+!!!!!!!!!!!!!!!! logical :: is_backward_field
! local parameters
real(kind=CUSTOM_REAL), dimension(5,NGLLX,NGLLY,NGLLZ) :: epsilondev_loc
@@ -562,8 +562,8 @@
R_xx_lddrk,R_yy_lddrk,R_xy_lddrk,R_xz_lddrk,R_yz_lddrk, &
ATT1_VAL,ATT2_VAL,ATT3_VAL,vnspec,factor_common, &
muvstore, &
- epsilondev_xx,epsilondev_yy,epsilondev_xy, &
- epsilondev_xz,epsilondev_yz, &
+! epsilondev_xx,epsilondev_yy,epsilondev_xy, &
+! epsilondev_xz,epsilondev_yz, &
epsilondev_loc, &
deltat)
else
@@ -573,7 +573,7 @@
muvstore, &
epsilondev_xx,epsilondev_yy,epsilondev_xy, &
epsilondev_xz,epsilondev_yz, &
- epsilondev_loc,is_backward_field)
+ epsilondev_loc) !!!!!!!!!!!! ,is_backward_field)
endif
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -80,7 +80,9 @@
call compute_forces_crust_mantle_Dev(NSPEC_CRUST_MANTLE_STR_OR_ATT,NGLOB_CRUST_MANTLE, &
NSPEC_CRUST_MANTLE_ATTENUATION, &
deltat, &
- displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle, &
+ displ_crust_mantle, &
+! veloc_crust_mantle, &
+ accel_crust_mantle, &
phase_is_inner, &
R_xx_crust_mantle,R_yy_crust_mantle,R_xy_crust_mantle, &
R_xz_crust_mantle,R_yz_crust_mantle, &
@@ -95,7 +97,9 @@
call compute_forces_inner_core_Dev(NSPEC_INNER_CORE_STR_OR_ATT,NGLOB_INNER_CORE, &
NSPEC_INNER_CORE_ATTENUATION, &
deltat, &
- displ_inner_core,veloc_inner_core,accel_inner_core, &
+ displ_inner_core, &
+! veloc_inner_core, &
+ accel_inner_core, &
phase_is_inner, &
R_xx_inner_core,R_yy_inner_core,R_xy_inner_core, &
R_xz_inner_core,R_yz_inner_core, &
@@ -105,14 +109,16 @@
epsilondev_xz_inner_core,epsilondev_yz_inner_core, &
eps_trace_over_3_inner_core,&
alphaval,betaval,gammaval, &
- factor_common_inner_core,size(factor_common_inner_core,5), .false. )
+ factor_common_inner_core,size(factor_common_inner_core,5)) !!!! , .false. )
else
! no Deville optimization
! crust/mantle region
call compute_forces_crust_mantle(NSPEC_CRUST_MANTLE_STR_OR_ATT,NGLOB_CRUST_MANTLE, &
NSPEC_CRUST_MANTLE_ATTENUATION, &
deltat, &
- displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle, &
+ displ_crust_mantle, &
+! veloc_crust_mantle, &
+ accel_crust_mantle, &
phase_is_inner, &
R_xx_crust_mantle,R_yy_crust_mantle,R_xy_crust_mantle, &
R_xz_crust_mantle,R_yz_crust_mantle, &
@@ -122,12 +128,14 @@
epsilondev_xz_crust_mantle,epsilondev_yz_crust_mantle, &
eps_trace_over_3_crust_mantle, &
alphaval,betaval,gammaval, &
- factor_common_crust_mantle,size(factor_common_crust_mantle,5), .false. )
+ factor_common_crust_mantle,size(factor_common_crust_mantle,5)) !!!!!!!!!!!! , .false. )
! inner core region
call compute_forces_inner_core(NSPEC_INNER_CORE_STR_OR_ATT,NGLOB_INNER_CORE, &
NSPEC_INNER_CORE_ATTENUATION, &
deltat, &
- displ_inner_core,veloc_inner_core,accel_inner_core, &
+ displ_inner_core, &
+! veloc_inner_core, &
+ accel_inner_core, &
phase_is_inner, &
R_xx_inner_core,R_yy_inner_core,R_xy_inner_core, &
R_xz_inner_core,R_yz_inner_core, &
@@ -137,7 +145,7 @@
epsilondev_xz_inner_core,epsilondev_yz_inner_core, &
eps_trace_over_3_inner_core,&
alphaval,betaval,gammaval, &
- factor_common_inner_core,size(factor_common_inner_core,5), .false. )
+ factor_common_inner_core,size(factor_common_inner_core,5)) !!!!!!!!!!! , .false. )
endif
else
! on GPU
@@ -456,69 +464,77 @@
if( USE_DEVILLE_PRODUCTS_VAL ) then
! uses Deville (2002) optimizations
! crust/mantle region
- call compute_forces_crust_mantle_Dev( NSPEC_CRUST_MANTLE_ADJOINT,NGLOB_CRUST_MANTLE_ADJOINT, &
- NSPEC_CRUST_MANTLE_STR_AND_ATT, &
- b_deltat, &
- b_displ_crust_mantle,b_veloc_crust_mantle,b_accel_crust_mantle, &
- phase_is_inner, &
- b_R_xx_crust_mantle,b_R_yy_crust_mantle,b_R_xy_crust_mantle, &
- b_R_xz_crust_mantle,b_R_yz_crust_mantle, &
- b_R_xx_crust_mantle_lddrk,b_R_yy_crust_mantle_lddrk,b_R_xy_crust_mantle_lddrk, &
- b_R_xz_crust_mantle_lddrk,b_R_yz_crust_mantle_lddrk, &
- b_epsilondev_xx_crust_mantle,b_epsilondev_yy_crust_mantle,&
- b_epsilondev_xy_crust_mantle, &
- b_epsilondev_xz_crust_mantle,b_epsilondev_yz_crust_mantle, &
- b_eps_trace_over_3_crust_mantle, &
- b_alphaval,b_betaval,b_gammaval, &
- factor_common_crust_mantle,size(factor_common_crust_mantle,5), .true. )
+ call compute_forces_crust_mantle_Dev(NSPEC_CRUST_MANTLE_ADJOINT,NGLOB_CRUST_MANTLE_ADJOINT, &
+ NSPEC_CRUST_MANTLE_STR_AND_ATT, &
+ b_deltat, &
+ b_displ_crust_mantle, &
+! b_veloc_crust_mantle, &
+ b_accel_crust_mantle, &
+ phase_is_inner, &
+ b_R_xx_crust_mantle,b_R_yy_crust_mantle,b_R_xy_crust_mantle, &
+ b_R_xz_crust_mantle,b_R_yz_crust_mantle, &
+ b_R_xx_crust_mantle_lddrk,b_R_yy_crust_mantle_lddrk,b_R_xy_crust_mantle_lddrk, &
+ b_R_xz_crust_mantle_lddrk,b_R_yz_crust_mantle_lddrk, &
+ b_epsilondev_xx_crust_mantle,b_epsilondev_yy_crust_mantle,&
+ b_epsilondev_xy_crust_mantle, &
+ b_epsilondev_xz_crust_mantle,b_epsilondev_yz_crust_mantle, &
+ b_eps_trace_over_3_crust_mantle, &
+ b_alphaval,b_betaval,b_gammaval, &
+ factor_common_crust_mantle,size(factor_common_crust_mantle,5), .true. )
! inner core region
- call compute_forces_inner_core_Dev( NSPEC_INNER_CORE_ADJOINT,NGLOB_INNER_CORE_ADJOINT, &
- NSPEC_INNER_CORE_STR_AND_ATT, &
- b_deltat, &
- b_displ_inner_core,b_veloc_inner_core,b_accel_inner_core, &
- phase_is_inner, &
- b_R_xx_inner_core,b_R_yy_inner_core,b_R_xy_inner_core, &
- b_R_xz_inner_core,b_R_yz_inner_core, &
- b_R_xx_inner_core_lddrk,b_R_yy_inner_core_lddrk,b_R_xy_inner_core_lddrk, &
- b_R_xz_inner_core_lddrk,b_R_yz_inner_core_lddrk, &
- b_epsilondev_xx_inner_core,b_epsilondev_yy_inner_core,b_epsilondev_xy_inner_core, &
- b_epsilondev_xz_inner_core,b_epsilondev_yz_inner_core, &
- b_eps_trace_over_3_inner_core,&
- b_alphaval,b_betaval,b_gammaval, &
- factor_common_inner_core,size(factor_common_inner_core,5), .true. )
+ call compute_forces_inner_core_Dev(NSPEC_INNER_CORE_ADJOINT,NGLOB_INNER_CORE_ADJOINT, &
+ NSPEC_INNER_CORE_STR_AND_ATT, &
+ b_deltat, &
+ b_displ_inner_core, &
+! b_veloc_inner_core, &
+ b_accel_inner_core, &
+ phase_is_inner, &
+ b_R_xx_inner_core,b_R_yy_inner_core,b_R_xy_inner_core, &
+ b_R_xz_inner_core,b_R_yz_inner_core, &
+ b_R_xx_inner_core_lddrk,b_R_yy_inner_core_lddrk,b_R_xy_inner_core_lddrk, &
+ b_R_xz_inner_core_lddrk,b_R_yz_inner_core_lddrk, &
+ b_epsilondev_xx_inner_core,b_epsilondev_yy_inner_core,b_epsilondev_xy_inner_core, &
+ b_epsilondev_xz_inner_core,b_epsilondev_yz_inner_core, &
+ b_eps_trace_over_3_inner_core,&
+ b_alphaval,b_betaval,b_gammaval, &
+ factor_common_inner_core,size(factor_common_inner_core,5)) !!!! , .true. )
else
! no Deville optimization
! crust/mantle region
- call compute_forces_crust_mantle( NSPEC_CRUST_MANTLE_ADJOINT,NGLOB_CRUST_MANTLE_ADJOINT, &
- NSPEC_CRUST_MANTLE_STR_AND_ATT, &
- b_deltat, &
- b_displ_crust_mantle,b_veloc_crust_mantle,b_accel_crust_mantle, &
- phase_is_inner, &
- b_R_xx_crust_mantle,b_R_yy_crust_mantle,b_R_xy_crust_mantle, &
- b_R_xz_crust_mantle,b_R_yz_crust_mantle, &
- b_R_xx_crust_mantle_lddrk,b_R_yy_crust_mantle_lddrk,b_R_xy_crust_mantle_lddrk, &
- b_R_xz_crust_mantle_lddrk,b_R_yz_crust_mantle_lddrk, &
- b_epsilondev_xx_crust_mantle,b_epsilondev_yy_crust_mantle,&
- b_epsilondev_xy_crust_mantle, &
- b_epsilondev_xz_crust_mantle,b_epsilondev_yz_crust_mantle, &
- b_eps_trace_over_3_crust_mantle, &
- b_alphaval,b_betaval,b_gammaval, &
- factor_common_crust_mantle,size(factor_common_crust_mantle,5), .true. )
+ call compute_forces_crust_mantle(NSPEC_CRUST_MANTLE_ADJOINT,NGLOB_CRUST_MANTLE_ADJOINT, &
+ NSPEC_CRUST_MANTLE_STR_AND_ATT, &
+ b_deltat, &
+ b_displ_crust_mantle, &
+! b_veloc_crust_mantle, &
+ b_accel_crust_mantle, &
+ phase_is_inner, &
+ b_R_xx_crust_mantle,b_R_yy_crust_mantle,b_R_xy_crust_mantle, &
+ b_R_xz_crust_mantle,b_R_yz_crust_mantle, &
+ b_R_xx_crust_mantle_lddrk,b_R_yy_crust_mantle_lddrk,b_R_xy_crust_mantle_lddrk, &
+ b_R_xz_crust_mantle_lddrk,b_R_yz_crust_mantle_lddrk, &
+ b_epsilondev_xx_crust_mantle,b_epsilondev_yy_crust_mantle,&
+ b_epsilondev_xy_crust_mantle, &
+ b_epsilondev_xz_crust_mantle,b_epsilondev_yz_crust_mantle, &
+ b_eps_trace_over_3_crust_mantle, &
+ b_alphaval,b_betaval,b_gammaval, &
+ factor_common_crust_mantle,size(factor_common_crust_mantle,5)) !!!!!!!!!!!! , .true. )
! inner core region
- call compute_forces_inner_core( NSPEC_INNER_CORE_ADJOINT,NGLOB_INNER_CORE_ADJOINT, &
- NSPEC_INNER_CORE_STR_AND_ATT, &
- b_deltat, &
- b_displ_inner_core,b_veloc_inner_core,b_accel_inner_core, &
- phase_is_inner, &
- b_R_xx_inner_core,b_R_yy_inner_core,b_R_xy_inner_core, &
- b_R_xz_inner_core,b_R_yz_inner_core, &
- b_R_xx_inner_core_lddrk,b_R_yy_inner_core_lddrk,b_R_xy_inner_core_lddrk, &
- b_R_xz_inner_core_lddrk,b_R_yz_inner_core_lddrk, &
- b_epsilondev_xx_inner_core,b_epsilondev_yy_inner_core,b_epsilondev_xy_inner_core, &
- b_epsilondev_xz_inner_core,b_epsilondev_yz_inner_core, &
- b_eps_trace_over_3_inner_core,&
- b_alphaval,b_betaval,b_gammaval, &
- factor_common_inner_core,size(factor_common_inner_core,5), .true. )
+ call compute_forces_inner_core(NSPEC_INNER_CORE_ADJOINT,NGLOB_INNER_CORE_ADJOINT, &
+ NSPEC_INNER_CORE_STR_AND_ATT, &
+ b_deltat, &
+ b_displ_inner_core, &
+! b_veloc_inner_core, &
+ b_accel_inner_core, &
+ phase_is_inner, &
+ b_R_xx_inner_core,b_R_yy_inner_core,b_R_xy_inner_core, &
+ b_R_xz_inner_core,b_R_yz_inner_core, &
+ b_R_xx_inner_core_lddrk,b_R_yy_inner_core_lddrk,b_R_xy_inner_core_lddrk, &
+ b_R_xz_inner_core_lddrk,b_R_yz_inner_core_lddrk, &
+ b_epsilondev_xx_inner_core,b_epsilondev_yy_inner_core,b_epsilondev_xy_inner_core, &
+ b_epsilondev_xz_inner_core,b_epsilondev_yz_inner_core, &
+ b_eps_trace_over_3_inner_core,&
+ b_alphaval,b_betaval,b_gammaval, &
+ factor_common_inner_core,size(factor_common_inner_core,5)) !!!!!!!!!!! , .true. )
endif
else
! on GPU
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/update_displacement_Newmark.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/update_displacement_Newmark.f90 2013-09-21 21:13:26 UTC (rev 22834)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/update_displacement_Newmark.f90 2013-09-21 22:10:12 UTC (rev 22835)
@@ -227,7 +227,7 @@
if(.NOT. GPU_MODE) then
! on CPU
call update_veloc_acoustic(NGLOB_OUTER_CORE,veloc_outer_core,accel_outer_core, &
- deltatover2,rmass_outer_core)
+ deltatover2) !!!!!! ,rmass_outer_core)
else
! on GPU
! includes FORWARD_OR_ADJOINT == 1
@@ -253,7 +253,7 @@
! on CPU
! adjoint / kernel runs
call update_veloc_acoustic(NGLOB_OUTER_CORE_ADJOINT,b_veloc_outer_core,b_accel_outer_core, &
- b_deltatover2,b_rmass_outer_core)
+ b_deltatover2) !!!!!! ,b_rmass_outer_core)
else
! on GPU
! includes FORWARD_OR_ADJOINT == 3
@@ -267,7 +267,7 @@
!
subroutine update_veloc_acoustic(NGLOB,veloc_outer_core,accel_outer_core, &
- deltatover2,rmass_outer_core)
+ deltatover2) !!!! ,rmass_outer_core)
! updates acceleration and velocity in outer core
@@ -281,7 +281,7 @@
real(kind=CUSTOM_REAL), dimension(NGLOB) :: veloc_outer_core,accel_outer_core
! mass matrix
- real(kind=CUSTOM_REAL), dimension(NGLOB) :: rmass_outer_core
+!!!!! real(kind=CUSTOM_REAL), dimension(NGLOB) :: rmass_outer_core
real(kind=CUSTOM_REAL) :: deltatover2
More information about the CIG-COMMITS
mailing list