[cig-commits] r22531 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: shared specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Jul 7 15:32:54 PDT 2013
Author: dkomati1
Date: 2013-07-07 15:32:53 -0700 (Sun, 07 Jul 2013)
New Revision: 22531
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_Dev.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
Log:
suppressed b_div_displ_outer_core to save memory, since it was unused
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -360,10 +360,9 @@
static_memory_size = static_memory_size + (5.d0*dble(N_SLS) + 3.d0)* &
dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_ADJOINT*dble(CUSTOM_REAL)
- ! b_div_displ_outer_core
! rho_kl_outer_core,alpha_kl_outer_core
static_memory_size = static_memory_size + &
- 3.d0*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_OUTER_CORE_ADJOINT*dble(CUSTOM_REAL)
+ 2.d0*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_OUTER_CORE_ADJOINT*dble(CUSTOM_REAL)
! b_R_memory_inner_core
!! ZN ZN this has now been suppressed to save as much memory as possible to undo attenuation
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_Dev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_Dev.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_Dev.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -45,7 +45,7 @@
hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
! this routine is optimized for NGLLX = NGLLY = NGLLZ = 5 using the Deville et al. (2002) inlined matrix-matrix products
@@ -76,7 +76,8 @@
real(kind=CUSTOM_REAL), dimension(NGLLY,NGLLZ) :: wgllwgll_yz
double precision, dimension(NGLLX,NGLLY,NGLLZ) :: wgll_cube
- logical MOVIE_VOLUME
+ integer :: SIMULATION_TYPE
+ logical :: MOVIE_VOLUME
! local parameters
@@ -179,7 +180,7 @@
! ****************************************************
if(istage == 1) then
- if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. icall == 1) div_displfluid(:,:,:,:) = 0._CUSTOM_REAL
+ if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. SIMULATION_TYPE == 1 .and. icall == 1) div_displfluid(:,:,:,:) = 0._CUSTOM_REAL
endif
computed_elements = 0
@@ -408,7 +409,7 @@
! note: these calculations are only considered for SIMULATION_TYPE == 1 .and. SAVE_FORWARD
! and one has set MOVIE_VOLUME_TYPE == 4 when MOVIE_VOLUME is .true.;
! in case of SIMULATION_TYPE == 3, it gets overwritten by compute_kernels_outer_core()
- if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. MOVIE_VOLUME) then
+ if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. SIMULATION_TYPE == 1 .and. MOVIE_VOLUME) then
div_displfluid(i,j,k,ispec) = &
minus_rho_g_over_kappa_fluid(int_radius) &
* (dpotentialdx_with_rot * gxl &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_noDev.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_forces_outer_core_noDev.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -45,7 +45,7 @@
hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
implicit none
@@ -75,7 +75,8 @@
real(kind=CUSTOM_REAL), dimension(NGLLY,NGLLZ) :: wgllwgll_yz
double precision, dimension(NGLLX,NGLLY,NGLLZ) :: wgll_cube
- logical MOVIE_VOLUME
+ integer :: SIMULATION_TYPE
+ logical :: MOVIE_VOLUME
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ) :: tempx1,tempx2,tempx3
@@ -154,7 +155,7 @@
! big loop over all spectral elements in the fluid
! ****************************************************
if(istage == 1) then
- if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. icall == 1) div_displfluid(:,:,:,:) = 0._CUSTOM_REAL
+ if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. SIMULATION_TYPE == 1 .and. icall == 1) div_displfluid(:,:,:,:) = 0._CUSTOM_REAL
endif
computed_elements = 0
@@ -352,7 +353,7 @@
! note: these calculations are only considered for SIMULATION_TYPE == 1 .and. SAVE_FORWARD
! and one has set MOVIE_VOLUME_TYPE == 4 when MOVIE_VOLUME is .true.;
! in case of SIMULATION_TYPE == 3, it gets overwritten by compute_kernels_outer_core()
- if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. MOVIE_VOLUME ) then
+ if (NSPEC_OUTER_CORE_ADJOINT /= 1 .and. SIMULATION_TYPE == 1 .and. MOVIE_VOLUME) then
div_displfluid(i,j,k,ispec) = &
minus_rho_g_over_kappa_fluid(int_radius) * (dpotentialdx_with_rot * gxl + &
dpotentialdy_with_rot * gyl + dpotentialdzl * gzl)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/compute_kernels.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -136,15 +136,12 @@
enddo
enddo
-
end subroutine compute_kernels_crust_mantle
-
!
!-------------------------------------------------------------------------------------------------
!
-
subroutine compute_kernels_outer_core(ibool_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -154,7 +151,7 @@
b_displ_outer_core,b_accel_outer_core, &
vector_accel_outer_core,vector_displ_outer_core, &
b_vector_displ_outer_core, &
- div_displ_outer_core,b_div_displ_outer_core, &
+ div_displ_outer_core, &
rhostore_outer_core,kappavstore_outer_core, &
rho_kl_outer_core,alpha_kl_outer_core, &
deviatoric_outercore,nspec_beta_kl_outer_core,beta_kl_outer_core, &
@@ -186,7 +183,6 @@
vector_displ_outer_core, b_vector_displ_outer_core
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE_ADJOINT) :: div_displ_outer_core
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE_ADJOINT) :: b_div_displ_outer_core
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE) :: &
rhostore_outer_core,kappavstore_outer_core
@@ -206,6 +202,7 @@
real(kind=CUSTOM_REAL) :: tempx1l,tempx2l,tempx3l
real(kind=CUSTOM_REAL) :: tempy1l,tempy2l,tempy3l
real(kind=CUSTOM_REAL) :: tempz1l,tempz2l,tempz3l
+ real(kind=CUSTOM_REAL) :: b_div_displ_outer_core
real(kind=CUSTOM_REAL), dimension(5) :: b_epsilondev_loc
real(kind=CUSTOM_REAL), dimension(5) :: epsilondev_loc
@@ -424,10 +421,10 @@
kappal = rhostore_outer_core(i,j,k,ispec)/kappavstore_outer_core(i,j,k,ispec)
div_displ_outer_core(i,j,k,ispec) = kappal * accel_outer_core(iglob)
- b_div_displ_outer_core(i,j,k,ispec) = kappal * b_accel_outer_core(iglob)
+ b_div_displ_outer_core = kappal * b_accel_outer_core(iglob)
alpha_kl_outer_core(i,j,k,ispec) = alpha_kl_outer_core(i,j,k,ispec) &
- + deltat * div_displ_outer_core(i,j,k,ispec) * b_div_displ_outer_core(i,j,k,ispec)
+ + deltat * div_displ_outer_core(i,j,k,ispec) * b_div_displ_outer_core
enddo
enddo
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_classical.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -94,7 +94,7 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
! div_displ_outer_core is initialized to zero in the following subroutine.
call compute_forces_outer_core(time,deltat,two_omega_earth, &
@@ -117,7 +117,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
! Stacey absorbing boundaries
@@ -220,7 +220,7 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
! div_displ_outer_core is initialized to zero in the following subroutine.
call compute_forces_outer_core(time,deltat,two_omega_earth, &
@@ -242,7 +242,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
do while (iphase <= 7) ! make sure the last communications are finished and processed
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part1_undo_att.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -114,7 +114,7 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
! div_displ_outer_core is initialized to zero in the following subroutine.
call compute_forces_outer_core(time,deltat,two_omega_earth, &
@@ -137,7 +137,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
! Stacey absorbing boundaries
@@ -240,7 +240,7 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
! div_displ_outer_core is initialized to zero in the following subroutine.
call compute_forces_outer_core(time,deltat,two_omega_earth, &
@@ -262,7 +262,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
do while (iphase <= 7) ! make sure the last communications are finished and processed
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_classical.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -73,7 +73,7 @@
call compute_forces_outer_core_Dev(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -90,12 +90,12 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
call compute_forces_outer_core(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -112,7 +112,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
endif
@@ -206,7 +206,7 @@
call compute_forces_outer_core_Dev(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -223,13 +223,13 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
! div_displ_outer_core is initialized to zero in the following subroutine.
call compute_forces_outer_core(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -246,7 +246,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
do while (b_iphase <= 7) ! make sure the last communications are finished and processed
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part2_undo_att.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -77,7 +77,7 @@
call compute_forces_outer_core_Dev(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -94,12 +94,12 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
call compute_forces_outer_core(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -116,7 +116,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
endif
@@ -237,7 +237,7 @@
call compute_forces_outer_core_Dev(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -254,13 +254,13 @@
hprime_xx,hprime_xxT,hprimewgll_xx,hprimewgll_xxT, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
else
! div_displ_outer_core is initialized to zero in the following subroutine.
call compute_forces_outer_core(time,b_deltat,b_two_omega_earth, &
b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
minus_rho_g_over_kappa_fluid, &
- b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core, &
+ b_displ_outer_core,b_accel_outer_core,b_div_displ_outer_core_dummy, &
xstore_outer_core,ystore_outer_core,zstore_outer_core, &
xix_outer_core,xiy_outer_core,xiz_outer_core, &
etax_outer_core,etay_outer_core,etaz_outer_core, &
@@ -277,7 +277,7 @@
hprime_xx,hprime_yy,hprime_zz,hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube, &
ibool_outer_core,MOVIE_VOLUME,&
- istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK)
+ istage,A_array_rotation_lddrk,B_array_rotation_lddrk,USE_LDDRK,SIMULATION_TYPE)
endif
do while (b_iphase <= 7) ! make sure the last communications are finished and processed
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/part3_kernel_computation.f90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -23,7 +23,7 @@
b_displ_outer_core,b_accel_outer_core, &
vector_accel_outer_core,vector_displ_outer_core, &
b_vector_displ_outer_core, &
- div_displ_outer_core,b_div_displ_outer_core, &
+ div_displ_outer_core, &
rhostore_outer_core,kappavstore_outer_core, &
rho_kl_outer_core,alpha_kl_outer_core, &
deviatoric_outercore,nspec_beta_kl_outer_core,beta_kl_outer_core, &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90 2013-07-07 19:57:35 UTC (rev 22530)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90 2013-07-07 22:32:53 UTC (rev 22531)
@@ -628,7 +628,7 @@
b_displ_inner_core,b_veloc_inner_core,b_accel_inner_core
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE_ADJOINT) :: div_displ_outer_core
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE_ADJOINT) :: b_div_displ_outer_core
+ real(kind=CUSTOM_REAL), dimension(1) :: b_div_displ_outer_core_dummy ! dummy array that needs to be there for subroutine calls
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ADJOINT) :: rho_kl_crust_mantle, &
beta_kl_crust_mantle, alpha_kl_crust_mantle
@@ -2127,7 +2127,6 @@
alpha_kl_inner_core(:,:,:,:) = 0._CUSTOM_REAL
div_displ_outer_core(:,:,:,:) = 0._CUSTOM_REAL
- b_div_displ_outer_core(:,:,:,:) = 0._CUSTOM_REAL
! deviatoric kernel check
if( deviatoric_outercore) then
More information about the CIG-COMMITS
mailing list