[cig-commits] [commit] master: adapting fluid strain to u_phi = 0 (3ec2883)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Sep 16 06:25:26 PDT 2014
Repository : https://github.com/geodynamics/axisem
On branch : master
Link : https://github.com/geodynamics/axisem/compare/293762f04021fe5bda7f3326ec9b087fc18d45de...3ec28839d7a847c57a8196510ecbcdd02241a1de
>---------------------------------------------------------------
commit 3ec28839d7a847c57a8196510ecbcdd02241a1de
Author: martinvandriel <martin at vandriel.de>
Date: Tue Sep 16 15:25:04 2014 +0200
adapting fluid strain to u_phi = 0
+ some tidying up of stuff not used anymore
>---------------------------------------------------------------
3ec28839d7a847c57a8196510ecbcdd02241a1de
SOLVER/data_pointwise.f90 | 1 -
SOLVER/def_grid.f90 | 1 -
SOLVER/def_precomp_terms.f90 | 12 ------------
SOLVER/time_evol_wave.F90 | 35 ++++++++++-------------------------
4 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/SOLVER/data_pointwise.f90 b/SOLVER/data_pointwise.f90
index 9ca39a8..c615655 100644
--- a/SOLVER/data_pointwise.f90
+++ b/SOLVER/data_pointwise.f90
@@ -39,7 +39,6 @@
real(kind=realkind), allocatable :: inv_rho_fluid(:,:,:)
!> (s rho)^-1 in fluid - only for phi comp. of fluid displacement
- real(kind=realkind), allocatable :: prefac_inv_s_rho_fluid(:,:,:)
real(kind=realkind), allocatable :: inv_s_fluid(:,:,:)
!> (s)^-1 in solid - needed for the strain tensor, if computed on-the-fly
diff --git a/SOLVER/def_grid.f90 b/SOLVER/def_grid.f90
index 4704a22..85a1946 100644
--- a/SOLVER/def_grid.f90
+++ b/SOLVER/def_grid.f90
@@ -241,7 +241,6 @@ subroutine deallocate_preloop_arrays
deallocate(DzDxi_over_J_flu)
deallocate(inv_rho_fluid)
- deallocate(prefac_inv_s_rho_fluid)
deallocate(inv_s_fluid)
endif
diff --git a/SOLVER/def_precomp_terms.f90 b/SOLVER/def_precomp_terms.f90
index c3e1ed9..2d3acb9 100644
--- a/SOLVER/def_precomp_terms.f90
+++ b/SOLVER/def_precomp_terms.f90
@@ -262,7 +262,6 @@ subroutine compute_pointwisederiv_matrices
allocate(DsDxi_over_J_flu(0:npol,0:npol,1:nel_fluid))
allocate(DzDxi_over_J_flu(0:npol,0:npol,1:nel_fluid))
allocate(inv_s_fluid(0:npol,0:npol,1:nel_fluid))
- allocate(prefac_inv_s_rho_fluid(0:npol,0:npol,1:nel_fluid))
! solid pointwise derivatives
allocate(DsDeta_over_J_sol(0:npol,0:npol,1:nel_solid))
@@ -354,9 +353,6 @@ subroutine compute_pointwisederiv_matrices
DzDxi_over_J_flu(ipol,jpol,iel) = -dzdxi / &
jacobian(eta(ipol),eta(jpol),local_crd_nodes,ielfluid(iel))
- prefac_inv_s_rho_fluid(ipol,jpol,iel) = inv_rho_fluid(ipol,jpol,iel)/&
- scoord(ipol,jpol,ielfluid(iel))
-
inv_s_fluid(ipol,jpol,iel) = one/scoord(ipol,jpol,ielfluid(iel))
enddo
enddo
@@ -376,11 +372,8 @@ subroutine compute_pointwisederiv_matrices
jacobian(xi_k(ipol),eta(jpol),local_crd_nodes,ielfluid(iel))
if (ipol>0) then
- prefac_inv_s_rho_fluid(ipol,jpol,iel) = inv_rho_fluid(ipol,jpol,iel)/&
- scoord(ipol,jpol,ielfluid(iel))
inv_s_fluid(ipol,jpol,iel) = one/scoord(ipol,jpol,ielfluid(iel))
else
- prefac_inv_s_rho_fluid(ipol,jpol,iel) = inv_rho_fluid(ipol,jpol,iel)
inv_s_fluid(ipol,jpol,iel) = one
endif
@@ -404,11 +397,6 @@ subroutine compute_pointwisederiv_matrices
8 format(a25,2(1pe14.4))
-
- ! Prefactor for quadrupole phi-comp of fluid displacement
- if (src_type(1)=='monopole') prefac_inv_s_rho_fluid = zero
- if (src_type(1)=='quadpole') prefac_inv_s_rho_fluid = two * prefac_inv_s_rho_fluid
-
end subroutine compute_pointwisederiv_matrices
!=============================================================================
diff --git a/SOLVER/time_evol_wave.F90 b/SOLVER/time_evol_wave.F90
index 85add94..5a291e5 100644
--- a/SOLVER/time_evol_wave.F90
+++ b/SOLVER/time_evol_wave.F90
@@ -1221,7 +1221,7 @@ end subroutine dump_stuff
!! strain.
subroutine compute_strain(u, chi, istrain)
- use data_pointwise, only: inv_rho_fluid, prefac_inv_s_rho_fluid
+ use data_pointwise, only: inv_rho_fluid
use data_source, only: src_type
use pointwise_derivatives, only: axisym_gradient_fluid_add
use pointwise_derivatives, only: axisym_gradient_fluid
@@ -1240,7 +1240,6 @@ subroutine compute_strain(u, chi, istrain)
real(kind=realkind) :: grad_sol(0:npol,0:npol,nel_solid,2)
real(kind=realkind) :: buff_solid(0:npol,0:npol,nel_solid)
real(kind=realkind) :: usz_fluid(0:npol,0:npol,nel_fluid,2)
- real(kind=realkind) :: up_fluid(0:npol,0:npol,nel_fluid)
real(kind=realkind) :: grad_flu(0:npol,0:npol,nel_fluid,2)
character(len=5) :: appisnap
real(kind=realkind), parameter :: two_rk = real(2, kind=realkind)
@@ -1337,44 +1336,30 @@ subroutine compute_strain(u, chi, istrain)
'/straintrace_flu', appisnap, nel_fluid) ! Ekk
elseif (src_type(1) == 'dipole') then
- up_fluid = prefac_inv_s_rho_fluid * chi
- call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1) - up_fluid), &
+ call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1)), &
'/strain_dpup_flu', appisnap, nel_fluid) !E22
- call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1) - up_fluid) &
+ call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1)) &
+ grad_flu(:,:,:,2), &
'/straintrace_flu', appisnap, nel_fluid) !Ekk
- ! gradient of phi component
- call axisym_gradient_fluid(up_fluid, grad_flu) ! 1:dsup, 2:dzup
-
- call dump_field_1d((- grad_flu(:,:,:,1) &
- - f_over_s_fluid(usz_fluid(:,:,:,1) &
- - up_fluid)) / two_rk, &
+ call dump_field_1d((- f_over_s_fluid(usz_fluid(:,:,:,1))) / two_rk, &
'/strain_dsup_flu', appisnap, nel_fluid) ! E12
- call dump_field_1d(- (grad_flu(:,:,:,2) - f_over_s_fluid(usz_fluid(:,:,:,2))) &
- / two_rk, '/strain_dzup_flu', appisnap, nel_fluid) ! E23
+ call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,2)) / two_rk, &
+ '/strain_dzup_flu', appisnap, nel_fluid) ! E23
elseif (src_type(1) == 'quadpole') then
- up_fluid = prefac_inv_s_rho_fluid * chi
- call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1) &
- - two_rk * up_fluid), & !E22
+ call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1)), & !E22
'/strain_dpup_flu', appisnap, nel_fluid)
- call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1)&
- - two_rk * up_fluid) & !Ekk
+ call dump_field_1d(f_over_s_fluid(usz_fluid(:,:,:,1)) & !Ekk
+ grad_flu(:,:,:,2), &
'/straintrace_flu', appisnap, nel_fluid)
- ! gradient of phi component
- call axisym_gradient_fluid(up_fluid, grad_flu) ! 1:dsup, 2:dzup
-
- call dump_field_1d((- grad_flu(:,:,:,1) &
- - f_over_s_fluid(usz_fluid(:,:,:,1) - up_fluid)), &
+ call dump_field_1d((- f_over_s_fluid(usz_fluid(:,:,:,1))), &
'/strain_dsup_flu', appisnap, nel_fluid) !E12
- call dump_field_1d(- grad_flu(:,:,:,2) / two_rk &
- - f_over_s_fluid(usz_fluid(:,:,:,2)), &
+ call dump_field_1d( - f_over_s_fluid(usz_fluid(:,:,:,2)), &
'/strain_dzup_flu', appisnap, nel_fluid) !E23
endif !src_type
More information about the CIG-COMMITS
mailing list